From 93b2ce5475d7a82375fea8acd921bf01dcdd39da Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期三, 03 九月 2025 09:29:07 +0800
Subject: [PATCH] 补料增加查询条件

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

diff --git a/service/Warehouse/MesItemBlManager.cs b/service/Warehouse/MesItemBlManager.cs
index f7cc1d2..8c7ffaf 100644
--- a/service/Warehouse/MesItemBlManager.cs
+++ b/service/Warehouse/MesItemBlManager.cs
@@ -5,6 +5,7 @@
 using NewPdaSqlServer.entity.Base;
 using NewPdaSqlServer.util;
 using SqlSugar;
+using System.Text;
 
 namespace NewPdaSqlServer.service.Warehouse;
 
@@ -16,15 +17,22 @@
     ///     鑾峰彇鐢熶骇琛ユ枡鍗曞彿鍒楄〃
     /// </summary>
     /// <returns>琛ユ枡鍗曞彿鍒楄〃</returns>
-    public List<string> GetSCBLBillNo(WarehouseQuery query)
+    public List<string> GetSCBLBillNo(dynamic query, dynamic RequestInfo)
     {
-        var list = Db.Queryable<MesItemBl>()
-            .Where(s => (s.Bl018 ?? false) == true
-                        //&& (s.Bl019 ?? false) == false
-                        && s.Bl008 == query.Type)
-            .OrderByDescending(s => s.Bl006)
-            .Select(s => s.BlNo)
-            .ToList();
+        var orgId = RequestInfo.OrgId;
+        var sqlParams = new List<SugarParameter>
+        {
+            new("@orgId", orgId),
+            new("@type", query.type),
+            new("@dateTime", query.dateTime == "" ? null : query.dateTime),
+            new("@lineNo", query.lineNo)
+
+        };
+        var sql2 = new StringBuilder("exec prc_pda_itemBl_billNoList @type,@orgId,@dateTime,@lineNo");
+
+        var LineInfo = Db.Ado.SqlQuery<dynamic>(sql2.ToString(), sqlParams);
+
+        var list = LineInfo.Select(s => (string)s.bl_no).ToList();
         return list;
     }
 
@@ -68,7 +76,7 @@
         //    .ToList();
 
         //return (mesItemBl.Bl001, blDetails);
-        var sql = string.Format(@"SELECT c.item_no ItemNo,c.item_name ItemName,c.item_model ItemModel,A.BLD007 FQty,A.BLD008 SQty,A.BLD007 - A.BLD008 DSQty,
+        var sql = string.Format(@"SELECT c.id as ItemId,c.item_no ItemNo,c.item_name ItemName,c.item_model ItemModel,A.BLD007 FQty,A.BLD008 SQty,A.BLD007 - A.BLD008 DSQty,
        dbo.F_QX_GETRECODEPOTSE(A.bld012,'','','') as RecoKw,D.daa001
 fROM MES_ITEM_BL_DETAIL A
          LEFT JOIN MES_ITEM_BL B ON A.MID = B.ID
@@ -995,6 +1003,21 @@
         return dto;
     }
 
+    // 鑾峰彇浜х嚎鍒楄〃
+    public dynamic GetLineInfo(dynamic unity, dynamic RequestInfo)
+    {
+        var orgId = RequestInfo.OrgId;
+        var sqlParams = new List<SugarParameter>
+        {
+            new("@orgId", orgId)
+        };
+
+        var sql2 = new StringBuilder("exec prc_pda_itemBl_lineInfo @orgId");
+
+        var LineInfo = Db.Ado.SqlQuery<dynamic>(sql2.ToString(), sqlParams);
+
+        return LineInfo;
+    }
     #endregion
 
     #region 鐢熶骇瓒呴

--
Gitblit v1.9.3