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.IBLL/IDataServer/IDataBoxInfoServer.cs | 3 +--
Wms/WMS.BLL/DataServer/DataBoxInfoServer.cs | 11 +++--------
Wms/Wms/Controllers/StatisticalController.cs | 7 ++-----
3 files changed, 6 insertions(+), 15 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;
}
diff --git a/Wms/WMS.IBLL/IDataServer/IDataBoxInfoServer.cs b/Wms/WMS.IBLL/IDataServer/IDataBoxInfoServer.cs
index 1efaa2a..d18bdaa 100644
--- a/Wms/WMS.IBLL/IDataServer/IDataBoxInfoServer.cs
+++ b/Wms/WMS.IBLL/IDataServer/IDataBoxInfoServer.cs
@@ -49,9 +49,8 @@
/// <param name="status">鐘舵��</param>
/// <param name="inspectMark">妫�楠屾爣璁�</param>
/// <param name="inspectStatus">璐ㄩ噺鐘舵��</param>
- /// <param name="locatNo">鍌ㄤ綅鍦板潃</param>
/// <returns></returns>
- List<AdventBoxInfoDto> GetEmergencyWarning(string skuNo, string skuName, string lotNo, string palletNo, string status, string inspectMark, string inspectStatus, string locatNo);
+ List<AdventBoxInfoDto> GetEmergencyWarning(string skuNo, string skuName, string lotNo, string palletNo, string status, string inspectMark, string inspectStatus);
#endregion
diff --git a/Wms/Wms/Controllers/StatisticalController.cs b/Wms/Wms/Controllers/StatisticalController.cs
index 6693ef9..f288d6b 100644
--- a/Wms/Wms/Controllers/StatisticalController.cs
+++ b/Wms/Wms/Controllers/StatisticalController.cs
@@ -325,16 +325,13 @@
/// <param name="status">鐘舵��</param>
/// <param name="inspectMark">妫�楠屾爣璁�</param>
/// <param name="inspectStatus">璐ㄩ噺鐘舵��</param>
- /// <param name="locatNo">鍌ㄤ綅鍦板潃</param>
- /// <param name="sortField">鎺掑簭瀛楁</param>
- /// <param name="sortType">鎺掑簭鏂瑰紡</param>
/// <returns></returns>
[HttpGet]
- public IActionResult GetEmergencyWarning(string skuNo, string skuName, string lotNo, string palletNo, string status, string inspectMark, string inspectStatus, string locatNo, string sortField, string sortType)
+ public IActionResult GetEmergencyWarning(string skuNo, string skuName, string lotNo, string palletNo, string status, string inspectMark, string inspectStatus)
{
try
{
- List<AdventBoxInfoDto> stockList = _dataBoxInfo.GetEmergencyWarning(skuNo, skuName, lotNo, palletNo, status, inspectMark, inspectStatus, locatNo, sortField, sortType);
+ List<AdventBoxInfoDto> stockList = _dataBoxInfo.GetEmergencyWarning(skuNo, skuName, lotNo, palletNo, status, inspectMark, inspectStatus);
return Ok(new { data = stockList, code = 0, msg = "鑾峰彇涓存湡棰勮鎴愬姛" });
}
catch (Exception e)
--
Gitblit v1.8.0