From 34aa40fffdda9155e77a7991ca8c7691102bb0b8 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期日, 26 四月 2026 11:29:05 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 73 +++++++++++++++++++++++++++++-------
1 files changed, 58 insertions(+), 15 deletions(-)
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 a2970cd..a3b06e5 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -81,6 +81,8 @@
private OrderDetlPakoutService orderDetlPakoutService;
@Autowired
private OrderPakoutService orderPakoutService;
+ @Autowired
+ private WaitPakinLogServiceImpl waitPakinLogService;
@Transactional
@@ -291,6 +293,11 @@
.eq("three_code", detl.getThreeCode())
.eq("supp_code", detl.getSuppCode())
.eq("order_no", detl.getOrderNo()));
+// List<WaitPakinLog> wrkDetls = waitPakinLogService.selectList(new EntityWrapper<WaitPakinLog>()
+// .eq("matnr", detl.getMatnr())
+// .eq("three_code", detl.getThreeCode())
+// .eq("supp_code", detl.getSuppCode())
+// .eq("order_no", detl.getOrderNo()));
if (Objects.isNull(wrkDetls) || wrkDetls.isEmpty()) {
ReportOrderParams itemParam = new ReportOrderParams();
// BS Code
@@ -301,7 +308,7 @@
.setPro_komcode(detl.getMatnr())
// 涓婃姤鏃讹紝榛樿浜у搧id鏄緵搴斿晢缂栫爜
.setPro_id(detl.getSuppCode())
- .setLocation_no("LX000000000")
+ .setLocation_no("QH00000000")
.setSj_emp("9527")
.setLocation_type(MatLocType.getMatTag(material.getTagId() + ""))
// 涓婃姤鏃讹紝榛樿涓婃姤鏃堕棿鏄洿鏂版椂闂�
@@ -316,6 +323,27 @@
} else {
wrkDetls.forEach(wrkDetl -> {
ReportOrderParams itemParam = new ReportOrderParams();
+ WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>()
+ .eq("matnr", detl.getMatnr())
+ .eq("three_code", detl.getThreeCode())
+// .eq("zpallet", wrkDetl.getZpallet())
+ .eq("supp_code", detl.getSuppCode())
+ .eq("order_no", detl.getOrderNo()));
+ if (Objects.isNull(waitPakin)) {
+ WaitPakinLog waitPakinLog = waitPakinLogService.selectOne(new EntityWrapper<WaitPakinLog>()
+ .eq("matnr", detl.getMatnr())
+ .eq("three_code", detl.getThreeCode())
+// .eq("zpallet", wrkDetl.getZpallet())
+ .eq("supp_code", detl.getSuppCode())
+ .eq("order_no", detl.getOrderNo()));
+ if (Objects.isNull(waitPakinLog)) {
+ throw new CoolException("鍘嗗彶缁勬墭妗ｄ笉瀛樺湪锛岃鑱旂郴绠＄悊鍛橈紒锛�");
+ }
+ itemParam.setPick_qty(waitPakinLog.getAnfme().intValue());
+ } else {
+ itemParam.setPick_qty(waitPakin.getAnfme().intValue());
+ }
+// ReportOrderParams itemParam = new ReportOrderParams();
// BS Code
itemParam.setTotal_serial(detl.getThreeCode())
// 涓婃姤鏃讹紝榛樿浜у搧绫诲瀷鏄痭ull
@@ -330,12 +358,12 @@
// 涓婃姤鏃讹紝榛樿涓婃姤鏃堕棿鏄洿鏂版椂闂�
.setSj_date(Utils.dateToStr(order.getUpdateTime(), "yyyy-MM-dd HH:mm:ss"))
// 涓婃姤鏃讹紝榛樿涓婃姤鏁伴噺鏄鍗曟暟閲�
- .setPick_qty(wrkDetl.getAnfme().intValue())
-// .setPick_qty(detl.getQty().intValue())
+// .setPick_qty(wrkDetl.getAnfme().intValue())
+// .setPick_qty(waitPakinLog.getAnfme().intValue())
// 涓婃姤鏃讹紝榛樿鎹熷潖鏁伴噺鏄�0
- .setDamage_qty(0)
+ .setDamage_qty(wrkDetl.getAdjustQty().intValue())
// 涓婃姤鏃讹紝榛樿宸紓鏁伴噺鏄�0
- .setDiff_qty(0);
+ .setDiff_qty(wrkDetl.getSplusQty().intValue());
reportOrderParams.add(itemParam);
});
}
@@ -396,13 +424,14 @@
List<OrderItemsParam> reportOrderParams = new ArrayList<>();
orderDetls.forEach(detl -> {
- Mat material = matService.selectByMatnr(detl.getMatnr());
+ Mat material = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", detl.getMatnr())
+ .eq("supp_code", detl.getSuppCode()));
if (Objects.isNull(material)) {
throw new CoolException(material.getMatnr() + "鐗╂枡涓嶅瓨鍦�");
}
TaskDetlLog taskDetlLog = taskDetlLogService.selectOne(new EntityWrapper<TaskDetlLog>()
.eq("matnr", detl.getMatnr())
- .eq("supp_code", detl.getStandby1())
+ .eq("supp_code", detl.getSuppCode())
.eq("order_no", detl.getOrderNo()));
if (Objects.isNull(taskDetlLog) || Objects.isNull(taskDetlLog.getAreaType())) {
orderParam.setTarget_location("2");
@@ -414,13 +443,9 @@
.eq("matnr", detl.getMatnr())
.eq("supp_code", detl.getStandby1())
.eq("order_no", detl.getOrderNo()));
- detlLog.forEach(item -> {
+ if (Objects.isNull(detlLog) || detlLog.isEmpty()) {
OrderItemsParam itemParam = new OrderItemsParam();
- if (Objects.isNull(item)) {
- itemParam.setLocation_no("LX99999999");
- } else {
- itemParam.setLocation_no(item.getZpallet());
- }
+ itemParam.setLocation_no("QH00000000");
itemParam
// 涓婃姤鏃讹紝榛樿浜у搧绫诲瀷鏄痭ull
.setPro_type(material.getProType())
@@ -431,10 +456,28 @@
// // 涓婃姤鏃讹紝榛樿鏉ユ簮浣嶇疆鏄痭ull
// .setLocation_no(detlLog.getZpallet())
// 涓婃姤鏃讹紝榛樿涓婃姤鏁伴噺鏄鍗曟暟閲�
- .setPick_qty(item.getAnfme().intValue());
+ .setPick_qty(0);
// .setPick_qty(Objects.isNull(detl.getQty()) ? 0 : detl.getQty().intValue());
reportOrderParams.add(itemParam);
- });
+ } else {
+ detlLog.forEach(item -> {
+ OrderItemsParam itemParam = new OrderItemsParam();
+ itemParam.setLocation_no(item.getZpallet());
+ itemParam
+ // 涓婃姤鏃讹紝榛樿浜у搧绫诲瀷鏄痭ull
+ .setPro_type(material.getProType())
+ // 涓婃姤鏃讹紝榛樿浜у搧缂栫爜
+ .setPro_komcode(detl.getMatnr())
+ // 涓婃姤鏃讹紝榛樿浜у搧id鏄緵搴斿晢缂栫爜
+ .setPro_id(detl.getSuppCode())
+// // 涓婃姤鏃讹紝榛樿鏉ユ簮浣嶇疆鏄痭ull
+// .setLocation_no(detlLog.getZpallet())
+ // 涓婃姤鏃讹紝榛樿涓婃姤鏁伴噺鏄鍗曟暟閲�
+ .setPick_qty(item.getAnfme().intValue());
+// .setPick_qty(Objects.isNull(detl.getQty()) ? 0 : detl.getQty().intValue());
+ reportOrderParams.add(itemParam);
+ });
+ }
});
//鐩爣搴撳尯
--
Gitblit v1.9.1