From 0a058f3f21ab1556ff85d289ca96b3d54e9cd995 Mon Sep 17 00:00:00 2001
From: admin <qiutairan163@163.com>
Date: 星期五, 12 十二月 2025 11:50:07 +0800
Subject: [PATCH] 库存统计GetDataStockList默认统计去除LotText分组查询
---
Wms/WMS.BLL/DataServer/StockServer.cs | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/Wms/WMS.BLL/DataServer/StockServer.cs b/Wms/WMS.BLL/DataServer/StockServer.cs
index f3c181a..b872d5f 100644
--- a/Wms/WMS.BLL/DataServer/StockServer.cs
+++ b/Wms/WMS.BLL/DataServer/StockServer.cs
@@ -38,6 +38,7 @@
}
+
/// <summary>
/// 鑾峰彇搴撳瓨鐗╂枡绫诲瀷鍒嗗竷
/// </summary>
@@ -196,8 +197,7 @@
/// <param name="wareHouseNo">鎵�灞炰粨搴�</param>
/// <param name="areaNo">鎵�灞炲尯鍩�</param>
/// <returns></returns>
- public async Task<List<MateDataStockDto>> GetDataStockList(string selectType, string skuNo, string skuName, string ownerNo,
- string ownerName, string lotNo, string status, string inspectStatus, string wareHouseNo, string areaNo)
+ public async Task<List<MateDataStockDto>> GetDataStockList(string selectType, string skuNo, string skuName, string ownerNo, string ownerName, string lotNo, string status, string inspectStatus, string wareHouseNo, string areaNo)
{
Expression<Func<DataStockDetail, bool>> item = Expressionable.Create<DataStockDetail>()
.AndIF(!string.IsNullOrEmpty(skuNo), a => a.SkuNo.Contains(skuNo))
@@ -304,14 +304,15 @@
// 榛樿缁熻锛堢墿鏂� 鎵规 璐ㄦ 搴撳瓨鐘舵�� 璐т富)
default:
- data2 = await data.GroupBy(a => new { a.SkuNo, a.SkuName, a.Standard, a.LotNo, a.LotText, a.OwnerNo, a.OwnerName, a.InspectStatus })
+ //data2 = await data.GroupBy(a => new { a.SkuNo, a.SkuName, a.Standard, a.LotNo, a.LotText, a.OwnerNo, a.OwnerName, a.InspectStatus })
+ data2 = await data.GroupBy(a => new { a.SkuNo, a.SkuName, a.Standard, a.LotNo, a.OwnerNo, a.OwnerName, a.InspectStatus })
.Select(a => new MateDataStockDto()
{
SkuNo = a.SkuNo, //鐗╂枡缂栫爜
SkuName = a.SkuName, //鐗╂枡鍚嶇О
Standard = a.Standard, //瑙勬牸
LotNo = a.LotNo, //鎵规
- LotText = a.LotText, //鎵规鎻忚堪
+ //LotText = a.LotText, //鎵规鎻忚堪
OwnerNo = a.OwnerNo, //璐т富缂栫爜
OwnerName = a.OwnerName, //璐т富鍚嶇О
Status = status, //搴撳瓨鐘舵��
@@ -338,8 +339,7 @@
/// <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, string ownerNo, string ownerName, string startTime, string endTime)
+ public List<StockDetailDto> GetInventoryList1(string skuNo, string skuName, string lotNo, string locatNo, string palletNo, string status, string inspectStatus, string ownerNo, string ownerName, string startTime, string endTime)
{
string str = "select detail.*,house.WareHouseNo + '-' + house.WareHouseName as WareHouseName," +
"roadway.RoadwayNo + '-' + roadway.RoadwayName as RoadwayName,area.AreaNo + '-' + area.AreaName as AreaName " +
@@ -434,7 +434,10 @@
/// <returns></returns>
public List<MateDataStockDto> GetInventoryWarning(string skuNo, string skuName, string lotNo, string type)
{
- string str = "select mate.Id,mate.SkuNo,mate.SkuName,mate.Standard,mate.Type,stock.Qty,stock.LockQty,stock.FrozenQty,stock.Qty - stock.LockQty - Stock.FrozenQty ResidueQty,stock.LotNo from SysMaterials mate right join DataStock stock on mate.SkuNo = stock.SkuNo Where stock.IsDel = @isdel and stock.Qty - stock.LockQty - Stock.FrozenQty <= mate.LowInventory";
+ string str = $@"select mate.Id,mate.SkuNo,mate.SkuName,mate.Standard,mate.Type,stock.Qty,stock.LockQty,stock.FrozenQty,stock.Qty-stock.LockQty-Stock.FrozenQty ResidueQty,stock.LotNo
+from SysMaterials mate
+right join DataStock stock on mate.SkuNo=stock.SkuNo
+Where stock.IsDel=@isdel and stock.Qty-stock.LockQty-Stock.FrozenQty<mate.LowInventory";
//鍒ゆ柇鐗╂枡鍙锋槸鍚︿负绌�
if (!string.IsNullOrEmpty(skuNo))
{
--
Gitblit v1.8.0