From 4d6e1896b20dfecd8cc86ce544871a4124406e2b Mon Sep 17 00:00:00 2001 From: alex Date: Thu, 24 Aug 2023 17:37:44 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BA=93=E5=AD=98=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E5=88=86=E9=A1=B5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs | 2 +- WarehouseMgr/Tnb.WarehouseMgr/WmsStockReportService.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs index e7484b45..4f75c5bd 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs @@ -80,11 +80,11 @@ namespace Tnb.WarehouseMgr .Where(whereExp) .Select((a, b, c) => new WmsCarryCode { - //is_check = SqlFunc.Subqueryable().Where(it => it.id == a.carry_id).Select(it => it.is_check), check_conclusion = SqlFunc.IsNull(b.check_conclusion, 1), instock_time = b.create_time, }, true) .ToListAsync(); + if (carry.carrystd_id == WmsWareHouseConst.CARRY_LJSTD_ID && mCarryIdDic?.Count > 0) { if (carryCodes.Count < mCarryIdDic.Keys?.Count) throw new AppFriendlyException("载具条码数据异常，有料箱为空", 500); diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsStockReportService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsStockReportService.cs index fc79a0b9..e9809af7 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsStockReportService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsStockReportService.cs @@ -86,7 +86,7 @@ namespace Tnb.WarehouseMgr return stockReport; }); - var pages = result.Skip(input.currentPage * input.pageSize).Take(input.pageSize).ToList(); + var pages = result.Skip((input.currentPage - 1) * input.pageSize).Take(input.pageSize).ToList(); SqlSugarPagedList pagedList = new() { list = pages,