From 6bc8d28f628be77b8847edc5eaf414f5c0a4ba3b Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期六, 11 一月 2025 09:57:04 +0800
Subject: [PATCH] 11

---
 service/Warehouse/MesItemBlManager.cs |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/service/Warehouse/MesItemBlManager.cs b/service/Warehouse/MesItemBlManager.cs
index 7181715..a5480b9 100644
--- a/service/Warehouse/MesItemBlManager.cs
+++ b/service/Warehouse/MesItemBlManager.cs
@@ -14,12 +14,12 @@
     ///     鑾峰彇鐢熶骇琛ユ枡鍗曞彿鍒楄〃
     /// </summary>
     /// <returns>琛ユ枡鍗曞彿鍒楄〃</returns>
-    public List<string> GetSCBLBillNo()
+    public List<string> GetSCBLBillNo(WarehouseQuery query)
     {
         var list = Db.Queryable<MesItemBl>()
             .Where(s => (s.Bl018 ?? false) == true
                         && (s.Bl019 ?? false) == false
-                        && s.Bl008 == "鐢熶骇琛ユ枡")
+                        && s.Bl008 == query.Type)
             .Select(s => s.BlNo)
             .ToList();
         return list;
@@ -39,7 +39,7 @@
 
         // 妫�鏌ヨˉ鏂欏崟鏄惁瀛樺湪涓斾负鐢熶骇琛ユ枡绫诲瀷
         var mesItemBl = Db.Queryable<MesItemBl>()
-            .Where(a => a.BlNo == query.billNo && a.Bl008 == "鐢熶骇琛ユ枡")
+            .Where(a => a.BlNo == query.billNo && a.Bl008 == query.Type)
             .First();
 
         if (mesItemBl == null)
@@ -68,6 +68,7 @@
     }
 
     /// <summary>
+    /// 鐢熶骇宸ュ崟閫�鏂欐壂鐮�
     ///     鎵弿鏉$爜  prc_rf_pda_scan_zout_barcode3
     /// </summary>
     /// <param name="query">鏌ヨ鍙傛暟</param>
@@ -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)
@@ -505,8 +506,8 @@
                     // Mblnr = stockBarcode.Mblnr,
                     // Zeile = stockBarcode.Zeile,
                     // RohInId = stockBarcode.RohInId,
-                    // BarcodeStatus = 0,
-                    // OldQty = query.Num,
+                    Barcodestatus = false,
+                    Oldqty = query.Num as long?,
                     // Unit = stockBarcode.Unit,
                     // WeightUnit = stockBarcode.WeightUnit,
                     Factory = stockBarcode.Factory,
@@ -519,8 +520,9 @@
                     // MemoBad = stockBarcode.MemoBad,
                     ComeFlg = 5,
                     // Memo = stockBarcode.Memo,
+                    SuppId = stockBarcode.SuppId,
                     SuppNo = stockBarcode.SuppNo,
-                    // InsDate = stockBarcode.InsDate, // Added InsDate
+                    InsDate = stockBarcode.IndepDate, // Added InsDate
                     ItemId = stockBarcode.ItemId
                     // ItemUnit = stockBarcode.ItemUnit // Added ItemUnit
                 }).IgnoreColumns(true).ExecuteCommand();
@@ -891,12 +893,12 @@
 
     #region 鐢熶骇瓒呴
 
-    public List<string> GetSccList()
+    public List<string> GetSccList(WarehouseQuery query)
     {
         var list = Db.Queryable<MesItemBl>()
             .Where(s => (s.Bl018 ?? false) == true
                         && (s.Bl019 ?? false) == false
-                        && s.Bl008 == "鐢熶骇瓒呴")
+                        && s.Bl008 == query.Type)
             .Select(s => s.BlNo)
             .ToList();
         return list;
@@ -914,9 +916,9 @@
         if (string.IsNullOrEmpty(query.billNo))
             throw new Exception("璇烽�夊崟鎹彿锛�");
 
-        // 妫�鏌ヨ秴棰嗗崟鏄惁瀛樺湪涓斾负鐢熶骇瓒呴绫诲瀷
+        // 妫�鏌ヨ秴棰嗗崟鏄惁瀛樺湪涓斾负鐢熶骇瓒呴/濮斿瓒呴绫诲瀷
         var mesItemBl = Db.Queryable<MesItemBl>()
-            .Where(a => a.BlNo == query.billNo && a.Bl008 == "鐢熶骇瓒呴")
+            .Where(a => a.BlNo == query.billNo && a.Bl008 == query.Type)
             .First();
 
         if (mesItemBl == null)

--
Gitblit v1.9.3