From 6d3b7e69524cdc6fd4c44fe9f37661a19a56c6ff Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 03 六月 2025 21:08:32 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 38 ++++++++++++++++++++++++++------------
1 files changed, 26 insertions(+), 12 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 d3a8183..86490b6 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -121,9 +121,9 @@
if (null == docType) {
return SUCCESS;
}
- if (docType.getDocName().equals("閿�鍞彂璐�")) {
- return SUCCESS;
- }
+// if (docType.getDocName().equals("閿�鍞彂璐�")) {
+// return SUCCESS;
+// }
Order orderSou = orderService.selectByNo(order.getOrderNo());
if (!orderSou.getSettle().equals(2L)) {
return FAIL.setMsg("璁㈠崟鐘舵�佷笉姝ｇ‘锛岃鑱旂郴绠＄悊鍛�");
@@ -137,15 +137,29 @@
if (orderDetl.getQty().equals(0D)) {
continue;
}
- if (orderDetlSou.beSimilar(orderDetl)) {
- double v = orderDetlSou.getAnfme() - orderDetlSou.getQty();
- if (v < orderDetl.getQty() || orderDetl.getQty().equals(v)) {
- orderDetlSou.setQty(orderDetlSou.getAnfme());
- orderDetl.setQty(orderDetl.getQty() - v);
- break;
- } else {
- orderDetlSou.setQty(orderDetlSou.getQty() + orderDetl.getQty());
- orderDetl.setQty(0D);
+ if (!Cools.isEmpty(orderDetlSou.getBatch())){
+ if (orderDetlSou.beSimilar(orderDetl)) {
+ double v = orderDetlSou.getAnfme() - orderDetlSou.getQty();
+ if (v < orderDetl.getQty() || orderDetl.getQty().equals(v)) {
+ orderDetlSou.setQty(orderDetlSou.getAnfme());
+ orderDetl.setQty(orderDetl.getQty() - v);
+ break;
+ } else {
+ orderDetlSou.setQty(orderDetlSou.getQty() + orderDetl.getQty());
+ orderDetl.setQty(0D);
+ }
+ }
+ }else {
+ if (orderDetlSou.beSimilar2(orderDetl)) {
+ double v = orderDetlSou.getAnfme() - orderDetlSou.getQty();
+ if (v < orderDetl.getQty() || orderDetl.getQty().equals(v)) {
+ orderDetlSou.setQty(orderDetlSou.getAnfme());
+ orderDetl.setQty(orderDetl.getQty() - v);
+ break;
+ } else {
+ orderDetlSou.setQty(orderDetlSou.getQty() + orderDetl.getQty());
+ orderDetl.setQty(0D);
+ }
}
}
}
--
Gitblit v1.9.1