From c6e32e5da5d30ce2f74f0e32c3290d421c0951f2 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期六, 13 十二月 2025 17:20:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs
---
src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
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..c8f8fdd 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
@@ -82,7 +82,9 @@
private JSONObject buildRequestParams(Order order, KingDeeUtilType kingDeeUtilType, SimpleDateFormat sdf1, SimpleDateFormat sdf2) {
List<OrderDetl> orderDetlList = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no",order.getOrderNo()));
-
+ if(kingDeeUtilType == null){
+ return null;
+ }
switch (kingDeeUtilType.formId) {
case "PUR_RECEIVEBIll": // 杩涗粨閫氱煡鍗�
path = imPurinbillAdd;
@@ -98,10 +100,12 @@
if (orderDetl.getQty() == 0) {
continue;
}
-
+// JSONArray idArr = new JSONArray();
+// idArr.add(0L); // 鉁� 娉ㄦ剰蹇呴』鏄� Long 绫诲瀷鐨� 0L
+// Double reportNum = orderDetl.getQty() - orderDetl.getWorkQty();//涓婃姤鏁伴噺鍑忓幓宸蹭笂鎶ユ暟閲�
// 鍒涘缓 billentry_lk 瀵硅薄
JSONObject billentryLk = new JSONObject()
- .fluentPut("id", Long.parseLong(orderDetl.getThreeCode()))
+ .fluentPut("id", 0L)
.fluentPut("seq", orderDetl.getLineNumber())
.fluentPut("billentry_lk_stableid", 677270092232273922L)
.fluentPut("billentry_lk_sbillid", Long.parseLong(order.getItemName())) // 涓诲崟ID
@@ -111,7 +115,7 @@
billentryLkArray.add(billentryLk);
// 鍒涘缓 billentry 瀵硅薄锛屽～鍏呯己澶辩殑瀛楁
JSONObject billentry = new JSONObject()
- .fluentPut("id", Long.parseLong(orderDetl.getThreeCode()))
+ .fluentPut("id", 0L)
.fluentPut("warehouse_number", orderDetl.getManu()) // 浠撳簱缂栧彿
.fluentPut("invstatus_number", "110") // 搴撳瓨鐘舵��
.fluentPut("invtype_number", "110") // 搴撳瓨绫诲瀷
@@ -119,16 +123,16 @@
.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);
+// orderDetl.setWorkQty(orderDetl.getQty());
+// orderDetlService.updateById(orderDetl);//灏嗕笂鎶ユ暟瑕嗙洊鍒板巻鍙蹭笂
}
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 +144,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 鏁扮粍娣诲姞鍒拌姹傚弬鏁�
)));
@@ -208,13 +211,10 @@
JSONObject resultItem = resultArray.getJSONObject(i);
String billNo = resultItem.getString("number"); // 鑾峰彇杩斿洖鐨勫崟鎹彿
String billId = resultItem.getString("id"); // 鑾峰彇杩斿洖鐨処D
+ order.setNumber(billId);
+ orderService.updateById(order);
+ log.info("璁㈠崟鍙� {} 涓庤繑鍥炵殑鍗曟嵁鍙峰尮閰嶏紝璁剧疆璁㈠崟 ID 涓� {}", order.getOrderNo(), billId);
- // 鍒ゆ柇杩斿洖鐨勫崟鎹彿涓庤鍗曞彿鏄惁涓�鑷�
- if (billNo != null && billNo.equals(order.getOrderNo())) {
- // 濡傛灉涓�鑷达紝璁剧疆璁㈠崟鐨� number
- order.setNumber(billId);
- log.info("璁㈠崟鍙� {} 涓庤繑鍥炵殑鍗曟嵁鍙峰尮閰嶏紝璁剧疆璁㈠崟 ID 涓� {}", order.getOrderNo(), billId);
- }
}
} else {
log.error("鎺ュ彛璋冪敤澶辫触锛屽け璐ョ殑鎿嶄綔鏁伴噺: {}", failCount);
--
Gitblit v1.9.1