From 7195aaf32896dc48b686b1a145e67a9afe9205dd Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期三, 01 四月 2026 17:37:25 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 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..c02cf26 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -396,13 +396,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 +415,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("LX99999999");
itemParam
// 涓婃姤鏃讹紝榛樿浜у搧绫诲瀷鏄痭ull
.setPro_type(material.getProType())
@@ -431,10 +428,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