From 8482d4e5969a324fd30406fb488eea265e78a49a Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期一, 09 三月 2026 19:33:33 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 104 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 70 insertions(+), 34 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 5a7dd25..459bbe2 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -385,6 +385,42 @@
}
}
+
+// OrderPakin orderPakin = orderPakinService.selectOne(new EntityWrapper<OrderPakin>().eq("order_no", pakin.getOrderNo()));
+// if (Objects.isNull(orderPakin)) {
+// throw new CoolException("鏁版嵁閿欒锛岃鍗曚俊鎭笉瀛樺湪锛侊紒");
+// }
+//
+// 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());
+// }
+// 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) {
+//
+// }
+// }
+
// 鏇存柊璁㈠崟瀹屾垚鏁伴噺
OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(wrkDetl.getOrderNo(),
wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(),
@@ -964,40 +1000,40 @@
throw new CoolException("搴撲綅鏄庣粏淇濆瓨澶辫触锛侊紒");
}
- OrderPakin orderPakin = orderPakinService.selectOne(new EntityWrapper<OrderPakin>().eq("order_no", pakin.getOrderNo()));
- if (Objects.isNull(orderPakin)) {
- throw new CoolException("鏁版嵁閿欒锛岃鍗曚俊鎭笉瀛樺湪锛侊紒");
- }
-
- 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());
- }
- 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) {
-
- }
- }
+// OrderPakin orderPakin = orderPakinService.selectOne(new EntityWrapper<OrderPakin>().eq("order_no", pakin.getOrderNo()));
+// if (Objects.isNull(orderPakin)) {
+// throw new CoolException("鏁版嵁閿欒锛岃鍗曚俊鎭笉瀛樺湪锛侊紒");
+// }
+//
+// 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());
+// }
+// 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) {
+//
+// }
+// }
});
locCache.setLocSts(LocStsType.LOC_STS_TYPE_F.type);
--
Gitblit v1.9.1