From 07fc18f77a9764bd47857e30d65abc03cc1e439c Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 08 十一月 2024 16:21:56 +0800
Subject: [PATCH] Merge branch 'phyzwms2' into phyzasrs-erp
---
src/main/java/com/zy/asrs/controller/OrderController.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index ae3270a..df58107 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -446,6 +446,9 @@
// }
} else {
list.add(dto);
+ if (!Cools.isEmpty(orderDetl.getThreeCode())){
+ orderDetl.setThreeCode(orderDetl.getThreeCode().trim());
+ }
orderDetl.setOrderId(order.getId());
orderDetl.setOrderNo(order.getOrderNo());
orderDetl.setSource(param.getDocType().intValue());
@@ -530,6 +533,9 @@
}
} else {
dbList.add(dto);
+ if (!Cools.isEmpty(orderDetl.getThreeCode())){
+ orderDetl.setThreeCode(orderDetl.getThreeCode().trim());
+ }
orderDetl.setOrderId(order.getId());
orderDetl.setOrderNo(order.getOrderNo());
orderDetl.setSource(33);
@@ -600,6 +606,9 @@
}
} else {
dbList.add(dto);
+ if (!Cools.isEmpty(orderDetl.getThreeCode())){
+ orderDetl.setThreeCode(orderDetl.getThreeCode().trim());
+ }
orderDetl.setOrderId(order.getId());
orderDetl.setOrderNo(order.getOrderNo());
orderDetl.setSource(35);
@@ -711,6 +720,9 @@
}
}
list.add(dto);
+ if (!Cools.isEmpty(orderDetl.getThreeCode())){
+ orderDetl.setThreeCode(orderDetl.getThreeCode().trim());
+ }
orderDetl.setOrderId(order.getId());
orderDetl.setOrderNo(order.getOrderNo());
orderDetl.setSource(docType);
--
Gitblit v1.9.1