From a7c8452ad33ae2f9fa6de326ee85054f60bad8c0 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期五, 01 三月 2024 16:18:52 +0800
Subject: [PATCH] 解决冲突
---
Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs b/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs
index 25845b9..65bb133 100644
--- a/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs
+++ b/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs
@@ -143,7 +143,7 @@
}
//鑾峰彇搴撳瓨鏄庣粏淇℃伅锛堢洏鐐归�夋嫨鏄庣粏鏁版嵁婧愶級
- public List<StockDetailDto> GetCheckStockDetailList(string houseNo, string roadwayNo, string locateNo, string msg)
+ public List<StockDetailDto> GetCheckStockDetailList(string houseNo, string roadwayNo, string locateNo, string msg, int page, int limit, out int count)
{
try
{
@@ -158,7 +158,7 @@
.And(m => m.IsDel == "0" && m.SkuNo != "100099" && m.Status == "0")
.ToExpression();//娉ㄦ剰 杩欎竴鍙� 涓嶈兘灏�
-
+ var total = 0;
var list = Db.Queryable<DataStockDetail>().Where(item).GroupBy(m => new { m.SkuNo, m.SkuName, m.Standard, m.LotNo, m.LotText, m.SupplierLot, m.LocatNo, m.PalletNo })
.Select(a => new StockDetailDto()
{
@@ -171,7 +171,8 @@
Qty = SqlFunc.AggregateSum(a.Qty),
LocatNo = a.LocatNo,
PalletNo = a.PalletNo
- }).ToList();
+ }).ToOffsetPage(page, limit, ref total);
+ count = total;
return list;
}
--
Gitblit v1.8.0