From 588f83a71381a79d3c391f5df0b8e266f397264f Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期六, 04 十一月 2023 17:07:44 +0800
Subject: [PATCH] 优化通知单绑定计划详细

---
 igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
index 7b88614..28bac20 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
@@ -256,7 +256,9 @@
         }
 
         if (InoutConstant.PROGRESS_CHECK.equals(data.getProgress())) {
-            data.setCheckUser(ContextUtil.getLoginUserCName());
+            if (StringUtils.isEmpty(data.getCheckUser())) {
+                data.setCheckUser(ContextUtil.getLoginUserCName());
+            }
             data.setProgress(nextProgress);
             return data;
         }
@@ -875,6 +877,7 @@
             curData.setCheckTime(new Date());
             data.setCheckTime(new Date());
         }
+        curData.setCheckUser(data.getCheckUser());
         curData.setCheckStatus(data.getCheckStatus());
         curData.setFoodYear(data.getFoodYear());
 
@@ -898,6 +901,7 @@
         curData.setCheckItems(data.getCheckItems());
         curData.setCheckTime(data.getCheckTime());
         curData.setDepotId(data.getDepotId());
+        curData.setFoodType(data.getFoodType());
 
         if (StringUtils.isEmpty(data.getCheckUser())) {
             curData.setCheckUser(ContextUtil.getLoginUserCName());

--
Gitblit v1.9.3