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 +++++++++++++++++++++++-----------
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 23 +++----
src/main/java/com/zy/common/model/DetlDto.java | 36 ++++++++++++
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 2
4 files changed, 119 insertions(+), 46 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 36e9da3..f4226db 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -51,6 +51,8 @@
@Autowired
private TagMapper tagMapper;
@Autowired
+ private CheckOrderService checkOrderService;
+ @Autowired
private CheckOrderDetlService checkOrderDetlService;
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index be6a809..3286885 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -391,24 +391,23 @@
if (Objects.isNull(material)) {
throw new CoolException(material.getMatnr() + "鐗╂枡涓嶅瓨鍦�");
}
- //TODO 姝ｅ父瀹岀粨闇�瑕佹墦寮�
-// TaskDetlLog detlLog = taskDetlLogService.selectOne(new EntityWrapper<TaskDetlLog>()
-// .eq("matnr", detl.getMatnr())
-// .eq("supp_code", detl.getStandby1())
-// .eq("order_no", detl.getOrderNo()));
-// if (Objects.isNull(detlLog)) {
-// throw new CoolException("鏁版嵁閿欒 锛岃妫�鏌GV浠诲姟妗ｆ槸鍚﹀凡瀹屾垚锛侊紒");
-// }
- WrkDetlLog detlLog = wrkDetlLogService.selectOne(new EntityWrapper<WrkDetlLog>()
+ TaskDetlLog detlLog = taskDetlLogService.selectOne(new EntityWrapper<TaskDetlLog>()
+ .eq("matnr", detl.getMatnr())
+ .eq("supp_code", detl.getStandby1())
+ .eq("order_no", detl.getOrderNo()));
+ if (Objects.isNull(detlLog)) {
+ throw new CoolException("鏁版嵁閿欒 锛岃妫�鏌GV浠诲姟妗ｆ槸鍚﹀凡瀹屾垚锛侊紒");
+ }
+/* WrkDetlLog detlLog = wrkDetlLogService.selectOne(new EntityWrapper<WrkDetlLog>()
.eq("matnr", detl.getMatnr())
.eq("supp_code", detl.getStandby1())
.eq("order_no", detl.getOrderNo()));
if (Objects.isNull(detlLog)) {
throw new CoolException("鐗╂枡缂栫爜锛�" + detl.getMatnr() + "鏁版嵁閿欒 锛岃妫�鏌ュ爢鍨涙満浠诲姟妗ｆ槸鍚﹀凡瀹屾垚锛侊紒");
- }
+ }*/
//鐩爣搴撳尯
- orderParam.setTarget_location("2");
-// orderParam.setTarget_location(detlLog.getAreaType());
+// orderParam.setTarget_location("2");
+ orderParam.setTarget_location(detlLog.getAreaType());
OrderItemsParam itemParam = new OrderItemsParam();
// BS Code
itemParam
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);
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index 3b0902f..dda2516 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -40,6 +40,29 @@
public DetlDto() {
}
+ public DetlDto(String matnr, Double anfme) {
+ this.matnr = matnr;
+ this.anfme = anfme;
+ }
+
+ public DetlDto(String matnr, String batch) {
+ this.matnr = matnr;
+ this.batch = batch;
+ }
+
+ public DetlDto(String matnr, String batch, Double anfme) {
+ this.matnr = matnr;
+ this.batch = batch;
+ this.anfme = anfme;
+ }
+
+ public DetlDto(String orderNo, String matnr, String batch, Double anfme) {
+ this.orderNo = orderNo;
+ this.matnr = matnr;
+ this.batch = batch;
+ this.anfme = anfme;
+ }
+
public DetlDto(String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, String threeCode) {
this.matnr = matnr;
this.batch = batch;
@@ -298,4 +321,17 @@
return null;
}
+
+ public static DetlDto find(List<DetlDto> detlDtos, String matnr, String batch) {
+ if (Cools.isEmpty(matnr)) {
+ return null;
+ }
+ for (DetlDto detlDto : detlDtos) {
+ if (matnr.equals(detlDto.getMatnr()) && Cools.eq(batch, detlDto.getBatch())) {
+ return detlDto;
+ }
+ }
+ return null;
+ }
+
}
--
Gitblit v1.9.1