From 2e82ef6fd6dfbcb1eb88a8d4b705eae7fb99065b Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 06 六月 2025 17:04:11 +0800
Subject: [PATCH] 123
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 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 ef443d8..fa53068 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -188,7 +188,8 @@
}
}
if (complete) {
- if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()))) {
+ List<OrderDetl> old = orderDetlService.selectByOrderId(orderSou.getId());
+ if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_no", order.getOrderNo()))) {
throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
}
List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNo(order.getOrderNo());
@@ -196,13 +197,27 @@
OrderDetl orderDetl = new OrderDetl();
orderDetl.sync(wrkDetl);
orderDetl.setQty(wrkDetl.getAnfme());
- orderDetl.setOrderId(order.getId());
- orderDetl.setOrderNo(order.getOrderNo());
+ orderDetl.setOrderId(orderSou.getId());
+ orderDetl.setOrderNo(orderSou.getOrderNo());
orderDetl.setStatus(1);
- orderDetl.setCreateTime(order.getCreateTime());
- orderDetl.setCreateBy(order.getCreateBy());
- orderDetl.setUpdateTime(order.getUpdateTime());
- orderDetl.setUpdateBy(order.getUpdateBy());
+ orderDetl.setCreateTime(orderSou.getCreateTime());
+ orderDetl.setCreateBy(orderSou.getCreateBy());
+ orderDetl.setUpdateTime(orderSou.getUpdateTime());
+ orderDetl.setUpdateBy(orderSou.getUpdateBy());
+ orderDetl.setId(null);
+ //鍏堟寜鐓ф壒娆″尮閰嶏紝鍐嶆寜鐓ф棤鎵规鍙锋壒娆★紝鍥犱负閿�鍞彂璐э紝鎵规鍙峰彲鑳藉甫锛屾湁鍙兘涓嶆惡甯︼紝鎵�浠ュ氨浼氭湁闂锛涜�屼笖鑰冭檻鍒颁竴鏉¤鍗曢噷濡傛灉鐩稿悓鐗╂枡锛屼竴鏉″甫鎵规锛屼竴鏉′笉甯︽壒娆★紝鎯呭喌
+ for (OrderDetl xxx : old) {
+ if (xxx.beSimilar(wrkDetl)) {
+ orderDetl.setRemark(xxx.getRemark());
+ }
+ }
+ if (Cools.isEmpty(orderDetl.getRemark())) {
+ for (OrderDetl xxx : old) {
+ if (xxx.beSimilarByWrkDetl(wrkDetl)) {
+ orderDetl.setRemark(xxx.getRemark());
+ }
+ }
+ }
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
}
--
Gitblit v1.9.1