From ecee187e81cbb14a4ebd90c2cdc598e7176cdf5f Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期四, 29 一月 2026 15:53:47 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java             |    4 +++-
 src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java |    6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 16387bb..0b018fc 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -778,7 +778,9 @@
             throw new CoolException("鏈煡璇㈠埌鐩稿叧鏈烘鑷傛媶鐮佸灈浠诲姟锛侊紒锛�"+ JSON.toJSONString(param));
         }
 //        basArmMastService.updateArmMastStatus(param.getArm_no(),basArmMast.getSortingLine(),basArmMast.getStaNo(),1,3);
-        basArmMastService.updateArmMastStatus(param.getArm_no(),basArmMast.getSortingLine(),basArmMast.getStaNo(),2,3);
+        if(!basArmMastService.updateArmMastStatus(param.getArm_no(),basArmMast.getSortingLine(),basArmMast.getStaNo(),2,3)){
+            throw new CoolException("鏇存柊鐘舵��2-3鑷姩缁勬墭澶辫触"+ JSON.toJSONString(param));
+        }
     }
 
     @Override
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 322d2d6..4eb43f1 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
@@ -1580,6 +1580,7 @@
                             }
                             for (int k = 0; k < billEntryArray.size(); k++) {
                                 JSONObject entry = billEntryArray.getJSONObject(k);
+                                String memo = null;
                                 String matnr = entry.getString("material_number"); //鐗╂枡缂栫爜锛屽唴閮⊿KU
                                 Double anfmeBox = entry.getDouble("eap7_integerfield");//绠辨暟
                                 Double anfme = entry.getDouble("completqty");//涓暟
@@ -1587,12 +1588,13 @@
                                 Double totalVolume = entry.getDouble("eap7_decimalfield2");//鎬讳綋绉�
                                 String warehouse = entry.getString("warehouse_number");//浠撳簱缂栫爜
                                 if(kingDeeUtilType.formId.equals("OUI_RECEIVEBIll")){
-
+                                    memo = entry.getString("eap7_textfield3"); //澶囨敞锛堣嫳鏂囨弿杩帮級
+                                }else{
+                                    memo = entry.getString("eap7_textfield5");
                                 }
                                 String pOrderNo = entry.getString("eap7_textfield");//閲囪喘鍗曞彿
                                 String s3 = entry.getString("eap7_textfield2");//瀹㈡埛sku锛堝鎴风紪鍙凤級
                                 String s2 = entry.getString("eap7_textfield1"); //鏉$爜UPC
-                                String memo = entry.getString("eap7_textfield5"); //澶囨敞锛堣嫳鏂囨弿杩帮級
                                 String s1 = entry.getString("eap7_textfield4"); //瀹㈡埛PO
                                 String detlId = entry.getString("id"); //鏄庣粏id
                                 Long seq = entry.getLong("seq"); //鍒嗗綍琛屽彿

--
Gitblit v1.9.1