From 43ce77a85d8297a53dc25430fff10ead57296167 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期六, 04 十一月 2023 15:43:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager2.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager2.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager2.java
index ad0ae3a..990792e 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager2.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager2.java
@@ -29,6 +29,7 @@
import com.ld.igds.util.DateUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@@ -551,7 +552,6 @@
data.setDepotId(item.getDepotId());
}
if (data.getDepotId().equals(item.getDepotId())) {
-
inoutParam.setId(data.getRecordId());
} else {
String newId = data.getRecordId() + temp;
@@ -585,11 +585,15 @@
map.put(inoutParam.getId(), inoutParam);
}
InoutParam par;
+ InoutData dat;
for (String key : map.keySet()) {
par = map.get(key);
if (par != null) {
+ dat = new InoutData();
//鏇存柊娴佹按鏁版嵁(鍖呭惈閲嶉噺淇℃伅浠ュ強娴佺▼杩涘害淇℃伅)
inoutService.toComplete(par);
+ BeanUtils.copyProperties(par, dat);
+ inoutService.updateData(dat);
// //鏇存柊浠撳簱搴撳瓨
// if (InoutConstant.TYPE_IN.equals(par.getType())) {
--
Gitblit v1.9.3