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/SaveOrderSyncScheduler.java | 2 +-
src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java | 3 ++-
src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java | 2 +-
src/main/java/com/zy/asrs/task/kingdee/handler/SubmitOrderSyncHandler.java | 4 ++--
src/main/resources/application.yml | 4 ++--
src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java | 10 ++++++++--
6 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
index e876051..5d92c1f 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
@@ -47,7 +47,7 @@
List<Order> orders = orderService.selectComplete();
if(orders.size() > 0){
for (Order order : orders) {
- if((order.getDocType() == 3 || order.getDocType() == 16) && order.getPayType() == null){ //璧版柊澧炴彁浜ゅ鏍告祦绋�
+ if((order.getDocType() == 3 || order.getDocType() == 16 || order.getDocType() == 23) && order.getPayType() == null){ //璧版柊澧炴彁浜ゅ鏍告祦绋�
ReturnT<String> result = saveOrderSyncHandler.start(order);//4宸插畬鎴�
if (!result.isSuccess()) {
log.error("鍗曟嵁[orderNo={}]鏂板淇濆瓨鑷砮rp澶辫触", order.getOrderNo());
diff --git a/src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java
index f1c8d8e..e157e15 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java
@@ -34,7 +34,7 @@
@Value("${erp.switch.ReviewOrderSwitch}")
private boolean ReviewOrderSwitch;
- @Scheduled(cron = "0/20 * * * * ?")
+// @Scheduled(cron = "0/20 * * * * ?")
@Async("orderThreadPool")
public void completeAndReport(){
if(!ReviewOrderSwitch){
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 67a78f0..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
@@ -121,9 +121,9 @@
idArray.add(order.getOrderNo());
dataObj.fluentPut("billno", idArray);
return new JSONObject().fluentPut("data", dataObj);
- case "STK_imSaloutbill"://閿�鍞嚭搴撲笂鎶�
+ case "STK_imSaloutbill":
path = imSaloutbillReport;
- idArray.add(order.getOrderNo());
+ idArray.add(order.getShipCode());
dataObj.fluentPut("billno", idArray);
return new JSONObject().fluentPut("data", dataObj);
case "SAL_RETURNSTOCK"://閿�鍞��鏂欏崟
@@ -232,6 +232,12 @@
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);
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java
index 0447a06..e87b08a 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java
@@ -270,7 +270,7 @@
.fluentPut("data", new JSONArray(Arrays.asList(
new JSONObject()
.fluentPut("id", 0L)
- .fluentPut("billno", order.getOrderNo())
+ .fluentPut("billno", UUID.randomUUID().toString().replace("-", "").substring(0, 16))
.fluentPut("bizorg_number", "BU-00001")
.fluentPut("dept_number", "Org-00002")
.fluentPut("billstatus", "B")
@@ -407,6 +407,7 @@
String billNo = resultItem.getString("number"); // 鑾峰彇杩斿洖鐨勫崟鎹彿
String billId = resultItem.getString("id"); // 鑾峰彇杩斿洖鐨処D
order.setNumber(billId);
+ order.setShipCode(add.getString("billno"));
}
} else {
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/SubmitOrderSyncHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/SubmitOrderSyncHandler.java
index 27658b3..7d81463 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/SubmitOrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/SubmitOrderSyncHandler.java
@@ -101,9 +101,9 @@
idArray.add(order.getNumber());
dataObj.fluentPut("ids", idArray);
return new JSONObject().fluentPut("data", dataObj);
- case "STK_imSaloutbill"://鍏朵粬鍏ュ簱鍗�
+ case "STK_imSaloutbill":
path = imSaloutbillSaveSubmit;
- idArray.add(order.getOrderNo());
+ idArray.add(order.getShipCode());
dataObj.fluentPut("billno", idArray);
return new JSONObject().fluentPut("data", dataObj);
case "STK_MISCELLANEOUS"://鍏朵粬鍏ュ簱鍗�
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index e6f7241..ac0401f 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,9 +10,9 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-# url: jdbc:sqlserver://127.0.0.1:1433;databasename=jshdasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=jshdasrs
# url: jdbc:sqlserver://10.10.10.235;databasename=jshdasrs
- url: jdbc:sqlserver://192.168.4.191:50948;databasename=jshdasrs
+# url: jdbc:sqlserver://192.168.4.191:50948;databasename=jshdasrs
username: sa
password: sa@123
mvc:
--
Gitblit v1.9.1