From 97c6071eaf01a3ce1a706cb0114dcb27d255aa3d Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期三, 25 十二月 2024 13:03:26 +0800
Subject: [PATCH] 优化订单同步逻辑及库位查找

---
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index f0a2001..6044ed0 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -886,6 +886,11 @@
         }
         Date now = new Date();
         Order order = orderMapping(param, now, pakin, docName);
+        StringBuffer tel = new StringBuffer();
+        for (OrderSyncParam.OrderDetl child : param.getChildren()) {
+            tel.append(child.getCDefine22()).append(";");
+        }
+        order.setTel(tel.toString());
         orderService.insert(order);
         param.getChildren().forEach(od -> {
             OrderDetl orderDetl = orderDetlMapping(order, od, now);
@@ -984,7 +989,9 @@
 
         order.setDefNumber(param.get鎿嶄綔绯荤粺鍙�());
 
+        order.setCreateBy(9999L);
         order.setCreateTime(now);
+        order.setUpdateBy(9999L);
         order.setUpdateTime(now);
         order.setUpstreamcode(param.getUpstreamcode());
         //璁㈠崟鐘舵��
@@ -1021,7 +1028,11 @@
         //閿�鍞鍗曞彿
         od.setThreeCode(odParam.getCDefine22());
         //鑷敱椤�
-        od.setBatch((Cools.isEmpty(odParam.getBatch()) ? "" : odParam.getBatch()) + "__" + (Cools.isEmpty(odParam.getBFree1()) ? "" : odParam.getBFree1()));
+        if (!Cools.isEmpty(odParam.getBatch()) || !Cools.isEmpty(odParam.getBFree1())) {
+            od.setBatch((Cools.isEmpty(odParam.getBatch()) ? "" : odParam.getBatch()) + "__" + (Cools.isEmpty(odParam.getBFree1()) ? "" : odParam.getBFree1()));
+        }
+        od.setWeight(odParam.getINum());
+        od.setVolume(odParam.getIinvexchrate());
         //IDs
         od.setSku(odParam.getId());
 
@@ -1030,6 +1041,7 @@
         od.setSource(order.getDocType().intValue());
         od.setStatus(1);
         od.setQty(0.0D);
+        od.setReportQty(0.0D);
         od.setCreateBy(9999L);
         od.setCreateTime(now);
         od.setUpdateBy(9999L);

--
Gitblit v1.9.1