diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/MaterialTransferDistributeSCWToZCCInput.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/MaterialTransferDistributeSCWToZCCInput.cs index 238aa88c..e713b1d4 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/MaterialTransferDistributeSCWToZCCInput.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/MaterialTransferDistributeSCWToZCCInput.cs @@ -32,7 +32,7 @@ /// /// 起点 /// - public string startlocation_code { get; set; } + public string location_code { get; set; } } } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs index 0dd770c0..2b30dfef 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs @@ -918,7 +918,6 @@ namespace Tnb.WarehouseMgr try { - List wmsCarryCodes = await _db.Queryable().Where(r => r.carry_id == input.carryIds[0]).ToListAsync(); //if (wmsCarryCodes.Count == 0) //{ // Logger.LogWarning($"【WmsMaterialTransferService ModifyAsync】载具{input.carryIds[0]}没有绑定物料条码"); @@ -928,6 +927,10 @@ namespace Tnb.WarehouseMgr WmsMaterialTransferD wmsMaterialTransferd = await _db.Queryable().Where(r => r.id == input.source_id).SingleAsync(); WmsMaterialTransfer wmsMaterialTransfer = await _db.Queryable().SingleAsync(x => x.id == wmsMaterialTransferd.bill_id); + Logger.LogInformation($"开始执行转库单业务 {input.carryIds[0]} 转库单 {wmsMaterialTransfer.bill_code}"); + + List wmsCarryCodes = await _db.Queryable().Where(r => r.carry_id == input.carryIds[0] + && r.material_id == wmsMaterialTransferd.material_id && r.code_batch == wmsMaterialTransferd.code_batch).ToListAsync(); bool isOk = false; @@ -990,6 +993,13 @@ namespace Tnb.WarehouseMgr } } + // 跨层回写料架工位 + if (wmsMaterialTransfer.warehouse_outstock == WmsWareHouseConst.WAREHOUSE_YCL_ID && wmsMaterialTransfer.warehouse_instock == WmsWareHouseConst.WAREHOUSE_ZCC_ID) + { + int _row = await _db.Updateable().SetColumns(r => r.work_station == wmsMaterialTransferd.station_code).Where(r => r.id == input.carryIds[0]).ExecuteCommandAsync(); + Logger.LogInformation($"跨层转库更新载具工位 载具id {input.carryIds[0]} 转库单 {wmsMaterialTransfer.bill_code} 成功行数 {_row}"); + } + #endregion @@ -2062,6 +2072,7 @@ namespace Tnb.WarehouseMgr [HttpPost, NonUnify, AllowAnonymous] public async Task DistributeSCWToZCC(MaterialTransferDistributeSCWToZCCInput input) { + Logger.LogInformation($"开始执行三存位入库到暂存仓 {JsonConvert.SerializeObject(input)}"); try { if (string.IsNullOrEmpty(input.source_id)) @@ -2103,7 +2114,7 @@ namespace Tnb.WarehouseMgr { throw new AppFriendlyException($"载具{input.carry_code}已锁定!", 500); } - if (string.IsNullOrEmpty(input.startlocation_code)) + if (string.IsNullOrEmpty(input.location_code)) { throw new AppFriendlyException($"起点库位为空!", 500); } @@ -2140,7 +2151,7 @@ namespace Tnb.WarehouseMgr throw new AppFriendlyException($@"没有可以入库的库位", 500); } - BasLocation startLocation = await _db.Queryable().Where(r => r.location_code == input.startlocation_code).FirstAsync(); + BasLocation startLocation = await _db.Queryable().Where(r => r.location_code == input.location_code).FirstAsync(); CommonCreatePretaskInput commonCreatePretaskInput = new CommonCreatePretaskInput(); commonCreatePretaskInput.startlocation_id = startLocation.id;