From e0300cb5c16e9487d118361141e59f1d7a284b7a Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期二, 09 十二月 2025 14:39:59 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java | 11 ++++++-----
src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java | 13 ++++++-------
src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java | 10 ++++++----
src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java | 11 ++++++-----
4 files changed, 24 insertions(+), 21 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 4f64df0..5a16db0 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java
@@ -42,10 +42,12 @@
if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
// List<Order> orders = OrderInAndOutUtil.selectComplete9(null);//鏌ヨ9鎻愪氦瀹屾垚鐨�
List<Order> orders = orderService.selectComplete9();
- for (Order order : orders) {
- ReturnT<String> result = reviewOrderSyncHandler.start(order);
- if (!result.isSuccess()) {
- log.error("鍗曟嵁[orderNo={}]鍚慹rp瀹℃牳澶辫触", order.getOrderNo());
+ if(orders.size() > 0){
+ for (Order order : orders) {
+ ReturnT<String> result = reviewOrderSyncHandler.start(order);
+ if (!result.isSuccess()) {
+ log.error("鍗曟嵁[orderNo={}]鍚慹rp瀹℃牳澶辫触", order.getOrderNo());
+ }
}
}
}
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 f7184f8..f2072e2 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
@@ -42,11 +42,12 @@
if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
// List<Order> orders = OrderInAndOutUtil.selectComplete(null);
List<Order> orders = orderService.selectComplete();
-
- for (Order order : orders) {
- ReturnT<String> result = saveOrderSyncHandler.start(order);//4宸插畬鎴�
- if (!result.isSuccess()) {
- log.error("鍗曟嵁[orderNo={}]鏂板淇濆瓨鑷砮rp澶辫触", order.getOrderNo());
+ if(orders.size() > 0){
+ for (Order order : orders) {
+ 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 8fbbe6f..ce0e8e1 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java
@@ -44,11 +44,12 @@
if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
// List<Order> orders = OrderInAndOutUtil.selectComplete10(null); //鏌ヨ10鏂板涓婃姤瀹屾垚
List<Order> orders = orderService.selectComplete10();
-
- for (Order order : orders) {
- ReturnT<String> result = submitOrderSyncHandler.start(order);
- if (!result.isSuccess()) {
- log.error("鍗曟嵁[orderNo={}]淇濆瓨鑷砮rp澶辫触", order.getOrderNo());
+ if(orders.size() > 0){
+ for (Order order : orders) {
+ ReturnT<String> result = submitOrderSyncHandler.start(order);
+ if (!result.isSuccess()) {
+ log.error("鍗曟嵁[orderNo={}]鎻愪氦鑷砮rp澶辫触", order.getOrderNo());
+ }
}
}
}
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 9e6b5dd..0f92365 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
@@ -98,10 +98,11 @@
if (orderDetl.getQty() == 0) {
continue;
}
-
+ JSONArray idArr = new JSONArray();
+ idArr.add(0L); // 鉁� 娉ㄦ剰蹇呴』鏄� Long 绫诲瀷鐨� 0L
// 鍒涘缓 billentry_lk 瀵硅薄
JSONObject billentryLk = new JSONObject()
- .fluentPut("id", Long.parseLong(orderDetl.getThreeCode()))
+ .fluentPut("id", idArr)
.fluentPut("seq", orderDetl.getLineNumber())
.fluentPut("billentry_lk_stableid", 677270092232273922L)
.fluentPut("billentry_lk_sbillid", Long.parseLong(order.getItemName())) // 涓诲崟ID
@@ -111,7 +112,7 @@
billentryLkArray.add(billentryLk);
// 鍒涘缓 billentry 瀵硅薄锛屽~鍏呯己澶辩殑瀛楁
JSONObject billentry = new JSONObject()
- .fluentPut("id", Long.parseLong(orderDetl.getThreeCode()))
+ .fluentPut("id", idArr)
.fluentPut("warehouse_number", orderDetl.getManu()) // 浠撳簱缂栧彿
.fluentPut("invstatus_number", "110") // 搴撳瓨鐘舵��
.fluentPut("invtype_number", "110") // 搴撳瓨绫诲瀷
@@ -119,16 +120,15 @@
.fluentPut("linetype_number", "010") // 琛屽彿绫诲瀷
.fluentPut("qty", orderDetl.getQty()) // 鏁伴噺
.fluentPut("material_number", orderDetl.getMatnr()) // 鐗╂枡缂栧彿
- .fluentPut("billentry_lk", billentryLkArray); // 灏� billentry_lk 娣诲姞鍒� billentry
+ .fluentPut("billentry_lk", billentryLkArray);
billentryArray.add(billentry);
}
Date now = new Date();
- // 鐢熸垚 INR 鐩稿叧璇锋眰鍙傛暟
return new JSONObject()
.fluentPut("data", new JSONArray(Arrays.asList(
new JSONObject()
- .fluentPut("billno", UUID.randomUUID().toString().replace("-", ""))
+ .fluentPut("billno", UUID.randomUUID().toString().replace("-", "").substring(0, 16))
.fluentPut("trdbillno", UUID.randomUUID().toString().replace("-", ""))
.fluentPut("billtype_number", "im_PurInBill_STD_BT_S")
.fluentPut("biztime", sdf1.format(now))
@@ -140,7 +140,6 @@
.fluentPut("invscheme_number", "110")
.fluentPut("billtype_number", "im_PurInBill_STD_BT_S")
.fluentPut("supplier_number", suppCode) // 渚涘簲鍟嗙紪鍙�
- .fluentPut("billno", order.getOrderNo())
.fluentPut("billentry", billentryArray) // 灏� billentry 鏁扮粍娣诲姞鍒拌姹傚弬鏁�
)));
--
Gitblit v1.9.1