From ce097c93db27e8b7093d9b17b465cf3159249d8d Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期三, 30 四月 2025 17:20:34 +0800
Subject: [PATCH] 来料打印增加导航

---
 Tiger.Business.WMS/Transaction/Yada/In_BIZ_U9_RECEIPT.cs |   27 +++++++++++++++++----------
 1 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/Tiger.Business.WMS/Transaction/Yada/In_BIZ_U9_RECEIPT.cs b/Tiger.Business.WMS/Transaction/Yada/In_BIZ_U9_RECEIPT.cs
index 5f5abeb..3974b58 100644
--- a/Tiger.Business.WMS/Transaction/Yada/In_BIZ_U9_RECEIPT.cs
+++ b/Tiger.Business.WMS/Transaction/Yada/In_BIZ_U9_RECEIPT.cs
@@ -163,12 +163,12 @@
                     if (!inv.ItemInfo.DEFAULT_LOCATION.IsNullOrEmpty() && inv.ItemInfo.DEFAULT_LOCATION != CurScanShelf.LocationCode)
                     {
 	                    action.IsSuccessed = false;
-	                    //action.LocaleMsg = Biz.L("鐗╂枡[{0}]鍙厑璁镐笂鏋跺埌鍌ㄤ綅[{0}]锛岃閲嶆柊鎵弿鍌ㄤ綅");
+	                    //action.LocaleMsg = Biz.L("鐗╂枡[{0}]鍙厑璁镐笂鏋跺埌鍌ㄤ綅[{1}]锛岃閲嶆柊鎵弿鍌ㄤ綅");
 	                    action.LocaleMsg = Biz.L("WMS.Default.ScanItem.DefaultLocationError", inv.ItemInfo.ITEM_CODE, inv.ItemInfo.DEFAULT_LOCATION);
 	                    return SetOutPutMqttMsg(action, input.Locale);
                     }
                     //鍒ゆ柇褰撳墠鏉$爜鏄惁灞炰簬褰撳墠鏀惰揣鍗�
-                    if (CurInvItem.Items.First().TRANS_NO != CurOrder.ORDER_NO)
+                    if (inv.Items.First().TRANS_NO != CurOrder.ORDER_NO)
                     {
                         action.IsSuccessed = false;
                         //action.LocaleMsg = Biz.L("鏉$爜鎵�灞炵殑鍗曟嵁[{0}]涓嶆槸閫夋嫨鐨勬敹璐у崟[{1}]锛岃閲嶆柊鎵弿姝g‘鐨勬潯鐮佹垨閫夋嫨鍏朵粬鏀惰揣鍗�");
@@ -308,6 +308,11 @@
                     sn.STATUS = WMS_ITEM.STATUSs.InStore.GetValue();
                     sn.IS_IN = "Y";
                 }
+                //璁剧疆褰撳墠鐗╂枡鐨勯粯璁ゅ偍浣�
+                if (CurInvItem.ItemInfo.DEFAULT_LOCATION.IsNullOrEmpty())
+                {
+                    SetDefaultLocation(MainDB, CurInvItem.ItemInfo, nLocation, receiptDtl.ID.ToInt64());
+                }
                 //濡傛灉褰撳墠琛屼笂鏋跺畬鎴愭爣璁颁负寰呭鏍�
                 receiptDtl.QTY_IN = receipt.SnList.Where(q => q.LINE_NO == receiptDtl.LINE_NO && q.STATUS == WMS_ITEM.STATUSs.InStore.GetValue()).Sum(q => q.QTY);
                 if (receiptDtl.QTY_IN == receiptDtl.QTY_OK)
@@ -369,14 +374,16 @@
                 });
 
                 //瀹屾垚鎵�鏈夊鐞嗗悗浣跨敤浜嬪姟淇濆瓨鏁版嵁
-                action = DoIfFinish(action, input.Locale, () =>
-                {
-                    //璁剧疆褰撳墠鐗╂枡鐨勯粯璁ゅ偍浣�
-                    if (CurInvItem.ItemInfo.DEFAULT_LOCATION.IsNullOrEmpty())
-                    {
-                        SetDefaultLocation(MainDB, CurInvItem.ItemInfo, nLocation);
-                    }
-                });
+                action = DoIfFinish(action, input.Locale
+                    //, () =>
+                    //{
+                    //    //璁剧疆褰撳墠鐗╂枡鐨勯粯璁ゅ偍浣�
+                    //    if (CurInvItem.ItemInfo.DEFAULT_LOCATION.IsNullOrEmpty())
+                    //    {
+                    //        SetDefaultLocation(MainDB, CurInvItem.ItemInfo, nLocation, receiptDtl.ID.ToInt64());
+                    //    }
+                    //}
+                 );
                 //if (!action.Data.Data.IsNullOrEmpty() && action.Data.Data is DefaultInStoreOutput)
                 //{
                 //    (action.Data.Data as DefaultInStoreOutput).OrderInfo = receipt;

--
Gitblit v1.9.3