From 371af76976cec152184123fac0073efcba2b5a70 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 29 十二月 2025 17:04:55 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java |   27 +++++++++++++++++++++------
 1 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java
index 3c76f7e..507dddf 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java
@@ -56,9 +56,9 @@
     @Value("${erp.address.imMdcMftfeedorderReport}")
     //鐢熶骇琛ユ枡鍗曚笂鎶�
     private String imMdcMftfeedorderReport;
-    @Value("${erp.address.imProductinbillReport}")
+    @Value("${erp.address.imProductinbillBatchAudit}")
     //鐢熶骇姹囨姤鍗曚笂鎶�
-    private String imProductinbillReport;
+    private String imProductinbillBatchAudit;
     @Value("${erp.address.imOtheroutbillAudi}")
     //鍏朵粬鍑哄簱瀹℃牳涓婃姤
     private String imOtheroutbillAudi;
@@ -121,6 +121,11 @@
                 idArray.add(order.getOrderNo());
                 dataObj.fluentPut("billno", idArray);
                 return new JSONObject().fluentPut("data", dataObj);
+            case "STK_imSaloutbill":
+                path = imSaloutbillReport;
+                idArray.add(order.getShipCode());
+                dataObj.fluentPut("billno", idArray);
+                return new JSONObject().fluentPut("data", dataObj);
             case "SAL_RETURNSTOCK"://閿�鍞��鏂欏崟
                 path = scpSalreturnReport;
                 dataObj.fluentPut("billno", order.getOrderNo());
@@ -141,9 +146,9 @@
                 dataObj.fluentPut("id", idArray);
                 return new JSONObject().fluentPut("data", dataObj);
             case "PRD_MORPT"://鐢熶骇姹囨姤鍗�
-                path = imProductinbillReport;
+                path = imProductinbillBatchAudit;
                 idArray.add(order.getNumber());
-                dataObj.fluentPut("id", idArray);
+                dataObj.fluentPut("ids", idArray);
                 return new JSONObject().fluentPut("data", dataObj);
             case "STK_MISCELLANEOUS"://鍏朵粬鍏ュ簱鍗�
                 path = imOtheroutbillAudi;
@@ -223,8 +228,18 @@
                         }
                     }
                 }
-
-                order.setSettle(8L); // 鏇存柊鐘舵�佷负宸蹭笂鎶ュ鏍� 9->8
+                if(order.getDocType() == 16L){
+                    order.setDocType(23L);
+                    order.setSettle(4L);//杞负鍑哄簱鍗曟嵁涓婃姤
+                }else{
+                    if(order.getDocType() == 23L){
+                        Order order1 = orderService.selectOne(new EntityWrapper<Order>().eq("salesman",order.getOrderNo()));
+                        order1.setPayType(null);
+                        order1.setSettle(4L);
+                        orderService.updateById(order1);
+                    }
+                    order.setSettle(8L); // 鏇存柊鐘舵�佷负宸蹭笂鎶ュ鏍� 9->8
+                }
                 orderService.updateById(order);
             } else {
                 log.error("鎺ュ彛璋冪敤澶辫触锛岄敊璇俊鎭�: {}", jsonResponse.getString("message"));

--
Gitblit v1.9.1