From f392d5e620f5c182281e7b8f3166d4a6a93d3090 Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期二, 03 九月 2024 12:10:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs' into xgmFlasrs
---
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index dc8534d..f45fa59 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -102,6 +102,7 @@
if (orderDetl.getMatnr().equals(wrkDetl.getMatnr())) {
OrderDetl newOrderDetl = new OrderDetl();
newOrderDetl.sync(wrkDetl);
+ newOrderDetl.setAnfme(orderDetl.getAnfme());
newOrderDetl.setQty(orderDetl.getAnfme());
newOrderDetl.setOrderId(order.getId());
newOrderDetl.setOrderNo(orderNo);
@@ -113,11 +114,13 @@
if (!orderDetlService.insert(newOrderDetl)) {
throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
}
+ break;
}
} else {
if (orderDetl.getMatnr().equals(wrkDetl.getMatnr()) && orderDetl.getBatch().equals(wrkDetl.getBatch())) {
OrderDetl newOrderDetl = new OrderDetl();
newOrderDetl.sync(wrkDetl);
+ newOrderDetl.setAnfme(orderDetl.getAnfme());
newOrderDetl.setQty(orderDetl.getAnfme());
newOrderDetl.setOrderId(order.getId());
newOrderDetl.setOrderNo(orderNo);
@@ -129,6 +132,7 @@
if (!orderDetlService.insert(newOrderDetl)) {
throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
}
+ break;
}
}
}
--
Gitblit v1.9.1