From d2b0cd7ae27bb7ea24549d6930a53cbb27c6e44a Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期日, 08 三月 2026 19:55:34 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 126 ++++++++++++++++++++++++++---------------
1 files changed, 79 insertions(+), 47 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 558940e..5a7dd25 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -192,8 +192,8 @@
}
}
} catch (Exception ignore) {
+
}
-
}
// 淇敼搴撲綅鐘舵�� S ====>> F
if (locMast.getLocSts().equals("S")) {
@@ -278,7 +278,6 @@
+ wrkMast.getLocNo() + "]");
}
for (WrkDetl wrkDetl : wrkDetls53) {
-
LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(),
wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(),
wrkDetl.getStandby3(), wrkDetl.getBoxType1(), wrkDetl.getBoxType2(),
@@ -323,8 +322,8 @@
}
}
} catch (Exception ignore) {
- }
+ }
}
// 淇敼搴撲綅鐘舵�� Q ====>> F
if (locMast.getLocSts().equals("Q")) {
@@ -407,7 +406,6 @@
} catch (Exception ignore) {
}
-
}
// 淇敼搴撲綅鐘舵�� Q ====>> F
if (locMast.getLocSts().equals("Q")) {
@@ -546,22 +544,6 @@
return FAIL
.setMsg("鏇存柊鍏ュ簱瀹屾垚鐘舵�佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
}
-
- //绌烘澘鍏ュ簱瀹屾垚鍚庯紝娓呴櫎绌烘澘缁勬墭妗�
- if (wrkMast.getIoType() == 10) {
- if (!Cools.isEmpty(wrkMast.getBarcode())) {
- // 淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。
- if (!waitPakinLogService.save(wrkMast.getBarcode())) {
-// exceptionHandle("淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。[workNo={0}]澶辫触", wrkMast.getWrkNo());
- }
- // 鍒犻櫎鍏ュ簱閫氱煡妗�
- if (!waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()))) {
-// exceptionHandle("鍒犻櫎鍏ュ簱閫氱煡妗workNo={0}]澶辫触", wrkMast.getWrkNo());
- }
- }
- }
-
-
} catch (Exception e) {
log.error("fail", e);
e.printStackTrace();
@@ -646,6 +628,46 @@
+ wrkMast.getSourceLocNo() + "]");
}
}
+ break;
+ case 103:
+// List<WrkDetl> wrkDetls103 = wrkDetlService
+// .selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
+// if (wrkDetls103.isEmpty()) {
+// // exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌猴紱[workNo={0}]", wrkMast.getWrkNo());
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+// return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌�; [workNo=" + wrkMast.getWrkNo() + "],[locNo="
+// + wrkMast.getSourceLocNo() + "]");
+// }
+
+// for (WrkDetl wrkDetl : wrkDetls103) {
+// // 鏇存柊璁㈠崟瀹屾垚鏁伴噺
+// OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(),
+// wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(),
+// wrkDetl.getStandby2(), wrkDetl.getStandby3(),
+// wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
+// if (orderDetlPakout == null) {
+// orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(),
+// wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(),
+// wrkDetl.getStandby2(), wrkDetl.getStandby3(),
+// wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
+// }
+// try {
+// if (!Cools.isEmpty(orderDetlPakout)) {
+// if (!orderDetlPakoutService.increaseQtyByOrderNo(wrkDetl.getOrderNo(),
+// wrkDetl.getMatnr(),
+// orderDetlPakout.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(),
+// wrkDetl.getStandby2(), wrkDetl.getStandby3(),
+// wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3(),
+// wrkDetl.getAnfme())) {
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+// return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo()
+// + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
+// }
+// }
+// } catch (Exception ignore) {
+// log.error(ignore.getMessage());
+// }
+// }
break;
// 骞舵澘閫斾腑鎹℃枡
case 108:
@@ -900,7 +922,9 @@
station.setLocSts(LocStsType.LOC_STS_TYPE_O.type);
}
station.setBarcode("");
- basStationService.updateById(station);
+ if (!basStationService.updateById(station)) {
+ basStationDetlService.delete(new EntityWrapper<BasStationDetl>().eq("dev_no", station.getDevNo()));
+ }
}
}
@@ -940,31 +964,39 @@
throw new CoolException("搴撲綅鏄庣粏淇濆瓨澶辫触锛侊紒");
}
- // 鏇存柊璁㈠崟瀹屾垚鏁伴噺
- OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(pakin.getOrderNo(),
- pakin.getMatnr(), pakin.getBatch(), pakin.getBrand(), pakin.getStandby1(),
- pakin.getStandby2(), pakin.getStandby3(),
- pakin.getBoxType1(), pakin.getBoxType2(), pakin.getBoxType3());
- if (orderDetlPakin == null) {
- orderDetlPakin = orderDetlPakinService.selectItem(pakin.getOrderNo(), pakin.getMatnr(),
- pakin.getBatch(),
- pakin.getBrand(), pakin.getStandby1(), pakin.getStandby2(),
- pakin.getStandby3(),
- pakin.getBoxType1(), pakin.getBoxType2(), pakin.getBoxType3());
+ OrderPakin orderPakin = orderPakinService.selectOne(new EntityWrapper<OrderPakin>().eq("order_no", pakin.getOrderNo()));
+ if (Objects.isNull(orderPakin)) {
+ throw new CoolException("鏁版嵁閿欒锛岃鍗曚俊鎭笉瀛樺湪锛侊紒");
}
- try {
- if (!Cools.isEmpty(orderDetlPakin)) {
- if (!orderDetlPakinService.increaseQtyByOrderNo(pakin.getOrderNo(),
- pakin.getMatnr(),
- orderDetlPakin.getBatch(), pakin.getBrand(), pakin.getStandby1(),
- pakin.getStandby2(), pakin.getStandby3(),
- pakin.getBoxType1(), pakin.getBoxType2(), pakin.getBoxType3(),
- pakin.getAnfme())) {
- throw new CoolException("AGV鍏ㄦ澘鍏ュ簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo()
- + "],[locNo=" + wrkMast.getLocNo() + "]");
- }
+
+ if (!orderPakin.getDocType().equals(0)) {
+ // 鏇存柊璁㈠崟瀹屾垚鏁伴噺
+ OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(pakin.getOrderNo(),
+ pakin.getMatnr(), pakin.getBatch(), pakin.getBrand(), pakin.getStandby1(),
+ pakin.getStandby2(), pakin.getStandby3(),
+ pakin.getBoxType1(), pakin.getBoxType2(), pakin.getBoxType3());
+ if (orderDetlPakin == null) {
+ orderDetlPakin = orderDetlPakinService.selectItem(pakin.getOrderNo(), pakin.getMatnr(),
+ pakin.getBatch(),
+ pakin.getBrand(), pakin.getStandby1(), pakin.getStandby2(),
+ pakin.getStandby3(),
+ pakin.getBoxType1(), pakin.getBoxType2(), pakin.getBoxType3());
}
- } catch (Exception ignore) {
+ try {
+ if (!Cools.isEmpty(orderDetlPakin)) {
+ if (!orderDetlPakinService.increaseQtyByOrderNo(pakin.getOrderNo(),
+ pakin.getMatnr(),
+ orderDetlPakin.getBatch(), pakin.getBrand(), pakin.getStandby1(),
+ pakin.getStandby2(), pakin.getStandby3(),
+ pakin.getBoxType1(), pakin.getBoxType2(), pakin.getBoxType3(),
+ pakin.getAnfme())) {
+ throw new CoolException("AGV鍏ㄦ澘鍏ュ簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo()
+ + "],[locNo=" + wrkMast.getLocNo() + "]");
+ }
+ }
+ } catch (Exception ignore) {
+
+ }
}
});
@@ -993,9 +1025,9 @@
Set<Long> list = apallets.stream().map(WaitPakin::getOrderId).collect(Collectors.toSet());
List<OrderPakin> pakins = orderPakinService.selectList(new EntityWrapper<OrderPakin>().in("id", list));
- if (Objects.isNull(pakins) || pakins.isEmpty()) {
-// throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
- }
+// if (Objects.isNull(pakins) || pakins.isEmpty()) {
+//// throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
+// }
}else if(wrkMast.getIoType().equals(53)){
// 鏍规嵁宸ヤ綔鍙凤紝鏌ヨ宸ヤ綔鏄庣粏妗�
List<TaskDetl> wrkDetls53 = taskDetlService
--
Gitblit v1.9.1