From 1344f72375802566725e3719eeda1e2ddf8a4fe5 Mon Sep 17 00:00:00 2001
From: admin <qiutairan163@163.com>
Date: 星期六, 29 十一月 2025 11:39:50 +0800
Subject: [PATCH] 获取临期预警信息GetEmergencyWarning增加储位地址筛选
---
Wms/WMS.IBLL/IDataServer/IDataBoxInfoServer.cs | 3 ++-
Wms/WMS.BLL/DataServer/DataBoxInfoServer.cs | 18 ++++++++++++------
Wms/Wms/Controllers/StatisticalController.cs | 5 +++--
3 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/Wms/WMS.BLL/DataServer/DataBoxInfoServer.cs b/Wms/WMS.BLL/DataServer/DataBoxInfoServer.cs
index d9ac7cd..8cba262 100644
--- a/Wms/WMS.BLL/DataServer/DataBoxInfoServer.cs
+++ b/Wms/WMS.BLL/DataServer/DataBoxInfoServer.cs
@@ -17,10 +17,10 @@
namespace WMS.BLL.DataServer
{
- public class DataBoxInfoServer: DbHelper<DataBoxInfo>,IDataBoxInfoServer
+ public class DataBoxInfoServer : DbHelper<DataBoxInfo>, IDataBoxInfoServer
{
private static readonly SqlSugarScope Db = DataContext.Db;
- public DataBoxInfoServer():base(Db)
+ public DataBoxInfoServer() : base(Db)
{
}
@@ -40,7 +40,7 @@
/// <param name="bitBoxMark">闆剁鏍囪</param>
/// <param name="inspectStatus">璐ㄩ噺鐘舵��</param>
/// <returns></returns>
- public List<DataBoxInfo> GetDataBoxInfo(string id, string skuNo, string skuName, string palletNo, string lotNo,
+ public List<DataBoxInfo> GetDataBoxInfo(string id, string skuNo, string skuName, string palletNo, string lotNo,
string boxNo, string status, string inspectMark, string bitBoxMark, string inspectStatus, string WareHouseNo, string AreaNo)
{
string str = "select PalletNo,PalletNo2,PalletNo3,BoxNo,BoxNo2,BoxNo3,Status,LotNo,Qty,FullQty,SkuNo,SkuName," +
@@ -186,10 +186,9 @@
/// <param name="status">鐘舵��</param>
/// <param name="inspectMark">妫�楠屾爣璁�</param>
/// <param name="inspectStatus">璐ㄩ噺鐘舵��</param>
- /// <param name="isBale">鏄惁瑁瑰寘</param>
- /// <param name="isBelt">鏄惁鎵撳甫</param>
+ /// <param name="locatNo">鍌ㄤ綅鍦板潃</param>
/// <returns></returns>
- public List<AdventBoxInfoDto> GetEmergencyWarning(string skuNo, string skuName, string lotNo, string palletNo, string status, string inspectMark, string inspectStatus)
+ public List<AdventBoxInfoDto> GetEmergencyWarning(string skuNo, string skuName, string lotNo, string palletNo, string status, string inspectMark, string inspectStatus, string locatNo)
{
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
@@ -235,6 +234,11 @@
{
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
@@ -246,6 +250,8 @@
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 d18bdaa..1efaa2a 100644
--- a/Wms/WMS.IBLL/IDataServer/IDataBoxInfoServer.cs
+++ b/Wms/WMS.IBLL/IDataServer/IDataBoxInfoServer.cs
@@ -49,8 +49,9 @@
/// <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);
+ List<AdventBoxInfoDto> GetEmergencyWarning(string skuNo, string skuName, string lotNo, string palletNo, string status, string inspectMark, string inspectStatus, string locatNo);
#endregion
diff --git a/Wms/Wms/Controllers/StatisticalController.cs b/Wms/Wms/Controllers/StatisticalController.cs
index 8b5cade..1546c3c 100644
--- a/Wms/Wms/Controllers/StatisticalController.cs
+++ b/Wms/Wms/Controllers/StatisticalController.cs
@@ -326,13 +326,14 @@
/// <param name="status">鐘舵��</param>
/// <param name="inspectMark">妫�楠屾爣璁�</param>
/// <param name="inspectStatus">璐ㄩ噺鐘舵��</param>
+ /// <param name="locatNo">鍌ㄤ綅鍦板潃</param>
/// <returns></returns>
[HttpGet]
- public IActionResult GetEmergencyWarning(string skuNo, string skuName, string lotNo, string palletNo, string status, string inspectMark, string inspectStatus)
+ public IActionResult GetEmergencyWarning(string skuNo, string skuName, string lotNo, string palletNo, string status, string inspectMark, string inspectStatus, string locatNo)
{
try
{
- List<AdventBoxInfoDto> stockList = _dataBoxInfo.GetEmergencyWarning(skuNo, skuName, lotNo, palletNo, status, inspectMark, inspectStatus);
+ List<AdventBoxInfoDto> stockList = _dataBoxInfo.GetEmergencyWarning(skuNo, skuName, lotNo, palletNo, status, inspectMark, inspectStatus, locatNo);
return Ok(new { data = stockList, code = 0, msg = "鑾峰彇涓存湡棰勮鎴愬姛" });
}
catch (Exception e)
--
Gitblit v1.8.0