From d690043276ef1b0862d2a841f23dfcde2bb7384d Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期二, 27 二月 2024 16:02:56 +0800
Subject: [PATCH] Merge branch 'wxw'
---
Wms/WMS.BLL/DataServer/StockServer.cs | 40 ++++++++++++++++++++++++++++++++--------
1 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/Wms/WMS.BLL/DataServer/StockServer.cs b/Wms/WMS.BLL/DataServer/StockServer.cs
index 6dbea88..b2012da 100644
--- a/Wms/WMS.BLL/DataServer/StockServer.cs
+++ b/Wms/WMS.BLL/DataServer/StockServer.cs
@@ -32,9 +32,9 @@
/// <param name="skuNo">鐗╂枡缂栫爜</param>
/// <param name="skuName">鐗╂枡鍚嶇О</param>
/// <returns></returns>
- public List<MateDataStockDto> GetDataStockList(string skuNo, string skuName)
+ public List<MateDataStockDto> GetDataStockList(string skuNo, string skuName, string ownerNo, string ownerName)
{
- string str = "select stock.SkuNo,stock.SkuName,stock.Standard,stock.Qty,stock.LockQty,stock.FrozenQty,(mate.Weight * stock.Qty) WeightSum from DataStock stock left join SysMaterials mate on stock.SkuNo = mate.SkuNo Where stock.IsDel = @isdel";
+ 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 from DataStock stock left join SysMaterials mate on stock.SkuNo = mate.SkuNo Where stock.IsDel = @isdel";
//鍒ゆ柇鐗╂枡缂栫爜鏄惁涓虹┖
if (!string.IsNullOrEmpty(skuNo))
{
@@ -45,13 +45,25 @@
{
str += " and stock.SkuName like @skuname";
}
+ //鍒ゆ柇璐т富缂栫爜鏄惁涓虹┖
+ if (!string.IsNullOrEmpty(ownerNo))
+ {
+ str += " and stock.OwnerNo like @ownerNo";
+ }
+ //鍒ゆ柇璐т富鍚嶇О鏄惁涓虹┖
+ if (!string.IsNullOrEmpty(ownerName))
+ {
+ str += " and stock.OwnerName like @ownerName";
+ }
//鎺掑簭
str += " order by stock.SkuNo";
List<MateDataStockDto> StockList = Db.Ado.SqlQuery<MateDataStockDto>(str, new
{
isdel = "0", //鏄惁鍒犻櫎
skuno = "%" + skuNo + "%", //鐗╂枡缂栫爜
- skuname = "%" + skuName + "%" //鐗╂枡鍚嶇О
+ skuname = "%" + skuName + "%", //鐗╂枡鍚嶇О
+ ownerNo= "%" + ownerNo + "%", //璐т富缂栫爜
+ ownerName= "%" + ownerName + "%" //璐т富鍚嶇О
});
//搴撳瓨鎬婚噺
@@ -66,8 +78,8 @@
//foreach寰幆搴撳瓨鎬婚噺
foreach (var dto in StockListDto)
{
- //鍒ゆ柇鐗╂枡鏄惁鐩稿悓
- if (dto.SkuNo == item.SkuNo)
+ //鍒ゆ柇鐗╂枡鍜屾壒娆℃槸鍚︾浉鍚�
+ if (dto.SkuNo == item.SkuNo && dto.LotNo == item.LotNo)
{
dto.Qty = (Convert.ToDecimal(dto.Qty) + Convert.ToDecimal(item.Qty)).ToString();
dto.FrozenQty = (Convert.ToDecimal(dto.FrozenQty) + Convert.ToDecimal(item.FrozenQty)).ToString();
@@ -105,9 +117,9 @@
/// <param name="status">搴撳瓨鐘舵��</param>
/// <param name="inspectStatus">璐ㄦ鐘舵��</param>
/// <returns></returns>
- public List<StockDetailDto> GetInventoryList1(string skuNo, string skuName, string lotNo, string locatNo, string palletNo, string status, string inspectStatus)
+ public List<StockDetailDto> GetInventoryList1(string skuNo, string skuName, string lotNo, string locatNo, string palletNo, string status, string inspectStatus, string ownerNo, string ownerName)
{
- string str = "select detail.*,house.WareHouseName as WareHouseName,roadway.RoadwayName as RoadwayName from DataStockDetail detail left join SysStorageRoadway roadway on detail.RoadwayNo = roadway.RoadwayNo left join SysWareHouse house on detail.WareHouseNo = house.WareHouseNo Where detail.IsDel = @isdel";
+ 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";
//鍒ゆ柇鐗╂枡缂栫爜鏄惁涓虹┖
if (!string.IsNullOrEmpty(skuNo))
{
@@ -143,6 +155,16 @@
{
str += " and detail.InspectStatus = @inspectstatus";
}
+ //鍒ゆ柇璐т富缂栫爜鏄惁涓虹┖
+ if (!string.IsNullOrEmpty(ownerNo))
+ {
+ str += " and detail.OwnerNo like @ownerNo";
+ }
+ //鍒ゆ柇璐т富鍚嶇О鏄惁涓虹┖
+ if (!string.IsNullOrEmpty(ownerName))
+ {
+ str += " and detail.OwnerName like @ownerName";
+ }
//鎺掑簭
str += " order by detail.SkuNo,detail.PalletNo,detail.LotNo";
List<StockDetailDto> stockDetailsList = Db.Ado.SqlQuery<StockDetailDto>(str, new
@@ -154,7 +176,9 @@
locatno = locatNo, //鍌ㄤ綅鍦板潃
palletno = palletNo, //鎵樼洏鏉＄爜
status = status, //搴撳瓨鐘舵��
- inspectstatus = inspectStatus //璐ㄦ鐘舵��
+ inspectstatus = inspectStatus, //璐ㄦ鐘舵��
+ ownerNo = "%" + ownerNo + "%", //璐т富缂栫爜
+ ownerName = "%" + ownerName + "%" //璐т富鍚嶇О
});
return stockDetailsList;
}
--
Gitblit v1.8.0