From 3a12d57d962254c693ba03c15a30c8e3d37e415e Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 22 十二月 2025 16:47:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java | 20 +++++++++-----------
src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java | 2 +-
src/main/java/com/zy/asrs/task/kingdee/handler/SubmitOrderSyncHandler.java | 2 +-
src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java | 2 +-
4 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java
index 0a88985..e82d6a2 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java
@@ -32,7 +32,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 dea2057..b97cecd 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
@@ -143,7 +143,7 @@
case "PRD_MORPT"://鐢熶骇姹囨姤鍗�
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;
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 8adf401..17b75ee 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
@@ -181,7 +181,7 @@
.fluentPut("billentry_lk_stableid", 677270092232273922L)
.fluentPut("billentry_lk_sbillid", Long.parseLong(order.getItemName())) // 涓诲崟ID
.fluentPut("billentry_lk_sid", Long.parseLong(orderDetl.getThreeCode())) // 鏄庣粏ID
- .fluentPut("billentry_lk_baseqty_old", orderDetl.getAnfme()) // ERP鏁伴噺
+ .fluentPut("billentry_lk_baseqty_old", orderDetl.getErpAnfme()) // ERP鏁伴噺
.fluentPut("billentry_lk_baseqty", qty); // 浣滀笟鏁伴噺
billentryLkArray1.add(billentryLk);
// 鍒涘缓 billentry 瀵硅薄锛屽～鍏呯己澶辩殑瀛楁
@@ -189,11 +189,11 @@
.fluentPut("id", 0L)
.fluentPut("warehouse_number", orderDetl.getManu()) // 浠撳簱缂栧彿
.fluentPut("qty", qty) // 鏁伴噺
- .fluentPut("baseqty", qty) // 鏁伴噺
- .fluentPut("prdqty", qty) // 鏁伴噺
+ .fluentPut("baseqty", qty)
+ .fluentPut("prdqty", qty)
.fluentPut("manubill", order.getDefNumber())
- .fluentPut("producttype", "C") // 鐗╂枡缂栧彿
- .fluentPut("qualitystatus", "A") // 鐗╂枡缂栧彿
+ .fluentPut("producttype", "C")
+ .fluentPut("qualitystatus", "A")
.fluentPut("billentry_lk", billentryLkArray1);
billentryArray1.add(billentry);
@@ -204,6 +204,8 @@
.fluentPut("billno", UUID.randomUUID().toString().replace("-", "").substring(0, 16))
.fluentPut("trdbillno", UUID.randomUUID().toString().replace("-", ""))
.fluentPut("billstatus", "C")
+ .fluentPut("invscheme_number", "331")
+ .fluentPut("biztype_number", "330")
.fluentPut("biztime", sdf1.format(now1))
.fluentPut("billentry", billentryArray1) // 灏� billentry 鏁扮粍娣诲姞鍒拌姹傚弬鏁�
)));
@@ -331,12 +333,8 @@
JSONObject resultItem = resultArray.getJSONObject(i);
String billNo = resultItem.getString("number"); // 鑾峰彇杩斿洖鐨勫崟鎹彿
String billId = resultItem.getString("id"); // 鑾峰彇杩斿洖鐨処D
- // 鍒ゆ柇杩斿洖鐨勫崟鎹彿涓庤鍗曞彿鏄惁涓�鑷�
- if (billNo != null && billNo.equals(order.getOrderNo())) {
- // 濡傛灉涓�鑷达紝璁剧疆璁㈠崟鐨� number
- order.setNumber(billId);
- log.info("璁㈠崟鍙� {} 涓庤繑鍥炵殑鍗曟嵁鍙峰尮閰嶏紝璁剧疆璁㈠崟 ID 涓� {}", order.getOrderNo(), billId);
- }
+ order.setNumber(billId);
+
}
} else {
log.error("鎺ュ彛璋冪敤澶辫触锛屽け璐ョ殑鎿嶄綔鏁伴噺: {}", failCount);
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 e87f24c..a0f9dfb 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
@@ -97,7 +97,7 @@
case "PRD_MORPT": // 杩涗粨閫氱煡鍗曟彁浜�
path = imProductinbillBatchSubmit;
idArray.add(order.getNumber());
- dataObj.fluentPut("id", idArray);
+ dataObj.fluentPut("ids", idArray);
return new JSONObject().fluentPut("data", dataObj);
case "STK_MISCELLANEOUS"://鍏朵粬鍏ュ簱鍗�
path = imOtherinbillSubmit;
--
Gitblit v1.9.1