From e2f7309903627ebdaa1316d664c7a8d6c8378811 Mon Sep 17 00:00:00 2001 From: "yang.lee" Date: Wed, 22 Nov 2023 10:59:31 +0800 Subject: [PATCH] 1 --- .../Tnb.WarehouseMgr.Entities/Entity/WmsCarryCode.part.cs | 5 +++++ WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryCode.part.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryCode.part.cs index abc29c92..4a5c092c 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryCode.part.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryCode.part.cs @@ -43,5 +43,10 @@ public partial class WmsCarryCode /// [SugarColumn(IsIgnore = true)] public decimal pr_qty { get; set; } + /// + /// 载具编码 + /// + [SugarColumn(IsIgnore = true)] + public string carry_code { get; set; } } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs index d919a626..479fbeca 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs @@ -146,7 +146,7 @@ namespace Tnb.WarehouseMgr var carryCodes = await _db.Queryable().InnerJoin((a, b) => a.id == b.location_id) .InnerJoin((a, b, c) => b.carry_id == c.id) .Where(filterExpable.ToExpression()) - .Select() + .Select((a,b,c)=>new WmsCarryCode { carry_code = c.carry_code},true) .ToListAsync(); carryCodes ??= Enumerable.Empty().ToList(); @@ -380,7 +380,7 @@ namespace Tnb.WarehouseMgr var carryCodes = await _db.Queryable().InnerJoin((a, b) => a.id == b.location_id) .InnerJoin((a, b, c) => b.carry_id == c.id) .Where(filterExp) - .Select() + .Select((a, b, c) =>new WmsCarryCode { carry_code=c.carry_code },true) .ToListAsync(); List outputs = carryCodes.GroupBy(g => new { g.material_code, g.code_batch, g.location_code, g.carry_id }).Select(x => new WmsCheckstockD