From e599497b927aa0ffa4b235d42765e23f3fcd5f34 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期四, 22 十二月 2022 11:55:29 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 deletions(-)
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 0538030..538b1fa 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -130,6 +130,7 @@
locMast.setFrozen(wrkMast.getFrozen());
locMast.setIoTime(now);
locMast.setModiTime(now);
+ locMast.setFrozenMemo(wrkMast.getMemo());
if (!locMastService.updateById(locMast)) {
exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐ワ紱[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
}
@@ -208,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")) {
@@ -351,6 +352,7 @@
locMast.setFrozen(0);
locMast.setModiTime(now);
locMast.setIoTime(now);
+ locMast.setFrozenMemo("");
if (!locMastService.updateById(locMast)) {
exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐ワ紱[workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
}
--
Gitblit v1.9.1