From a3885030a6d5ab0c07eafee1861e5c4fbdedb600 Mon Sep 17 00:00:00 2001
From: admin <qiutairan163@163.com>
Date: 星期二, 02 十二月 2025 15:08:45 +0800
Subject: [PATCH] 还原获取临期预警信息GetEmergencyWarning增加储位地址筛选代码

---
 Wms/WMS.BLL/DataServer/DataBoxInfoServer.cs |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/Wms/WMS.BLL/DataServer/DataBoxInfoServer.cs b/Wms/WMS.BLL/DataServer/DataBoxInfoServer.cs
index 8cba262..a2d62aa 100644
--- a/Wms/WMS.BLL/DataServer/DataBoxInfoServer.cs
+++ b/Wms/WMS.BLL/DataServer/DataBoxInfoServer.cs
@@ -187,8 +187,10 @@
         /// <param name="inspectMark">妫�楠屾爣璁�</param>
         /// <param name="inspectStatus">璐ㄩ噺鐘舵��</param>
         /// <param name="locatNo">鍌ㄤ綅鍦板潃</param>
+        /// <param name="sortField">鎺掑簭瀛楁</param>
+        /// <param name="sortType">鎺掑簭鏂瑰紡</param>
         /// <returns></returns>
-        public List<AdventBoxInfoDto> GetEmergencyWarning(string skuNo, string skuName, string lotNo, string palletNo, string status, string inspectMark, string inspectStatus, string locatNo)
+        public List<AdventBoxInfoDto> GetEmergencyWarning(string skuNo, string skuName, string lotNo, string palletNo, string status, string inspectMark, string inspectStatus)
         {
             string str = @" select d.WareHouseName,d.WareHouseNo,e.RoadwayName,e.RoadwayNo,f.AreaName,f.AreaNo,c.LocatNo,a.PalletNo,
                              a.SkuNo,a.SkuName,SUM(a.Qty) as Qty,a.Standard,a.LotNo,a.SupplierLot,a.ProductionTime,a.Status,c.ExpirationTime
@@ -234,11 +236,6 @@
             {
                 str += " and a.InspectStatus = @inspectstatus";
             }
-            //鍒ゆ柇璐ㄩ噺鐘舵�佹槸鍚︿负绌�
-            if (!string.IsNullOrEmpty(locatNo))
-            {
-                str += " and c.LocatNo=@locatNo";
-            }
             //鎺掑簭
             str += @" group by d.WareHouseName,d.WareHouseNo,e.RoadwayName,e.RoadwayNo,f.AreaName,f.AreaNo,c.LocatNo,a.PalletNo,a.SkuNo,a.SkuName,a.Standard,a.LotNo,a.SupplierLot,a.ProductionTime,a.Status,c.ExpirationTime order by a.SkuNo,a.LotNo ";
             List<AdventBoxInfoDto> stockList = Db.Ado.SqlQuery<AdventBoxInfoDto>(str, new
@@ -250,8 +247,6 @@
                 status, //鐘舵��
                 inspectmark = inspectMark, //妫�楠屾爣璁�
                 inspectstatus = inspectStatus, //璐ㄩ噺鐘舵��
-                //鍌ㄤ綅鍦板潃
-                locatNo = locatNo,
             });
             return stockList;
         }

--
Gitblit v1.8.0