From 2c60540518b5f2071987dcbe6aa237af4b97c77a Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期一, 12 五月 2025 23:49:52 +0800
Subject: [PATCH] 修复了一些已知问题

---
 Tiger.Business.WMS/Transaction/Yada/Out_BIZ_WMS_PREP.cs |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/Tiger.Business.WMS/Transaction/Yada/Out_BIZ_WMS_PREP.cs b/Tiger.Business.WMS/Transaction/Yada/Out_BIZ_WMS_PREP.cs
index 634d16f..e8bd236 100644
--- a/Tiger.Business.WMS/Transaction/Yada/Out_BIZ_WMS_PREP.cs
+++ b/Tiger.Business.WMS/Transaction/Yada/Out_BIZ_WMS_PREP.cs
@@ -10,11 +10,7 @@
 using Tiger.Model;
 using Tiger.IBusiness;
 using Tiger.Business.WMS.Common;
-using Org.BouncyCastle.Ocsp;
-using Tiger.Model.Sharetronic.Shelf;
-using MailKit.Search;
 using Tiger.Business.WMS.Extensions;
-using static Tiger.Model.BIZ_WMS_PREP_BTH;
 
 namespace Tiger.Business.WMS.Transaction
 {
@@ -51,7 +47,8 @@
             var action = new ApiAction<ScanOutput>(new ScanOutput());
             try
             {
-
+                //Result<List<SuggestItem>> result = Suggest("CurPrepDtl.ORDER_NO", "CurPrepDtl.ITEM_CODE", new SuggestOption(), new(), 100.0);
+                //action.LocaleMsg = result.LocaleMsg;
                 if (input.Command == "ScanOrder")
                 {
                     action = await ScanOrder(input);
@@ -222,7 +219,7 @@
                         var actQty = CurPrepDtl.QTY_PREP > CurPREP.BizType.GetActReqQty(CurPrepDtl) ? 0 : (CurPREP.BizType.GetActReqQty(CurPrepDtl) - CurPrepDtl.QTY_PREP);
                         if (inv != null && actQty > 0)
                         {
-                            inv.poolItem = inv.Item.GetPoolItem(OrgCode, nameof(CurPREP.Order), CurPrepDtl.ORDER_NO, CurPrepDtl.ORDER_LINE, actQty, true);
+                            inv.poolItem = inv.Item.GetPoolItem(OrgCode, TransID, nameof(CurPREP.Order), CurPrepDtl.ORDER_NO, CurPrepDtl.ORDER_LINE, actQty, true);
                         }
                         else
                         {
@@ -246,12 +243,13 @@
                     }
 
                     Suggests.Clear();
+                    Suggests = result.Data;
                     var remain = actQty;
                     Suggests.ForEach((inv) =>
                     {
                         if (remain > 0)
                         {
-                            inv.poolItem = inv.Item.GetPoolItem(input.AuthOption.OrgCode, nameof(CurPREP.Order), CurPrepDtl.ORDER_NO, CurPrepDtl.ORDER_LINE, remain, false);
+                            inv.poolItem = inv.Item.GetPoolItem(OrgCode, TransID, nameof(CurPREP.Order), CurPrepDtl.ORDER_NO, CurPrepDtl.ORDER_LINE, remain, false);
                             remain -= inv.poolItem.ALLOC_QTY;
                         }
                         else
@@ -792,7 +790,7 @@
         /// <returns></returns>
         public async Task<ApiAction> GenerateDlvyBatch(BaseInput input)
         {
-            var range = input.Data.ToInt32().GetEnum<BATCH_RANGEs>();
+            var range = input.Data.ToInt32().GetEnum<BIZ_WMS_PREP_BTH.BATCH_RANGEs>();
             var action = await CurPREP.Order.BIZ_TYPE.GetEnum<BIZ_WMS_PREP.BIZ_TYPEs>() .GenerateDlvyBatch(this, range);
             return action;
         }
@@ -827,7 +825,7 @@
             //CloseLight(LocationHis).Wait();
             if (!(CurPREP?.Order?.ORDER_NO ?? "").IsNullOrEmpty())
             {
-                MainDB.Deleteable<WMS_ITEM_POOL>().Where(x => x.TRANS_NO == CurPREP.Order.ORDER_NO).ExecuteCommand();
+                MainDB.Deleteable<WMS_ITEM_POOL>().Where(q => q.TRANS_NO == CurPREP.Order.ORDER_NO || q.TRANS_ID == TransID).ExecuteCommand();
             }
 
             this.IsFinished = true;

--
Gitblit v1.9.3