From 24673e6132418a4250f111e1ef38e4dbe15e4f7b Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期四, 25 十二月 2025 11:46:54 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java |   38 ++++++++++++++++++++++++++++++++++----
 1 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
index fbe8310..7a19ef6 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
@@ -263,7 +263,7 @@
                 JSONArray data = jsonResponse.getJSONObject("data").getJSONArray("rows");
                 if(data.size()<=0)  continue;
                 //鍟嗗搧妗f鍚屾
-                if (kingDeeUtilType.formId.equals("BD_MATERIAL")) {
+                if(kingDeeUtilType.formId.equals("BD_MATERIAL")) {
                     Tag tag = tagService.selectByName("鍏ㄩ儴", 1);
                     // 澶勭悊鍒嗛〉锛氭牴鎹繑鍥炵殑totalCount鍜宲ageSize璁$畻椤垫暟
                     int pageSize = jsonResponse.getJSONObject("data").getIntValue("pageSize");
@@ -558,6 +558,11 @@
                                             callApiLogSaveOrder(order,kingDeeUtilType, "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧"+matnr, false);
                                             continue;
                                         }
+                                        if (mat.getSafeQty() == null || mat.getSafeQty() == 0) {
+                                            callApiLogSaveOrder(order, kingDeeUtilType,
+                                                    "妗f绠辨暟閲忓紓甯革細" + matnr, false);
+                                            continue;
+                                        }
                                         Double erpAnfme = anfme*mat.getSafeQty();
                                         Order order1 = orderService.selectByNo( billNo);
                                         List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order1.getId());
@@ -594,7 +599,7 @@
                                         orderDetl.setBoxType3(pOrderNo);//閲囪喘鍗曞彿
                                         orderDetl.setMemo(memo);//鑻辨枃澶囨敞
                                         orderDetl.setVolume(Totalvolume);//鎬讳綋绉�
-                                        orderDetl.setSafeQty(totalNumItems);//鎬讳欢鏁�
+                                        orderDetl.setPrice(totalNumItems);//鎬讳欢鏁�
                                         orderDetl.setManu(warehouse);//浠撳簱缂栫爜
                                         orderDetl.setCreateBy(9527L);
                                         orderDetl.setCreateTime(new Date());
@@ -734,6 +739,11 @@
                                 if (Cools.isEmpty(mat)) {
                                     callApiLogSaveOrder(order, kingDeeUtilType,
                                             "鍟嗗搧涓嶅瓨鍦細" + matnr, false);
+                                    continue;
+                                }
+                                if (mat.getSafeQty() == null || mat.getSafeQty() == 0) {
+                                    callApiLogSaveOrder(order, kingDeeUtilType,
+                                            "妗f绠辨暟閲忓紓甯革細" + matnr, false);
                                     continue;
                                 }
                                 Double erpAnfme = anfme*mat.getSafeQty();
@@ -901,6 +911,11 @@
                                 if (Cools.isEmpty(mat)) {
                                     callApiLogSaveOrder(order, kingDeeUtilType,
                                             "鍟嗗搧涓嶅瓨鍦細" + matnr, false);
+                                    continue;
+                                }
+                                if (mat.getSafeQty() == null || mat.getSafeQty() == 0) {
+                                    callApiLogSaveOrder(order, kingDeeUtilType,
+                                            "妗f绠辨暟閲忓紓甯革細" + matnr, false);
                                     continue;
                                 }
                                 Double erpAnfme = anfme*mat.getSafeQty();
@@ -1229,6 +1244,11 @@
                                             "鐗╂枡妗f涓嶅瓨鍦細" + matnr, false);
                                     continue;
                                 }
+                                if (mat.getSafeQty() == null || mat.getSafeQty() == 0) {
+                                    callApiLogSaveOrder(order, kingDeeUtilType,
+                                            "妗f绠辨暟閲忓紓甯革細" + matnr, false);
+                                    continue;
+                                }
                                 anfmeBox = Math.floor(anfme / mat.getSafeQty());
                                 // ========= 鏄庣粏鍘婚噸 =========
                                 List<OrderDetl> orderDetls =
@@ -1398,6 +1418,11 @@
                                             "鍟嗗搧涓嶅瓨鍦細" + matnr, false);
                                     continue;
                                 }
+                                if (mat.getSafeQty() == null || mat.getSafeQty() == 0) {
+                                    callApiLogSaveOrder(order, kingDeeUtilType,
+                                            "妗f绠辨暟閲忓紓甯革細" + matnr, false);
+                                    continue;
+                                }
                                 anfmeBox = Math.floor(anfme / mat.getSafeQty());
                                 // ========= 鏄庣粏鍘婚噸 =========
                                 List<OrderDetl> orderDetls =
@@ -1477,6 +1502,7 @@
                             String owner = "鍜屽緱绉戞妧";
                             String ownerUuid = "BU-00001";
                             String orderId = jsonObjectNew.getString("id");
+                            String manuBill = jsonObjectNew.getString("manufacturenun");
                             // ========= 璐т富鏍¢獙 =========
                             LocOwner locOwner = locOwnerService.selectByUuid(ownerUuid);
 //                            if (locOwner == null) {
@@ -1497,7 +1523,7 @@
                                         null,    // 椤圭洰缂栧彿
                                         orderId,    //鏀舵枡鍗昳d
                                         null,    // 璋冩嫧椤圭洰缂栧彿
-                                        null,    // 鍒濆绁ㄦ嵁鍙�
+                                        manuBill,    // 鍒濆绁ㄦ嵁鍙�
                                         null,    // 绁ㄦ嵁鍙�
                                         null,    // 椤圭洰id
                                         owner,    // 璐т富
@@ -1552,7 +1578,9 @@
                                 String s1 = entry.getString("eap7_textfield7"); //瀹㈡埛PO
                                 String detlId = entry.getString("id"); //鏄庣粏id
                                 Long seq = entry.getLong("seq"); //鍒嗗綍琛屽彿
-//                                String suppCode = entry.getString("supplier_number");
+                                String manubill = entry.getString("manufacturenun");
+                                String manubillid = entry.getString("orderid_id");
+                                String manuentryid = entry.getString("mftentryid");
                                 String suppCode = null;
                                 if (anfme == null || anfme == 0) {
                                     callApiLogSaveOrder(order, kingDeeUtilType,
@@ -1583,6 +1611,8 @@
                                 // ========= 淇濆瓨鏄庣粏 =========
                                 OrderDetl orderDetl = new OrderDetl();
                                 orderDetl.sync(mat);
+                                orderDetl.setModel(manubillid);//orderid_id
+                                orderDetl.setBrand(manuentryid);//manuentryid
                                 orderDetl.setThreeCode(detlId);
                                 orderDetl.setLineNumber(seq);
                                 orderDetl.setAnfme(anfmeBox);

--
Gitblit v1.9.1