From ae4f26b64e2dc981986f2990a65b59cd994f7b9b Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 25 十一月 2025 18:35:37 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 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 78a0c28..3f89a76 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
@@ -132,8 +132,8 @@
                     jsonObject.put("start_biztime",  "2025-01-01 00:00:00");//涓氬姟璧峰鏃ユ湡
 
                     jsonObject.put("end_biztime", sdf1.format(now));//涓氬姟缁撴潫鏃ユ湡
-                    jsonObject.put("billno", Arrays.asList("CGSL-251023-000027","CGSL-250811-000028"));
-                    jsonObject.put("billstatus", Arrays.asList("C"));//鏁版嵁鐘舵�� [A:鏆傚瓨, B:宸叉彁浜�, C:宸插鏍竇
+                    jsonObject.put("billno", Arrays.asList("CGSL-251125-000001"));
+                    jsonObject.put("billstatus", Arrays.asList("A","B","C"));//鏁版嵁鐘舵�� [A:鏆傚瓨, B:宸叉彁浜�, C:宸插鏍竇
                     jsonObject.put("start_auditdate", null);//id
                     jsonObject.put("end_auditdate", null);
                     jsonObject.put("org_number", null);
@@ -202,7 +202,7 @@
                             Double height = jsonObjectNew.get("height") != null ? new BigDecimal(jsonObjectNew.get("height").toString()).doubleValue() : 0.0;
                             Double width = jsonObjectNew.get("width") != null ? new BigDecimal(jsonObjectNew.get("width").toString()).doubleValue() : 0.0;
                             Double length = jsonObjectNew.get("length") != null ? new BigDecimal(jsonObjectNew.get("length").toString()).doubleValue() : 0.0;
-
+                            Double netweight = jsonObjectNew.get("netweight") != null ? new BigDecimal(jsonObjectNew.get("grossweight").toString()).doubleValue() : 0.0;
                             // 鐢熸垚鍟嗗搧妗f
                             Mat mat = matService.selectByMatnr(matnr);
                             if (mat == null) {
@@ -210,7 +210,8 @@
                                 mat.setMatnr(matnr);
                                 mat.setMaktx(name);
                                 mat.setTagId(tag.getId());
-                                mat.setWeight(grossweight);
+                                mat.setWeight(grossweight);//鍑�閲�
+                                mat.setUnits(netweight);//姣涢噸
                                 mat.setManLength(length);
                                 mat.setHeight(height);
                                 mat.setWidth(width);
@@ -416,7 +417,8 @@
                                                 now,    // 娣诲姞鏃堕棿
                                                 9527L,    // 淇敼浜哄憳
                                                 now,    // 淇敼鏃堕棿
-                                                null    // 澶囨敞
+                                                null,    // 澶囨敞
+                                                kingDeeUtilType.pakIn !=1?2:1
                                         );
                                         if( orderService.insert(order)){
                                             callApiLogSaveOrder(order, kingDeeUtilType, "鍒涘缓鍏ュ簱鍗曟垚鍔燂紒鍗曞彿锛�" + billNo, true);

--
Gitblit v1.9.1