wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
yang.lee
2023-11-22 10:59:31 +08:00
parent 1f781859e8
commit e2f7309903
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryCode.part.cs
View File

@@ -43,5 +43,10 @@ public partial class WmsCarryCode
/// </summary> /// </summary>
[SugarColumn(IsIgnore = true)] [SugarColumn(IsIgnore = true)]
public decimal pr_qty { get; set; } public decimal pr_qty { get; set; }
/// <summary>
/// 载具编码
/// </summary>
[SugarColumn(IsIgnore = true)]
public string carry_code { get; set; }
} }

4
WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs
View File

@@ -146,7 +146,7 @@ namespace Tnb.WarehouseMgr
var carryCodes = await _db.Queryable<BasLocation>().InnerJoin<WmsCarryCode>((a, b) => a.id == b.location_id) var carryCodes = await _db.Queryable<BasLocation>().InnerJoin<WmsCarryCode>((a, b) => a.id == b.location_id)
.InnerJoin<WmsCarryH>((a, b, c) => b.carry_id == c.id) .InnerJoin<WmsCarryH>((a, b, c) => b.carry_id == c.id)
.Where(filterExpable.ToExpression()) .Where(filterExpable.ToExpression())
.Select<WmsCarryCode>() .Select((a,b,c)=>new WmsCarryCode { carry_code = c.carry_code},true)
.ToListAsync(); .ToListAsync();
carryCodes ??= Enumerable.Empty<WmsCarryCode>().ToList(); carryCodes ??= Enumerable.Empty<WmsCarryCode>().ToList();
@@ -380,7 +380,7 @@ namespace Tnb.WarehouseMgr
var carryCodes = await _db.Queryable<BasLocation>().InnerJoin<WmsCarryCode>((a, b) => a.id == b.location_id) var carryCodes = await _db.Queryable<BasLocation>().InnerJoin<WmsCarryCode>((a, b) => a.id == b.location_id)
.InnerJoin<WmsCarryH>((a, b, c) => b.carry_id == c.id) .InnerJoin<WmsCarryH>((a, b, c) => b.carry_id == c.id)
.Where(filterExp) .Where(filterExp)
.Select<WmsCarryCode>() .Select((a, b, c) =>new WmsCarryCode { carry_code=c.carry_code },true)
.ToListAsync(); .ToListAsync();
List<WmsCheckstockD> outputs = carryCodes.GroupBy(g => new { g.material_code, g.code_batch, g.location_code, g.carry_id }).Select(x => new WmsCheckstockD List<WmsCheckstockD> outputs = carryCodes.GroupBy(g => new { g.material_code, g.code_batch, g.location_code, g.carry_id }).Select(x => new WmsCheckstockD