From c7a31680a32a45c7d47af5162eb8edcb9824d16a Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期三, 24 十二月 2025 15:05:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs

---
 src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 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 ef2d311..4d9d6af 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
@@ -599,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());
@@ -1578,7 +1578,8 @@
                                 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 manubillid = entry.getString("orderid_id");
+                                String manuentryid = entry.getString("mftentryid");
                                 String suppCode = null;
                                 if (anfme == null || anfme == 0) {
                                     callApiLogSaveOrder(order, kingDeeUtilType,
@@ -1609,6 +1610,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