From 2ca093b8e4f6c841b16a11ed58b83d8ffd42c3cb Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 13 三月 2024 11:39:52 +0800
Subject: [PATCH] 优化库存统计查询
---
HTML/views/StatisticalReport/InventoryStatistics.html | 2 +-
Wms/Wms/Controllers/StatisticalController.cs | 4 ++--
Wms/WMS.IBLL/IDataServer/IStockServer.cs | 2 +-
Wms/WMS.BLL/DataServer/StockServer.cs | 10 ++++++++--
4 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/HTML/views/StatisticalReport/InventoryStatistics.html b/HTML/views/StatisticalReport/InventoryStatistics.html
index 966a76e..cee3e63 100644
--- a/HTML/views/StatisticalReport/InventoryStatistics.html
+++ b/HTML/views/StatisticalReport/InventoryStatistics.html
@@ -401,7 +401,7 @@
cols:colsJson
};
- sendData(IP + "/Statistical/GetInventoryList?SkuNo=" + $("#SkuNo").val() + "&&SkuName=" + $("#SkuName").val() + "&&OwnerNo=" + $("#OwnerNo").val()+ "&&OwnerName=" + $("#OwnerName").val(), {}, 'get', function (res) {
+ sendData(IP + "/Statistical/GetInventoryList?SkuNo=" + $("#SkuNo").val() + "&&SkuName=" + $("#SkuName").val() + "&&OwnerNo=" + $("#OwnerNo").val()+ "&&OwnerName=" + $("#OwnerName").val()+"&&LotNo=" + $("#LotNo").val(), {}, 'get', function (res) {
console.log(res)
if (res.code == 0) { //鎴愬姛
var list = res.data;
diff --git a/Wms/WMS.BLL/DataServer/StockServer.cs b/Wms/WMS.BLL/DataServer/StockServer.cs
index ba11a64..99a4ebd 100644
--- a/Wms/WMS.BLL/DataServer/StockServer.cs
+++ b/Wms/WMS.BLL/DataServer/StockServer.cs
@@ -32,7 +32,7 @@
/// <param name="skuNo">鐗╂枡缂栫爜</param>
/// <param name="skuName">鐗╂枡鍚嶇О</param>
/// <returns></returns>
- public List<MateDataStockDto> GetDataStockList(string skuNo, string skuName, string ownerNo, string ownerName)
+ public List<MateDataStockDto> GetDataStockList(string skuNo, string skuName, string ownerNo, string ownerName, string lotNo)
{
string str = "select stock.SkuNo,stock.SkuName,stock.LotNo,stock.LotText,stock.Standard,stock.Qty," +
"stock.LockQty,stock.FrozenQty,stock.OwnerNo,stock.OwnerName,(mate.Weight * stock.Qty) WeightSum " +
@@ -59,6 +59,11 @@
{
str += " and stock.OwnerName like @ownerName";
}
+ //鍒ゆ柇璐т富鍚嶇О鏄惁涓虹┖
+ if (!string.IsNullOrEmpty(lotNo))
+ {
+ str += " and stock.LotNo like @lotNo";
+ }
//鎺掑簭
str += " order by stock.SkuNo";
List<MateDataStockDto> StockList = Db.Ado.SqlQuery<MateDataStockDto>(str, new
@@ -67,7 +72,8 @@
skuno = "%" + skuNo + "%", //鐗╂枡缂栫爜
skuname = "%" + skuName + "%", //鐗╂枡鍚嶇О
ownerNo= "%" + ownerNo + "%", //璐т富缂栫爜
- ownerName= "%" + ownerName + "%" //璐т富鍚嶇О
+ ownerName= "%" + ownerName + "%", //璐т富鍚嶇О
+ lotNo= "%" + lotNo + "%", //鎵规鍙�
});
//搴撳瓨鎬婚噺
diff --git a/Wms/WMS.IBLL/IDataServer/IStockServer.cs b/Wms/WMS.IBLL/IDataServer/IStockServer.cs
index 8f05642..3580bb1 100644
--- a/Wms/WMS.IBLL/IDataServer/IStockServer.cs
+++ b/Wms/WMS.IBLL/IDataServer/IStockServer.cs
@@ -16,7 +16,7 @@
/// <param name="skuNo">鐗╂枡缂栫爜</param>
/// <param name="skuName">鐗╂枡鍚嶇О</param>
/// <returns></returns>
- List<MateDataStockDto> GetDataStockList(string skuNo, string skuName, string ownerNo, string ownerName);
+ List<MateDataStockDto> GetDataStockList(string skuNo, string skuName, string ownerNo, string ownerName, string lotNo);
/// <summary>
/// 鑾峰彇搴撳瓨鏄庣粏
diff --git a/Wms/Wms/Controllers/StatisticalController.cs b/Wms/Wms/Controllers/StatisticalController.cs
index 5364465..c6e3391 100644
--- a/Wms/Wms/Controllers/StatisticalController.cs
+++ b/Wms/Wms/Controllers/StatisticalController.cs
@@ -40,9 +40,9 @@
/// <param name="skuName"></param>
/// <returns></returns>
[HttpGet]
- public IActionResult GetInventoryList(string skuNo, string skuName,string ownerNo,string ownerName)
+ public IActionResult GetInventoryList(string skuNo, string skuName,string ownerNo,string ownerName,string lotNo)
{
- List<MateDataStockDto> StockList = _stock.GetDataStockList(skuNo, skuName,ownerNo,ownerName);
+ List<MateDataStockDto> StockList = _stock.GetDataStockList(skuNo, skuName,ownerNo,ownerName,lotNo);
return Ok(new
{
data = StockList,
--
Gitblit v1.8.0