From bfd4f880f950fad2c371809bad97bd78929a6f9d Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Fri, 29 Nov 2024 09:15:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 | Bin 277406 -> 277406 bytes src/WMS.Web.Domain/Services/InStockService.cs | 15 +++--- .../Services/OutStockTaskService.cs | 44 ++++++++++++------ 3 files changed, 39 insertions(+), 20 deletions(-) diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index a77ea57734d3acf92f3cfb49bd9957b107b8e0ec..512cb6e489890719e6418b7bf83870e157b8d0be 100644 GIT binary patch delta 28700 zcmeI537phK+K1^*CDq(BAeRU@A|4zI%0W#bm=Ws

TD&3Wy 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 delta 28719 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 diff --git a/src/WMS.Web.Domain/Services/InStockService.cs b/src/WMS.Web.Domain/Services/InStockService.cs index 7235b87d..e833ae77 100644 --- a/src/WMS.Web.Domain/Services/InStockService.cs +++ b/src/WMS.Web.Domain/Services/InStockService.cs @@ -522,14 +522,17 @@ namespace WMS.Web.Domain.Services }); var all_boxIds = dto.Boxs.Select(s => s.BoxId).ToList(); - //2.1判断箱是否上架过了 - var boxInventoryList = await _boxInventoryRepositories.GetList(all_boxIds); - foreach (var b in dto.Boxs) + //2.1判断箱是否上架过了 按箱出货才判断 + if (dto.ShelfMethod == 1) { - var boxInventory = boxInventoryList.FirstOrDefault(f => f.BoxId == b.BoxId); - if (boxInventory != null) + var boxInventoryList = await _boxInventoryRepositories.GetList(all_boxIds); + foreach (var b in dto.Boxs) { - return Result.ReFailure($"{b.BoxBillNo} 箱号已上架入库", 80000); + var boxInventory = boxInventoryList.FirstOrDefault(f => f.BoxId == b.BoxId); + if (boxInventory != null) + { + return Result.ReFailure($"{b.BoxBillNo} 箱号已上架入库", 80000); + } } } diff --git a/src/WMS.Web.Domain/Services/OutStockTaskService.cs b/src/WMS.Web.Domain/Services/OutStockTaskService.cs index 502601b4..8831b542 100644 --- a/src/WMS.Web.Domain/Services/OutStockTaskService.cs +++ b/src/WMS.Web.Domain/Services/OutStockTaskService.cs @@ -579,12 +579,12 @@ namespace WMS.Web.Domain.Services OutStockTaskInfoDetailsResponse infoDetail = new OutStockTaskInfoDetailsResponse() { BoxBillNo = boxList.FirstOrDefault(f => f.Id == b.BoxId)?.BoxBillNo ?? "", - OutStockId= outStock.Id, - OutStockBoxDetailsId=b.Id, - BoxLength =b.BoxLength, - BoxWide=b.BoxWide, - BoxHigh=b.BoxHigh, - BoxWeight=b.BoxWeight, + OutStockId = outStock.Id, + OutStockBoxDetailsId = b.Id, + BoxLength = b.BoxLength, + BoxWide = b.BoxWide, + BoxHigh = b.BoxHigh, + BoxWeight = b.BoxWeight, Qty = b.Qty, SerialNumbers = string.Join(",", b.SerialNumbers), SerialNumberList = b.SerialNumbers, @@ -601,9 +601,25 @@ namespace WMS.Web.Domain.Services response.Details.Add(infoDetail); } //排序和加序号值 - response.Details = response.Details.OrderByDescending(s => s.Specifications) - .ThenByDescending(s => s.Method).ThenByDescending(s => s.Qty).ToList(); - response.Details.ForEach(f => f.IndexNumber = response.Details.IndexOf(f) + 1); + //response.Details = response.Details.OrderByDescending(s => s.Specifications) + // .ThenByDescending(s => s.Method).ThenByDescending(s => s.Qty).ToList(); + // response.Details.ForEach(f => f.IndexNumber = response.Details.IndexOf(f) + 1); + response.Details = response.Details.OrderByDescending(s => s.Method) + .ThenByDescending(s => s.BoxBillNo).ThenByDescending(s => s.BoxLength).ToList(); + + for (int i = 0; i < response.Details.Count(); i++) + { + if (i == 0) + response.Details[0].IndexNumber = 1; + else + { + //和上一个箱子比 如果是相同的箱子序号一样 + if (response.Details[i].BoxBillNo == response.Details[i - 1].BoxBillNo) + response.Details[i].IndexNumber = response.Details[i - 1].IndexNumber; + else + response.Details[i].IndexNumber = response.Details[i - 1].IndexNumber + 1; + } + } return Result.ReSuccess(response); } @@ -640,11 +656,11 @@ namespace WMS.Web.Domain.Services MaterialName = d.MaterialName, MaterialNumber = d.MaterialNumber, BarCode = d.BarCode, - IndexNumber=d.IndexNumber, - BoxLength=d.BoxLength, - BoxWide=d.BoxWide, - BoxHigh=d.BoxHigh, - BoxWeight=d.BoxWeight, + IndexNumber = d.IndexNumber, + BoxLength = d.BoxLength, + BoxWide = d.BoxWide, + BoxHigh = d.BoxHigh, + BoxWeight = d.BoxWeight, SerialNumbers = "" }); }