From 74f4d54e15111db46e15680cb47ba7bec847fc3b Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期五, 14 三月 2025 15:47:45 +0800
Subject: [PATCH] 增加送货单(U9)清点和收货单(U9)上架的Controller

---
 Tiger.Business.WMS/Transaction/In_Default.cs |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/Tiger.Business.WMS/Transaction/In_Default.cs b/Tiger.Business.WMS/Transaction/In_Default.cs
index 4ce9e9a..ef69adc 100644
--- a/Tiger.Business.WMS/Transaction/In_Default.cs
+++ b/Tiger.Business.WMS/Transaction/In_Default.cs
@@ -103,7 +103,7 @@
                     {
                         action.IsSuccessed = false;
                         //action.LocaleMsg = Biz.L("鐗╂枡缂栫爜[{0}]涓嶅瓨鍦ㄦ垨鑰呰鐗╂枡鏈惎鐢�");
-                        action.LocaleMsg = Biz.L("WMS.Default.ScanItem.ItemCodeNotExistsOrNotActive", inv.ItemInfo.ITEM_CODE.IsNullOrEmpty(inv.Barcode.ItemCode));
+                        action.LocaleMsg = Biz.L("WMS.Default.ScanItem.ItemCodeNotExistsOrNotActive", inv.ItemInfo?.ITEM_CODE.IsNullOrEmpty(inv.Barcode.ItemCode));
                         return action;
                     }
 
@@ -181,7 +181,7 @@
                     CurInvItem = inv;
 
                     //妫�鏌ョ墿鏂欐暟閲忥紝濡傛灉娌℃湁鍒欐煡璇㈤泤杈炬潯鐮佷富妗o紝鎶婃暟閲忚繑鍥炲墠绔‘璁�
-                    if (CurInvItem.Items.Any(q => q.QTY <= 0))
+                    //if (CurInvItem.Items.Any(q => q.QTY <= 0))
                     {
                         var qtyList = Biz.DataSource["YadaU9C"].Client.Queryable<mes_MaterialBarCode>().Where(q => CurInvItem.Items.Select(q => q.SN).Contains(q.Code)).ToList();
                         foreach (var qty in qtyList)
@@ -427,8 +427,8 @@
             //action.LocaleMsg = Biz.L($"鎵弿鏉$爜[{0}]涓婃灦鍒板偍浣峓{1}]鎴愬姛");
             action.LocaleMsg = Biz.L("WMS.Default.ScanItem.PutOnSucceeded", CurInvItem.SN, CurInvItem.Location.LOCATION_CODE);
 
-            //閲嶇疆宸ュ簭
-            ResetScan();
+            //閲嶇疆鎵爜淇℃伅
+            ResetScanInfo();
             return action;
         }
 
@@ -440,9 +440,17 @@
         public override void ResetScan()
         {
             base.ResetScan();
+            ResetScanInfo();
+            CurScanShelf = null;
+        }
+
+        /// <summary>
+        /// 閲嶇疆鎵爜淇℃伅
+        /// </summary>
+        public void ResetScanInfo()
+        {
             Command = null;
             CurInvItem = null;
-            CurScanShelf = null;
         }
 
         public override bool Close(bool needSaveHistoryLog = false)

--
Gitblit v1.9.3