From 9f96a3fa144da895976ee1be96b752786720aff1 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 30 十月 2024 13:06:44 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 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 60683dd..2248302 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -74,9 +74,13 @@
         ReportErpParam param = new ReportErpParam();
         mappingParam(order, param);
         mappingParamChildren(orderDetlList, param);
+        if (Cools.isEmpty(order.getPltType())) {
+            return SUCCESS;
+        }
 
         int code = doHttpRequest(param, "鍗曟嵁瀹℃牳", url, orderReportPath, null, "127.0.0.1");
         if (code == 0) {
+            log.info("鍗曟嵁瀹℃牳,{}", order);
             order.setSettle(6L);
             orderService.updateById(order);
         }
@@ -99,16 +103,19 @@
                     report.add(orderDetl);
                 }
             }
+            if (Cools.isEmpty(order.getPltType())) {
+                return;
+            }
             if (!Cools.isEmpty(report)) {
                 ReportErpParam param = new ReportErpParam();
                 mappingParam(order, param);
                 mappingParamChildren(report, param);
-
+                log.info(JSON.toJSONString(param));
                 int code = doHttpRequest(param, "鍗曟嵁瀹℃牳", url, orderReportPath, null, "127.0.0.1");
                 if (code == 0) {
-                    for (OrderDetl orderDetl : orderDetlList) {
+                    for (OrderDetl orderDetl : report) {
+                        log.info("{}鍗曟嵁瀹℃牳涓婃姤浜嗭細{}", order.getOrderNo(), orderDetl.getQty() - (orderDetl.getReportQty() == null ? 0D : orderDetl.getReportQty()));
                         orderDetl.setReportQty(orderDetl.getQty());
-                        log.info("{}鍗曞瓙涓婃姤浜嗭細{}", order.getOrderNo(),orderDetl.getQty() - (orderDetl.getReportQty() == null ? 0D : orderDetl.getReportQty()));
                         orderDetlService.updateById(orderDetl);
                     }
                 }
@@ -118,16 +125,17 @@
     }
 
     public void mappingParam(Order order, ReportErpParam param) {
-        param.set鎿嶄綔绯荤粺鍙�(order.getDefNumber());
+        //param.set鎿嶄綔绯荤粺鍙�(order.getDefNumber());
+        param.set鎿嶄綔绯荤粺鍙�("998");
         param.set鎿嶄綔鍗曟嵁(order.getDocType$());
         param.set鎿嶄綔绫诲瀷("add");
-        param.setDdate(order.getOrderTime());
+        param.setDdate(order.getInTime());
         param.setCWhCode(Cools.isEmpty(order.getPltType()) ? "" : order.getPltType() + "");
         param.setCDepCode("YZ");
         param.setCOrderCode(order.getOrderNo());
         param.setCMaker("");
         param.setCHandler("");
-        param.setCDefine14(order.getOrderNo()+"_"+DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmss));
+        param.setCDefine14(order.getOrderNo() + "_" + DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmss + "_" + order.getPltType()));
     }
 
     public void mappingParamChildren(List<OrderDetl> orderDetlList, ReportErpParam param) {

--
Gitblit v1.9.1