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-10-12 17:09:59 +08:00
parent 20ff2d213a
commit 8c047af86e
13 changed files with 318 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
View File

@@ -577,7 +577,8 @@ namespace Tnb.WarehouseMgr
.AndIF(!string.IsNullOrEmpty(input.container_no), (a, b, c) => b.container_no == input.container_no)
.AndIF(!string.IsNullOrEmpty(input.carrystd_id), (a, b, c) => a.carrystd_id == input.carrystd_id)
.AndIF(input.AvoidBusyPassage, (a, b, c) => !busyPassages.Contains(c.passage))
.AndIF(!string.IsNullOrEmpty(input.Region_id), (a, b, c) => c.region_id == input.Region_id);
.AndIF(!string.IsNullOrEmpty(input.Region_id), (a, b, c) => c.region_id == input.Region_id)
.AndIF(input.qcres_list != null, (a, b, c) => input.qcres_list.Contains(b.qc_res));
if (input.filter_carry_status)
{
@@ -605,7 +606,6 @@ namespace Tnb.WarehouseMgr
.Select<WmsCarryH>()
.ToListAsync();
items = items.DistinctBy(r => r.id).ToList();
return input.Size > 0 ? items.Take(input.Size).ToList() : items;
}
@@ -4431,8 +4431,8 @@ namespace Tnb.WarehouseMgr
material_id = input.material_id,
code_batch = input.code_batch,
Size = 100,
Region_id = WmsWareHouseConst.REGION_Purchase_ID,
PolicyCode = WmsWareHouseConst.POLICY_YCLOUTSTOCK
PolicyCode = WmsWareHouseConst.POLICY_YCLOUTSTOCK,
qcres_list = new List<string>() { "vergeOk", "ok" }
};
List<WmsCarryH> items = await OutStockStrategy(outStockStrategyInput);