From b4d9cf3a9974d9abac40ecd228820e5e854b080a Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期三, 07 一月 2026 17:43:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 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..ef4ef37 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,15 +56,19 @@
@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;
@Value("${erp.address.imOtherinbillAudit}")
//鍏朵粬鍏ュ簱瀹℃牳涓婃姤
private String imOtherinbillAudit;
+
+ @Value("${erp.address.imMdcOmprdinbillBatchAudit}")
+ //鍏朵粬鍏ュ簱瀹℃牳涓婃姤
+ private String imMdcOmprdinbillBatchAudit;
@Autowired
private OrderService orderService;
@Autowired
@@ -121,6 +125,16 @@
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 "OUI_RECEIVEBIll":
+ path = imMdcOmprdinbillBatchAudit;
+ 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,10 +155,11 @@
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;
idArray.add(order.getId());
@@ -223,8 +238,16 @@
}
}
}
-
- order.setSettle(8L); // 鏇存柊鐘舵�佷负宸蹭笂鎶ュ鏍� 9->8
+ if((order.getDocType() == 16L || order.getDocType() == 24L || order.getDocType() == 3) && order.getCstmrName().equals("鍜屽緱绉戞妧")){
+ order.setDocType(23L);
+ order.setSettle(4L);//杞负鍑哄簱鍗曟嵁涓婃姤
+ }else{
+ if(order.getDocType() == 23L){
+ Order order1 = orderService.selectOne(new EntityWrapper<Order>().eq("salesman",order.getOrderNo()));
+ orderService.updateOrderStatus4(order1.getOrderNo());
+ }
+ order.setSettle(8L); // 鏇存柊鐘舵�佷负宸蹭笂鎶ュ鏍� 9->8
+ }
orderService.updateById(order);
} else {
log.error("鎺ュ彛璋冪敤澶辫触锛岄敊璇俊鎭�: {}", jsonResponse.getString("message"));
--
Gitblit v1.9.1