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

齐套开发

Browse Source
This commit is contained in:
马健
2024-09-25 15:18:19 +08:00
parent 6fe56c2de4
commit ab8b18af8f
6 changed files with 51 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
WarehouseMgr/Tnb.WarehouseMgr/WmsStockReportService.cs
View File

@@ -69,7 +69,7 @@ namespace Tnb.WarehouseMgr
.Select((a, b, c, d, e, f, g, h) => new WmsStockReportH
{
org_id = e.org_id,
warehouse_id = a.warehouse_id,
warehouse_id = c.wh_id,
warehouse_code = d.whcode,
warehouse_name = d.whname,
material_name = f.name,
@@ -82,7 +82,12 @@ namespace Tnb.WarehouseMgr
supplier_name = "",
}, true).ToListAsync();
List<WmsCarryCode> carryCodes = await _db.Queryable<WmsCarryCode>().ToListAsync();
List<WmsCarryCode> carryCodes = await _db.Queryable<WmsCarryCode>()
.InnerJoin<WmsCarryH>((a, b) => a.carry_id == b.id)
.InnerJoin<BasLocation>((a, b, c) => b.location_id == c.id).Select((a, b, c) => new WmsCarryCode
{
warehouse_id = c.wh_id
}, true).ToListAsync();
var storeMap = items.DistinctBy(x => new { x.warehouse_id, x.material_id, x.code_batch }).ToDictionary(x => new { x.warehouse_id, x.material_id, x.code_batch }, x => x);
var group = items.GroupBy(g => new { g.warehouse_id, g.material_id, g.code_batch });
@@ -134,7 +139,7 @@ namespace Tnb.WarehouseMgr
.Select((a, b, c, d, e, f, g, h) => new WmsStockReportH
{
org_id = e.org_id,
warehouse_id = a.warehouse_id,
warehouse_id = c.wh_id,
warehouse_code = d.whcode,
warehouse_name = d.whname,
material_name = f.name,
@@ -147,7 +152,12 @@ namespace Tnb.WarehouseMgr
supplier_name = h.supplier_name,
}, true).ToListAsync();
List<WmsCarryCode> carryCodes = await _db.Queryable<WmsCarryCode>().ToListAsync();
List<WmsCarryCode> carryCodes = await _db.Queryable<WmsCarryCode>()
.InnerJoin<WmsCarryH>((a, b) => a.carry_id == b.id)
.InnerJoin<BasLocation>((a, b, c) => b.location_id == c.id).Select((a, b, c) => new WmsCarryCode
{
warehouse_id = c.wh_id
}, true).ToListAsync();
var storeMap = items.DistinctBy(x => new { x.warehouse_id, x.material_id, x.code_batch, x.supplier_code }).ToDictionary(x => new { x.warehouse_id, x.material_id, x.code_batch, x.supplier_code }, x => x);
var group = items.GroupBy(g => new { g.warehouse_id, g.material_id, g.code_batch, g.supplier_code });