From f08dd93e49e8461f362c8f45f17fe10e0fbdebec Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 12 一月 2026 18:54:58 +0800
Subject: [PATCH] #新增和得码入库流程，渝程进仓后续下发货主转换
---
src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java | 46 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 37 insertions(+), 9 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 bd93c82..9a15295 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
@@ -26,6 +26,7 @@
import java.util.Arrays;
import java.util.HashMap;
import java.util.Set;
+import java.util.concurrent.TimeUnit;
/**
* Created by vincent on 2023/10/21
@@ -56,15 +57,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
@@ -107,7 +112,10 @@
SimpleDateFormat sdf1, SimpleDateFormat sdf2) {
JSONArray idArray = new JSONArray();
JSONObject dataObj = new JSONObject();
- switch (kingDeeUtilType.formId) {
+ if(kingDeeUtilType == null){
+ return null;
+ }
+ switch(kingDeeUtilType.formId) {
case "PUR_RECEIVEBIll": // 杩涗粨閫氱煡鍗曟彁浜�
path = imPurinbillBatchAudit;
idArray.add(order.getNumber());
@@ -116,6 +124,16 @@
case "SAL_OUTSTOCK"://閿�鍞嚭搴撲笂鎶�
path = imSaloutbillReport;
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"://閿�鍞��鏂欏崟
@@ -138,10 +156,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());
@@ -171,6 +190,7 @@
.setUri(URL)
.setPath(path)
.setJson(add.toJSONString()) // 灏� JSONObject 杞崲涓� String
+ .setTimeout(30, TimeUnit.SECONDS)
.build()
.doPost();
@@ -190,14 +210,14 @@
.setUri(URL)
.setPath(path)
.setJson(add.toJSONString()) // 灏� JSONObject 杞崲涓� String
+ .setTimeout(30, TimeUnit.SECONDS)
.build()
.doPost();
}
// 瑙ｆ瀽杩斿洖鐨勫搷搴�
JSONObject data = jsonResponse.getJSONObject("data");
- String errorCode = jsonResponse.getString("errorCode");
boolean status = jsonResponse.getBooleanValue("status");
- if ("0".equals(errorCode) && status) {
+ if (status) {
// 鑾峰彇鎴愬姛涓庡け璐ョ殑鏁伴噺
int successCount = data.getInteger("successCount");
int failCount = data.getInteger("failCount");
@@ -221,8 +241,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