From a8e17146ca46945d9c0ad15f2d3e18e69299a3cc Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期一, 24 三月 2025 15:04:02 +0800
Subject: [PATCH] 新增 BinInfoList 属性及相关类

---
 Tiger.Business.WMS/Transaction/Out_Default.cs |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Tiger.Business.WMS/Transaction/Out_Default.cs b/Tiger.Business.WMS/Transaction/Out_Default.cs
index 77518d0..aab2fe5 100644
--- a/Tiger.Business.WMS/Transaction/Out_Default.cs
+++ b/Tiger.Business.WMS/Transaction/Out_Default.cs
@@ -9,6 +9,7 @@
 using System.Threading.Tasks;
 using Tiger.Model;
 using Tiger.IBusiness;
+using Tiger.Model.Entitys.MES.Position;
 
 namespace Tiger.Business.WMS.Transaction
 {
@@ -19,7 +20,7 @@
     {
         public IOut_Default Init(string id, string userCode, string apiHost, string orgCode)
         {
-            base.Init(id, apiHost, userCode, orgCode);
+            base.Init(id, userCode, apiHost, orgCode);
             Logger.Console.Info($"Start {this.GetType().Name} Transaction[ID: {TransID}]");
             return this;
         }
@@ -75,7 +76,7 @@
                     {
                         action.IsSuccessed = false;
                         action.LocaleMsg = result.LocaleMsg;
-                        return action;
+                        return SetOutPutMqttMsg(action, input.Locale);
                     }
                     var inv = result.Data as Inventory;
 
@@ -85,7 +86,7 @@
                         action.IsSuccessed = false;
                         //action.LocaleMsg = Biz.L($"鐘舵�乕{0}]寮傚父锛岃閲嶆柊鎵弿");
                         action.LocaleMsg = Biz.L("WMS.Default.ScanItem.StatusException", string.Join(',', inv.StatusList.Select(x => x.GetDesc())));
-                        return action;
+                        return SetOutPutMqttMsg(action, input.Locale);
                     }
                     //鍌ㄤ綅楠岃瘉
                     if (inv.Location.IsNullOrEmpty())
@@ -93,7 +94,7 @@
                         action.IsSuccessed = false;
                         //action.LocaleMsg = Biz.L($"鏉＄爜[{0}]搴撳瓨淇℃伅寮傚父: 娌℃湁鍌ㄤ綅淇℃伅锛岃鍏堜笂鏋跺悗鍐嶆壂鎻�(鍌ㄤ綅Id: {1})");
                         action.LocaleMsg = Biz.L("WMS.Default.ScanItem.LocationIsNull", inv.CurPkg.SN, inv.CurPkg.LOCATION_ID);
-                        return action;
+                        return SetOutPutMqttMsg(action, input.Locale);
                     }
                     //鐗╂枡楠岃瘉
                     if (inv.ItemInfo.IsNullOrEmpty() || inv.ItemInfo.IS_ACTIVE == "N")
@@ -101,7 +102,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));
-                        return action;
+                        return SetOutPutMqttMsg(action, input.Locale);
                     }
                     CurInvItem = inv;
 
@@ -112,7 +113,7 @@
                         action.Data.Command = Command = "ComfirmQty";
                         //action.LocaleMsg = Biz.L("璇风‘璁ゆ潯鐮乕{0}]瑕佷笅鏋剁殑鏁伴噺");
                         action.LocaleMsg = Biz.L("WMS.Default.ScanItem.ComfirmOutQty", input.SN);
-                        return action;
+                        return SetOutPutMqttMsg(action, input.Locale);
                     }
                 }
 
@@ -128,7 +129,7 @@
                         action.Data.Command = Command = "ComfirmQty";
                         //action.LocaleMsg = Biz.L("涓嬫灦鏁伴噺涓嶈兘灏忎簬绛変簬闆讹紝璇烽噸鏂扮‘璁ゆ潯鐮乕{0}]鐨勪笅鏋舵暟閲�");
                         action.LocaleMsg = Biz.L("WMS.Default.ScanItem.ReComfirmOutQty", input.SN);
-                        return action;
+                        return SetOutPutMqttMsg(action, input.Locale);
                     }
                     else if (qtyList.Any(q => q.QTY > CurInvItem.Items.First(i => i.SN == q.SN).QTY))
                     {
@@ -137,7 +138,7 @@
                         action.Data.Command = Command = "ComfirmQty";
                         //action.LocaleMsg = Biz.L("涓嬫灦鏁伴噺涓嶈兘瓒呰繃鍘熸潯鐮佹暟閲忥紝璇烽噸鏂扮‘璁ゆ潯鐮乕{0}]鐨勪笅鏋舵暟閲�");
                         action.LocaleMsg = Biz.L("WMS.Default.ScanItem.ReComfirmExceedOutQty", input.SN);
-                        return action;
+                        return SetOutPutMqttMsg(action, input.Locale);
                     }
                     else
                     {
@@ -158,7 +159,7 @@
                     action.IsSuccessed = false;
                     action.LocaleMsg = downResult.LocaleMsg;
                     ResetScan();
-                    return action;
+                    return SetOutPutMqttMsg(action, input.Locale);
                 }
 
                 //鐏伅
@@ -176,7 +177,7 @@
                 //action.CatchExceptionWithLog(ex, $"鎵弿鏉＄爜[{input.SN}]澶嶆牳寮傚父");
                 action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.ScanItem.ScanException", input.SN));
             }
-            return action;
+               return SetOutPutMqttMsg(action, input.Locale);
         }
 
         /// <summary>
@@ -292,7 +293,7 @@
 
             //閲嶇疆宸ュ簭
             ResetScan();
-            return action;
+            return SetOutPutMqttMsg(action, locale);
         }
 
         #endregion

--
Gitblit v1.9.3