From 7e514494e595531a0517d6266823bc7f6d673831 Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期四, 14 三月 2024 13:41:29 +0800
Subject: [PATCH] 呼叫小车
---
Wms/WMS.BLL/DataServer/StockServer.cs | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/Wms/WMS.BLL/DataServer/StockServer.cs b/Wms/WMS.BLL/DataServer/StockServer.cs
index 22bc852..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 + "%", //鎵规鍙�
});
//搴撳瓨鎬婚噺
@@ -146,6 +152,10 @@
{
str += " and detail.LotNo like @lotno";
}
+ if (!string.IsNullOrEmpty(skuNo) && string.IsNullOrEmpty(lotNo))
+ {
+ str += " and detail.LotNo = ''";
+ }
//鍒ゆ柇鍌ㄤ綅鍦板潃鏄惁涓虹┖
if (!string.IsNullOrEmpty(locatNo))
{
--
Gitblit v1.8.0