From 995b0d803cad76839d2d3e2308d9725cdeee4145 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期二, 27 六月 2023 20:02:49 +0800
Subject: [PATCH] 入库问题修改2

---
 igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java |    7 ++++++-
 1 files changed, 6 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 8f53a96..db7a478 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
@@ -321,7 +321,7 @@
         param.setIntelCard(data.getIntelCard());
         param.setUserId(data.getCompleteUser());
         param.setDepotId(data.getDepotId());
-        param.setCompleteTime(data.getCompleteTime());
+        param.setCompleteTime(new Date());
         param.setProgress(InoutConstant.PROGRESS_RECORD);
 
         String msg = inoutService.toComplete(param);
@@ -838,6 +838,11 @@
 
         curData.setProgress(curData.getProgress());
         curData.setType(curData.getType());
+        curData.setFoodLevel(data.getFoodLevel());
+        curData.setFoodVariety(data.getFoodVariety());
+        curData.setPrice(data.getPrice());
+        curData.setRemarks(data.getRemarks());
+        curData.setCheckItems(data.getCheckItems());
 
         if (StringUtils.isEmpty(data.getCheckUser())) {
             curData.setCheckUser(ContextUtil.getLoginUserCName());

--
Gitblit v1.9.3