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,