From c63696bec5666ad3064dd72636420e3980ade34f Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期五, 05 十二月 2025 09:06:51 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 651a4e5..c6b9063 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -58,10 +58,10 @@
if (!Cools.isEmpty(order1)){
return FAIL.setMsg("璇风瓑寰�...璁㈠崟鎵ц妗ｆ姝ｅ湪杞巻鍙叉。妗堬紒锛侊紒");
}
- List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
- if (!Cools.isEmpty(orderDetls) || !orderDetls.isEmpty()) {
- return FAIL.setMsg("璇风瓑寰�...璁㈠崟鎵ц鏄庣粏妗ｆ姝ｅ湪杞巻鍙叉。妗堬紒锛侊紒");
- }
+// List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
+// if (!Cools.isEmpty(orderDetls) || !orderDetls.isEmpty()) {
+// return FAIL.setMsg("璇风瓑寰�...璁㈠崟鎵ц鏄庣粏妗ｆ姝ｅ湪杞巻鍙叉。妗堬紒锛侊紒");
+// }
// 鍗曟嵁鏄庣粏妗�
List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
@@ -107,11 +107,13 @@
DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch(),dto.getBrand(),dto.getStandby1(),dto.getStandby2(),dto.getStandby3(),dto.getBoxType1(),dto.getBoxType2(),dto.getBoxType3());
assert detlDto != null;
detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
+ detlDto.setErpAnfme(detlDto.getErpAnfme() + detail.getErpAnfme());
OrderDetl orderDetl = OrderDetl.find(orderDetlList, dto.getMatnr(), dto.getBatch(),dto.getBrand(),dto.getStandby1(),dto.getStandby2(),dto.getStandby3(),dto.getBoxType1(),dto.getBoxType2(),dto.getBoxType3());
assert orderDetl != null;
orderDetl.setAnfme(orderDetl.getAnfme() + detail.getAnfme());
} else {
+ dto.setErpAnfme(detail.getErpAnfme());
list.add(dto);
orderDetlList.add(detail);
}
@@ -200,7 +202,7 @@
continue;
}
if (!orderDetl.getQty().equals(orderDetl.getAnfme())){
- settle = 99L;//浜屾鐢熸垚鍗曟嵁
+ settle = 98L;//浜屾鐢熸垚鍗曟嵁鍓嶇疆 鎵嬪姩鐢熸垚
}
String serial = Cools.isEmpty(orderDetl.getBatch()) ? "" : orderDetl.getBatch();
pakinParam.getList().add(new MesPakinParam.Detl(orderDetl.getMatnr() + (Cools.isEmpty(serial) ? "" : "-" + serial), orderDetl.getQty()));
--
Gitblit v1.9.1