From 742a719e420494db9bd97e8f9ce8c465ddacc117 Mon Sep 17 00:00:00 2001 From: majian <780924089@qq.com> Date: Sun, 15 Sep 2024 14:30:29 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=BD=AC=E5=BA=93=E5=8D=95=E5=B7=B2?= =?UTF-8?q?=E8=BD=AC=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs index cd44eef8..b1717fd2 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]}没有绑定物料条码"); @@ -929,6 +928,9 @@ 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); + 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; #region 更新已转数量 From f3f7df190d4d2023adfc9b9bedd94873611c0b18 Mon Sep 17 00:00:00 2001 From: majian <780924089@qq.com> Date: Sun, 15 Sep 2024 15:07:01 +0800 Subject: [PATCH 2/3] 1 --- .../Dto/Inputs/MaterialTransferDistributeSCWToZCCInput.cs | 2 +- WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 b1717fd2..c3985910 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs @@ -2103,7 +2103,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 +2140,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; From d49d666cef7a246ef6b40df7890b4522e197746b Mon Sep 17 00:00:00 2001 From: majian <780924089@qq.com> Date: Sun, 15 Sep 2024 15:45:02 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=BD=AC=E5=BA=93=E5=B7=A5=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tnb.WarehouseMgr/WmsMaterialTransferService.cs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs index 9f25f467..2b30dfef 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs @@ -927,6 +927,7 @@ 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(); @@ -992,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 @@ -2064,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))