From d34d36d5c0478d1e5f56b92fc5b38fc5ca379e5c Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期四, 22 二月 2024 15:44:11 +0800
Subject: [PATCH] Merge branch 'wxw'
---
Wms/WMS.BLL/DataServer/StockDetailServer.cs | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/Wms/WMS.BLL/DataServer/StockDetailServer.cs b/Wms/WMS.BLL/DataServer/StockDetailServer.cs
index 8d66d0b..ef19666 100644
--- a/Wms/WMS.BLL/DataServer/StockDetailServer.cs
+++ b/Wms/WMS.BLL/DataServer/StockDetailServer.cs
@@ -34,7 +34,7 @@
/// <param name="bitBoxMark">闆剁鏍囪</param>
/// <param name="inspectStatus">璐ㄩ噺鐘舵��</param>
/// <returns></returns>
- public List<StockDetailDto> GetBindList(string skuNo, string skuName, string palletNo, string lotNo, string boxNo, string status, string inspectMark, string bitPalletMark, string bitBoxMark, string inspectStatus)
+ public List<StockDetailDto> GetBindList(string skuNo, string skuName, string palletNo, string lotNo, string boxNo, string status, string inspectMark, string bitPalletMark, string bitBoxMark, string inspectStatus, string ownerNo, string ownerName)
{
string str = "select detail.*,house.WareHouseNo + '-' + house.WareHouseName as WareHouseName,roadway.RoadwayNo + '-' + roadway.RoadwayName as RoadwayName,area.AreaNo + '-' + area.AreaName as AreaName from DataStockDetail detail left join SysStorageRoadway roadway on detail.RoadwayNo = roadway.RoadwayNo left join SysWareHouse house on detail.WareHouseNo = house.WareHouseNo left join SysStorageArea area on detail.AreaNo = area.AreaNo where detail.IsDel = @isdel";
//鍒ゆ柇鐗╂枡鍙锋槸鍚︿负绌�
@@ -61,6 +61,16 @@
if (!string.IsNullOrEmpty(bitPalletMark))
{
str += " and detail.BitPalletMark = @bitpalletmark";
+ }
+ //鍒ゆ柇璐т富缂栫爜鏄惁涓虹┖
+ if (!string.IsNullOrEmpty(ownerNo))
+ {
+ str += " and detail.OwnerNo like @ownerNo";
+ }
+ //鍒ゆ柇璐т富鍚嶇О鏄惁涓虹┖
+ if (!string.IsNullOrEmpty(ownerName))
+ {
+ str += " and detail.OwnerName like @ownerName";
}
int i = 0;
@@ -151,6 +161,8 @@
bitpalletmark = bitPalletMark, //闆舵墭鏍囪
inspectmark = inspectMark, //妫�楠屾爣璁�
inspectstatus = inspectStatus, //璐ㄩ噺鐘舵��
+ ownerNo = "%" + ownerNo + "%", //璐т富缂栫爜
+ ownerName = "%" + ownerName + "%" //璐т富鍚嶇О
//stockdetailid = "(" + arr + ")" //搴撳瓨鏄庣粏id
});
--
Gitblit v1.8.0