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:
FanLian
2023-07-31 16:56:21 +08:00
parent f50942fbaf
commit 8d0fb291e9
2 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs
View File

@@ -73,8 +73,8 @@ namespace Tnb.WarehouseMgr
VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSCARRYMOOUTSTK_ID, true); VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSCARRYMOOUTSTK_ID, true);
await _runService.Create(templateEntity, input); await _runService.Create(templateEntity, input);
//入库取终点 //入库取终点
var OutStockStrategyInput = new OutStockStrategyQuery { carry_id = input.data[nameof(OutStockStrategyQuery.carry_id)].ToString(), Size = 1 }; //var OutStockStrategyInput = new OutStockStrategyQuery { carry_id = input.data[nameof(OutStockStrategyQuery.carry_id)].ToString(), Size = 1 };
var outStkCarry = await _wareHouseService.OutStockStrategy(OutStockStrategyInput); //var outStkCarry = await _wareHouseService.OutStockStrategy(OutStockStrategyInput);
WmsPointH? sPoint = null; WmsPointH? sPoint = null;
WmsPointH? ePoint = null; WmsPointH? ePoint = null;
if (input.data.ContainsKey(nameof(WmsPointH.location_id))) if (input.data.ContainsKey(nameof(WmsPointH.location_id)))
@@ -83,7 +83,7 @@ namespace Tnb.WarehouseMgr
} }
if (carry != null) if (carry != null)
{ {
sPoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == outStkCarry[0].location_id); sPoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == carry.location_id);
} }
if (sPoint != null && ePoint != null) if (sPoint != null && ePoint != null)

15
WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs
View File

@@ -92,19 +92,10 @@ namespace Tnb.WarehouseMgr
List<WmsCarryCode> carryCodes = new(); List<WmsCarryCode> carryCodes = new();
foreach (var os in outStockDList) foreach (var os in outStockDList)
{ {
var whereExpr = Expressionable.Create<WmsCarryH, WmsCarryCode, BasLocation>() var OutStockStrategyInput = new OutStockStrategyQuery { carry_id = input.data[nameof(OutStockStrategyQuery.carry_id)].ToString(), Size = 1 };
.And((a, b, c) => b.material_id == os.material_id) var outStkCarrys = await _wareHouseService.OutStockStrategy(OutStockStrategyInput);
.And((a, b, c) => a.is_lock == 0)
.And((a, b, c) => !string.IsNullOrEmpty(a.location_id))
.And((a, b, c) => a.status == (int)EnumCarryStatus.占用)
.And((a, b, c) => c.is_type == ((int)EnumLocationType.存储库位).ToString())
.And((a, b, c) => a.out_status == "0")
.And((a, b, c) => c.wh_id == input.data[nameof(WmsOutstockH.warehouse_id)].ToString())
.AndIF(!string.IsNullOrEmpty(os.code_batch), (a, b, c) => b.code_batch == os.code_batch)
.ToExpression();
var carryCodesPart = await _db.Queryable<WmsCarryH>().InnerJoin<WmsCarryCode>((a, b) => a.id == b.carry_id).InnerJoin<BasLocation>((a, b, c) => a.location_id == c.id) var carryCodesPart = await _db.Queryable<WmsCarryH>().InnerJoin<WmsCarryCode>((a, b) => a.id == b.carry_id).InnerJoin<BasLocation>((a, b, c) => a.location_id == c.id)
.Where(whereExpr) .Where((a,b) => b.carry_id == outStkCarrys[0].id)
.Select<WmsCarryCode>() .Select<WmsCarryCode>()
.ToListAsync(); .ToListAsync();
if (carryCodesPart?.Count > 0) if (carryCodesPart?.Count > 0)