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 | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 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 507dddf..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
@@ -65,6 +66,10 @@
@Value("${erp.address.imOtherinbillAudit}")
//鍏朵粬鍏ュ簱瀹℃牳涓婃姤
private String imOtherinbillAudit;
+
+ @Value("${erp.address.imMdcOmprdinbillBatchAudit}")
+ //鍏朵粬鍏ュ簱瀹℃牳涓婃姤
+ private String imMdcOmprdinbillBatchAudit;
@Autowired
private OrderService orderService;
@Autowired
@@ -126,6 +131,11 @@
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());
@@ -150,6 +160,7 @@
idArray.add(order.getNumber());
dataObj.fluentPut("ids", idArray);
return new JSONObject().fluentPut("data", dataObj);
+
case "STK_MISCELLANEOUS"://鍏朵粬鍏ュ簱鍗�
path = imOtheroutbillAudi;
idArray.add(order.getId());
@@ -179,6 +190,7 @@
.setUri(URL)
.setPath(path)
.setJson(add.toJSONString()) // 灏� JSONObject 杞崲涓� String
+ .setTimeout(30, TimeUnit.SECONDS)
.build()
.doPost();
@@ -198,6 +210,7 @@
.setUri(URL)
.setPath(path)
.setJson(add.toJSONString()) // 灏� JSONObject 杞崲涓� String
+ .setTimeout(30, TimeUnit.SECONDS)
.build()
.doPost();
}
@@ -228,15 +241,13 @@
}
}
}
- if(order.getDocType() == 16L){
+ 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()));
- order1.setPayType(null);
- order1.setSettle(4L);
- orderService.updateById(order1);
+ orderService.updateOrderStatus4(order1.getOrderNo());
}
order.setSettle(8L); // 鏇存柊鐘舵�佷负宸蹭笂鎶ュ鏍� 9->8
}
--
Gitblit v1.9.1