From e70242e539c786b612698711d20ee9a1c367911d Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期一, 26 十二月 2022 21:48:02 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 34 +++++++++++++++++-----------------
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 10 +++++++++-
2 files changed, 26 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index f7bfdc8..4a11986 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -67,6 +67,8 @@
private AdjDetlService adjDetlService;
@Autowired
private CheckRecordService checkRecordService;
+ @Autowired
+ private LocDetlService locDetlService;
@Override
@Transactional
@@ -212,8 +214,14 @@
WrkDetl wrkDetlOld = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>()
.eq("wrk_no", wrkMast.getWrkNo())
.eq("matnr",wrkDetl.getMatnr())
-// .eq("batch",wrkDetl.getBatch())
+ .eq("batch",wrkDetl.getBatch())
);
+// LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>()
+// .eq("loc_no", wrkMast.getLocNo())
+// .eq("matnr",wrkDetl.getMatnr())
+// .eq("batch",wrkDetl.getBatch())
+// );
+
adjDetl.setMatnr(wrkDetl.getMatnr());
adjDetl.setBatch(wrkDetl.getBatch());
adjDetl.setAdjQty(wrkDetl.getAnfme());
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 538b1fa..0a7f1ee 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -209,23 +209,23 @@
if (wrkDetls57.isEmpty()) {
exceptionHandle("鐩樼偣鍏ュ簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌猴紱[workNo={0}]", wrkMast.getWrkNo());
}
-// if(!Cools.isEmpty(locDetlService.selectByLocNo(wrkMast.getLocNo()))){
-// locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getLocNo()));
-// }
-// if (Cools.isEmpty(locDetlService.selectByLocNo(wrkMast.getLocNo()))){
-// for (WrkDetl wrkDetl:wrkDetls57){
-// LocDetl locDetl = new LocDetl();
-// locDetl.sync(wrkDetl);
-// locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
-// locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
-// locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
-// locDetl.setModiTime(now);
-// locDetl.setAppeTime(now);
-// if (!locDetlService.insert(locDetl)) {
-// exceptionHandle("鐩樼偣鍏ュ簱 ===>> 鏂板搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[matnr={1}]", wrkMast.getWrkNo(), wrkDetl.getMatnr());
-// }
-// }
-// }
+ if(!Cools.isEmpty(locDetlService.selectByLocNo(wrkMast.getLocNo()))){
+ locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getLocNo()));
+ }
+ if (Cools.isEmpty(locDetlService.selectByLocNo(wrkMast.getLocNo()))){
+ for (WrkDetl wrkDetl:wrkDetls57){
+ LocDetl locDetl = new LocDetl();
+ locDetl.sync(wrkDetl);
+ locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
+ locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
+ locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
+ locDetl.setModiTime(now);
+ locDetl.setAppeTime(now);
+ if (!locDetlService.insert(locDetl)) {
+ exceptionHandle("鐩樼偣鍏ュ簱 ===>> 鏂板搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[matnr={1}]", wrkMast.getWrkNo(), wrkDetl.getMatnr());
+ }
+ }
+ }
// 淇敼搴撲綅鐘舵�� Q ====>> F
if (locMast.getLocSts().equals("Q")) {
--
Gitblit v1.9.1