From 62750a4a726896b803fa0f7b1862c19f7bd04f4c Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期一, 10 二月 2025 14:37:23 +0800
Subject: [PATCH] 1.生产补料初步完成(拆分补料还未完成) 2.出库物料明细实体类调整

---
 service/Warehouse/MesItemBlManager.cs |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/service/Warehouse/MesItemBlManager.cs b/service/Warehouse/MesItemBlManager.cs
index ff3728d..0349e88 100644
--- a/service/Warehouse/MesItemBlManager.cs
+++ b/service/Warehouse/MesItemBlManager.cs
@@ -68,6 +68,7 @@
     }
 
     /// <summary>
+    /// 鐢熶骇宸ュ崟琛ユ枡鎵爜
     ///     鎵弿鏉$爜  prc_rf_pda_scan_zout_barcode3
     /// </summary>
     /// <param name="query">鏌ヨ鍙傛暟</param>
@@ -80,7 +81,7 @@
     ///     - blNo: 琛ユ枡鍗曞彿(蹇呭~)
     /// </remarks>
     public (WarehouseQuery item, List<MesItemBlDetail> pendingList)
-        SctlScanBarcode(
+        ScblScanBarcode(
             WarehouseQuery query)
     {
         if (string.IsNullOrEmpty(query.billNo))
@@ -114,7 +115,7 @@
 
         // 妫�鏌ヨˉ鏂欏崟鐘舵��
         var mesItemBl = Db.Queryable<MesItemBl>()
-            .Where(a => a.BlNo == query.blNo && (a.Bl018 ?? false) == false)
+            .Where(a => a.BlNo == query.blNo)
             .First();
 
         if (mesItemBl == null)
@@ -220,6 +221,7 @@
                     Remark = mesItemBl.Bl007,
                     DepotCode = womdab.Dab017,
                     OutPart = womdaa.Daa013,
+                    OutType = "鐢熶骇琛ユ枡",
                     FType = 0,
                     Factory = stockBarcode.Factory,
                     Company = stockBarcode.Company,
@@ -228,23 +230,23 @@
                     PbillNo = womdaa.Daa001,
                     OutDate = DateTime.Now,
                     Status = 0,
-                    BbillNo = query.blNo
+                    BbillNo = query.billNo
                 }).IgnoreColumns(true).ExecuteCommand();
             }
 
             // 妫�鏌ュ苟鏇存柊鍑哄簱鍗曠墿鏂欐槑缁�
             var itemCount = db.Queryable<MesInvItemOutItems>()
                 .Where(i =>
-                    i.ItemOutId == outId && i.ItemId == stockBarcode.ItemId)
+                    i.ItemOutId == outId && i.ItemId == stockBarcode.ItemId && i.ItemOutId == outId)
                 .Count();
 
             if (itemCount > 0)
                 // 鏇存柊宸插瓨鍦ㄧ殑鐗╂枡鏄庣粏鏁伴噺
                 db.Updateable<MesInvItemOutItems>()
                     .SetColumns(i =>
-                        i.Quantity == i.Quantity + stockBarcode.Quantity)
+                        i.TlQty == i.TlQty + stockBarcode.Quantity)
                     .Where(i =>
-                        i.ItemOutId == outId && i.ItemId == stockBarcode.ItemId)
+                        i.ItemOutId == outId && i.ItemId == stockBarcode.ItemId && i.ItemOutId == outId)
                     .ExecuteCommand();
             else
                 // 鎻掑叆鏂扮殑鐗╂枡鏄庣粏璁板綍
@@ -254,6 +256,7 @@
                     ItemOutId = outId,
                     ItemNo = blDetail.Bld002,
                     Quantity = stockBarcode.Quantity,
+                    TlQty = stockBarcode.Quantity,
                     CreateBy = query.userName,
                     CreateDate = DateTime.Now,
                     LastupdateBy = query.userName,

--
Gitblit v1.9.3