From b9e08c054b2d9a8f6d23535774dacd5406dc43ba Mon Sep 17 00:00:00 2001 From: schangxiang@126.com <schangxiang@126.com> Date: 周一, 09 12月 2024 08:55:58 +0800 Subject: [PATCH] 222 --- LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs | 79 ++++++++++++++++++++++++++++++++++++--- 1 files changed, 73 insertions(+), 6 deletions(-) diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs index 6c51f54..db53342 100644 --- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs +++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs @@ -301,7 +301,7 @@ } /// <summary> - /// NG鍖呬笅绾�-鎵弿浠跺彿 + /// 鏍囪NG-鎵弿浠跺彿 /// </summary> /// <param name="input"></param> /// <returns></returns> @@ -339,11 +339,6 @@ singlePackage.UpiFlag = UpiFlagEnum.NG; singlePackage.UpdateTime = DateTime.Now; - var upiLineQueueList = await _mes_Upi_LineQueueRep.AsQueryable().Where(x => x.PackageCode == packageCode).ToListAsync(); - if (upiLineQueueList?.Count > 0) - { - await _mes_Upi_LineQueueRep.DeleteAsync(upiLineQueueList); - } var upiList = await _mesBatchOrderUpiRep.AsQueryable().Where(x => x.PackageCode == packageCode).ToListAsync(); if (upiList == null) @@ -376,5 +371,77 @@ } + + /// <summary> + /// 鍙栨秷NG-鎵弿浠跺彿 + /// </summary> + /// <param name="input"></param> + /// <returns></returns> + [HttpPost] + [ApiDescriptionSettings(Name = "CancelNG")] + [Description("WmsOperationTask/CancelNG")] + [UnitOfWork] + public async Task CancelNG(CancelNGInput input) + { + if (input == null) + { + throw Oops.Oh("鍙傛暟涓嶈兘涓虹┖"); + } + if (string.IsNullOrEmpty(input.Upi)) + { + throw Oops.Oh("閮ㄤ欢鏉$爜涓嶈兘涓虹┖"); + } + //if (string.IsNullOrEmpty(input.Reason)) + //{ + // throw Oops.Oh("鍘熷洜涓嶈兘涓虹┖"); + //} + + var singleUpi = await _mesBatchOrderUpiRep.AsQueryable().Where(x => x.UPI == input.Upi).FirstAsync(); + if (singleUpi == null) + { + throw Oops.Oh($"娌℃湁鎵惧埌閮ㄤ欢鏉$爜{input.Upi}鐨勬暟鎹�"); + } + var packageCode = singleUpi.PackageCode; + var singlePackage = await _mesPackageGatherRep.AsQueryable().Where(x => x.PackageCode == packageCode).FirstAsync(); + if (singlePackage == null) + { + throw Oops.Oh($"娌℃湁鎵惧埌鍖呭彿{packageCode}鐨勬眹鎬绘暟鎹�"); + } + + singlePackage.UpiFlag = UpiFlagEnum.姝e父; + singlePackage.UpdateTime = DateTime.Now; + + + var upiList = await _mesBatchOrderUpiRep.AsQueryable().Where(x => x.PackageCode == packageCode).ToListAsync(); + if (upiList == null) + { + throw Oops.Oh($"娌℃湁鎵惧埌鍖呭彿{packageCode}鐨勬澘浠舵暟鎹�"); + } + foreach (var item in upiList) + { + item.UpiFlag = UpiFlagEnum.姝e父; + item.UpdateTime = DateTime.Now; + + WmsRecordUpiProcess wmsRecordUpi = new WmsRecordUpiProcess(); + wmsRecordUpi = item.Adapt<WmsRecordUpiProcess>(); + wmsRecordUpi.CreateTime = DateTime.Now; + wmsRecordUpi.Location = ""; + wmsRecordUpi.OperRemark = "鍙栨秷NG"; + await _wmsRecordUpiProcessRep.InsertAsync(wmsRecordUpi); + } + + + WmsRecordPackageProcess wmsRecordPackage = new WmsRecordPackageProcess(); + wmsRecordPackage = singlePackage.Adapt<WmsRecordPackageProcess>(); + wmsRecordPackage.Location = ""; + wmsRecordPackage.OperRemark = "鍙栨秷NG"; + await _wmsRecordPackageProcessRep.InsertAsync(wmsRecordPackage); + + + await _mesPackageGatherRep.UpdateAsync(singlePackage); + await _mesBatchOrderUpiRep.UpdateRangeAsync(upiList); + + } + } -- Gitblit v1.9.3