From d1480e6c40cbcaf7e0dd6349153a461a3635bee3 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 19 八月 2024 09:04:39 +0800
Subject: [PATCH] #优化
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 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 538b1fa..7977444 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -86,7 +86,7 @@
}
// 閬嶅巻宸ヤ綔鏄庣粏锛屾洿鏂板簱瀛樻槑缁嗗拰鍏ュ簱閫氱煡妗�
for (WrkDetl wrkDetl : wrkDetls) {
-
+ wrkDetl.setBatch("");
LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
if (null != locDetl) {
if (!locDetlService.updateAnfme(wrkDetl.getAnfme(), wrkMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {
@@ -147,7 +147,7 @@
LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
if (null != locDetl) {
- if (!locDetlService.updateAnfme(locDetl.getAnfme() - wrkDetl.getAnfme(), locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {
+ if (!locDetlService.updateAnfme(locDetl.getAnfme() - wrkDetl.getAnfme(), locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getManu(),wrkDetl.getMemo())) {
exceptionHandle("鎷ｆ枡鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
}
}
@@ -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")) {
@@ -238,8 +238,8 @@
}
}
break;
- // 搴撲綅绉昏浆
- case 11:
+ case 11:// 搴撲綅绉昏浆
+ case 111:// 搴撲綅绉昏浆(楂橀鍖哄煙)
// 榛樿鐩爣搴撲綅鏄┖鏉�
String locSts = "D";
// 搴撲綅绉昏浆鍒ゆ柇鏄惁涓虹┖鏉跨Щ杞�
--
Gitblit v1.9.1