From 67cb49032b0efff478b2432713d62c305e4e53ce Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 30 十月 2024 17:42:34 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 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 2248302..77337d6 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -92,7 +92,7 @@
     @Transactional
     public void timelyStart(Order order) {
 
-        List<String> docNames = new ArrayList<>(Arrays.asList("閾跺骇閲囪喘鍏ュ簱鍗�", "閾跺骇濮斿鏉愭枡鍑哄簱鍗�"));
+        List<String> docNames = new ArrayList<>(Arrays.asList("閾跺骇閲囪喘鍏ュ簱鍗�", "閾跺骇濮斿鏉愭枡鍑哄簱鍗�","鍏朵粬鍏ュ簱鍗�","鍏朵粬鍑哄簱鍗�"));
 
         DocType docType = docTypeService.selectById(order.getDocType());
         if (docNames.contains(docType.getDocName())) {
@@ -146,10 +146,22 @@
             childInfo.setIrowno(orderDetl.getItemNum());
             childInfo.setCInvCode(orderDetl.getMatnr());
             childInfo.setIQuantity(orderDetl.getQty() - (orderDetl.getReportQty() == null ? 0D : orderDetl.getReportQty()) + "");
-            childInfo.setCBatch(orderDetl.getBatch());
+            String batch = orderDetl.getBatch();
+            if (Cools.isEmpty(batch)) {
+                childInfo.setCBatch("");
+                childInfo.setBFree1("");
+            } else {
+                String[] s = batch.split("__");
+                if (s.length > 1) {
+                    childInfo.setCBatch(s[0]);
+                    childInfo.setBFree1(s[1]);
+                } else {
+                    childInfo.setCBatch(s[0]);
+                    childInfo.setBFree1("");
+                }
+            }
             childInfo.setINum(orderDetl.getLength() + "");
             childInfo.setIinvexchrate("");
-            childInfo.setBFree1(orderDetl.getDeadTime());
             childInfo.setIPOsID(orderDetl.getSku());
             childInfo.setCOrderCode(orderDetl.getOrderNo());
             childInfo.setIvouchrowno(orderDetl.getItemNum());
@@ -159,6 +171,7 @@
         }
 
     }
+
 
     private int doHttpRequest(Object requestParam, String namespace, String url, String path, String appkey, String ip) {
         String response = "";
@@ -181,7 +194,7 @@
             success = true;
             return code;
         } catch (Exception e) {
-            log.error(e.getMessage());
+            log.error("鎶ラ敊淇℃伅:{},{}", e.getMessage(), JSON.toJSONString(requestParam));
             throw new CoolException("璋冪敤鎺ュ彛鍝嶅簲閿欒");
         } finally {
             apiLogService.save(namespace, url + path, appkey, ip, JSON.toJSONString(JSONObject.toJSONString(requestParam)), response, success);

--
Gitblit v1.9.1