From 990807a09cf35a73b20e213a4df82acddec40f4b Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 04 三月 2025 00:58:15 +0800
Subject: [PATCH] 雅达-更改多个文件中的数据类型和属性

---
 Tiger.Business.WMS/Transaction/In_SemiProd.cs |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Tiger.Business.WMS/Transaction/In_SemiProd.cs b/Tiger.Business.WMS/Transaction/In_SemiProd.cs
index c05caa6..17dbcef 100644
--- a/Tiger.Business.WMS/Transaction/In_SemiProd.cs
+++ b/Tiger.Business.WMS/Transaction/In_SemiProd.cs
@@ -81,7 +81,9 @@
                     action.LocaleMsg = Biz.L("WMS.InSemiProd.ScanItem.WoEmptyFailure", input.SN); // $"宸ュ崟[{input.SN}]涓嶅瓨鍦�"
                     return action;
                 }
-                
+
+                var semiTemplateQty = (input.Data ?? "").JsonToObject<SemiTemplateQty>() ?? new SemiTemplateQty();
+
                 InStoreInfo Info = new()
                 {
                     ErpProdInBth = new()
@@ -92,7 +94,8 @@
                         ITEM_CODE = wo.ITEM_CODE,
                         ITEM_NAME = wo.ItemInfo?.ITEM_DESC,
                         SapCode = wo.ItemInfo?.ExtInfo?.SapCode,
-                        SCAN_QTY = input.Data.ToInt32(),
+                        SCAN_QTY = semiTemplateQty.PackQty,
+                        CompleteQty = semiTemplateQty.CompleteQty,
                         IS_HANDLED = "N" //Y-宸茬敓鎴愶紝N-鏈敓鎴愶紝F-澶辫触
                     },
                     InStoreScanInfo = new()
@@ -101,7 +104,7 @@
                         SALES_ORDER = wo.SALES_ORDER,
                         WORK_ORDER = wo.ORDER_NO,
                         BATCH_NO = "",
-                        SCAN_QTY = input.Data.ToInt32()
+                        SCAN_QTY = semiTemplateQty.PackQty.ToDouble()
                     }
                 };
 
@@ -273,7 +276,7 @@
             ErpProdInBths.Clear();
             InStoreScanInfos.Clear();
             RcvRptInput.ErpProdInBths = Biz.Db.Queryable<BIZ_ERP_PROD_IN_BTH>()
-                .Where(q => q.BATCH_NO == SqlFunc.Subqueryable<BIZ_ERP_PROD_IN_BTH>().Where(s => s.ORDER_NO == UserCode && s.GHOST_ROW == false).Select(s => s.BATCH_NO))
+                .Where(q => q.BATCH_NO == SqlFunc.Subqueryable<BIZ_ERP_PROD_IN_BTH>().Where(s => s.ORDER_NO == UserCode && s.GHOST_ROW == false).Select(s => s.BATCH_NO) && q.IS_HANDLED == "N")
                 .IncludesAllFirstLayer().ToList();
             foreach (var item in RcvRptInput.ErpProdInBths)
             {
@@ -376,8 +379,8 @@
                             WorkOrder = item.WORK_ORDER,
                             ItemCode = item.ITEM_CODE,
                             WhCode = "10105",
-                            PkgQty = item.SCAN_QTY.ToInt32(),
-                            CompleteQty = item.SCAN_QTY.ToInt32(),
+                            PkgQty = item.SCAN_QTY,
+                            CompleteQty = item.CompleteQty,
                             OutputType = 0,
                             StorageType = 4,
                             DocState = 1,

--
Gitblit v1.9.3