From 4881f66b288c535c3b9da41ee07c9609bacb8481 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 22 十二月 2025 17:01:49 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java |   46 ++++++++++++++++++----------------------------
 1 files changed, 18 insertions(+), 28 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 026457d..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
@@ -112,7 +112,7 @@
                     }
                     Mat mat = matService.selectByMatnr(orderDetl.getMatnr());
                     Double qty = orderDetl.getQty()*mat.getSafeQty();
-                    Double qtytotal = orderDetl.getAnfme()*mat.getSafeQty();
+//                    Double qtytotal = orderDetl.getAnfme()*mat.getSafeQty();
 //                    JSONArray idArr = new JSONArray();
 //                    idArr.add(0L);
                     // 鍒涘缓 billentry_lk 瀵硅薄
@@ -122,7 +122,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", qtytotal)  // ERP鏁伴噺
+                            .fluentPut("billentry_lk_baseqty_old", orderDetl.getAnfme())  // ERP鏁伴噺
                             .fluentPut("billentry_lk_baseqty", qty);  // 浣滀笟鏁伴噺
                     billentryLkArray.add(billentryLk);
                     // 鍒涘缓 billentry 瀵硅薄锛屽~鍏呯己澶辩殑瀛楁
@@ -171,7 +171,7 @@
                     }
                     Mat mat = matService.selectByMatnr(orderDetl.getMatnr());
                     Double qty = orderDetl.getQty()*mat.getSafeQty();
-                    Double qtytotal = orderDetl.getAnfme()*mat.getSafeQty();
+//                    Double qtytotal = orderDetl.getAnfme()*mat.getSafeQty();
 //                    JSONArray idArr = new JSONArray();
 //                    idArr.add(0L);
                     // 鍒涘缓 billentry_lk 瀵硅薄
@@ -181,19 +181,19 @@
                             .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", qtytotal)  // ERP鏁伴噺
+                            .fluentPut("billentry_lk_baseqty_old", orderDetl.getErpAnfme())  // ERP鏁伴噺
                             .fluentPut("billentry_lk_baseqty", qty);  // 浣滀笟鏁伴噺
                     billentryLkArray1.add(billentryLk);
                     // 鍒涘缓 billentry 瀵硅薄锛屽~鍏呯己澶辩殑瀛楁
                     JSONObject billentry = new JSONObject()
                             .fluentPut("id", 0L)
                             .fluentPut("warehouse_number", orderDetl.getManu())  // 浠撳簱缂栧彿
-                            .fluentPut("invstatus_number", "110")  // 搴撳瓨鐘舵��
-                            .fluentPut("invtype_number", "110")  // 搴撳瓨绫诲瀷
-                            .fluentPut("outinvstatus_number", "110")
-                            .fluentPut("linetype_number", "010")  // 琛屽彿绫诲瀷
                             .fluentPut("qty", qty)  // 鏁伴噺
-                            .fluentPut("material_number", orderDetl.getMatnr())  // 鐗╂枡缂栧彿
+                            .fluentPut("baseqty", qty)
+                            .fluentPut("prdqty", qty)
+                            .fluentPut("manubill", order.getDefNumber())
+                            .fluentPut("producttype", "C")
+                            .fluentPut("qualitystatus", "A")
                             .fluentPut("billentry_lk", billentryLkArray1);
 
                     billentryArray1.add(billentry);
@@ -203,16 +203,10 @@
                                 new JSONObject()
                                         .fluentPut("billno", UUID.randomUUID().toString().replace("-", "").substring(0, 16))
                                         .fluentPut("trdbillno", UUID.randomUUID().toString().replace("-", ""))
-                                        .fluentPut("billtype_number", "im_PurInBill_STD_BT_S")
+                                        .fluentPut("billstatus", "C")
+                                        .fluentPut("invscheme_number", "331")
+                                        .fluentPut("biztype_number", "330")
                                         .fluentPut("biztime", sdf1.format(now1))
-                                        .fluentPut("exratedate", sdf1.format(now1))
-                                        .fluentPut("bizorg_number", boxType21)
-                                        .fluentPut("biztype_number", "110")  // 璐т富/璐ф簮
-                                        .fluentPut("org_number", boxType21)  // 璐т富/璐ф簮
-                                        .fluentPut("paymode", "CREDIT")
-                                        .fluentPut("invscheme_number", "110")
-                                        .fluentPut("billtype_number", "im_PurInBill_STD_BT_S")
-                                        .fluentPut("supplier_number", suppCode1)  // 渚涘簲鍟嗙紪鍙�
                                         .fluentPut("billentry", billentryArray1)  // 灏� billentry 鏁扮粍娣诲姞鍒拌姹傚弬鏁�
                         )));
             case "STK_MISCELLANEOUS": // 鍏朵粬鍏ュ簱鍗�
@@ -244,10 +238,10 @@
                                         .fluentPut("billno", order.getOrderNo())
 //                                        .fluentPut("bookdate", sdf1.format(nowMis))
                                         .fluentPut("biztime", sdf1.format(nowMis))
-                                        .fluentPut("biztype_number", "354")
-                                        .fluentPut("billtype_number", "im_OtherInBill_STD_BT_S")
-                                        .fluentPut("org_number", "BU-00001")
-                                        .fluentPut("invscheme_number", "354")
+//                                        .fluentPut("biztype_number", "354")
+//                                        .fluentPut("billtype_number", "im_OtherInBill_STD_BT_S")
+//                                        .fluentPut("org_number", "BU-00001")
+//                                        .fluentPut("invscheme_number", "354")
                                         .fluentPut("billentry", billentryArray)
                         )));
             case "STK_MisDelivery": // 鍏朵粬鍑哄簱鍗�
@@ -339,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);

--
Gitblit v1.9.1