From 82df2ce27dd3cf7b3bc7abd6b5b7d36c4cb05f41 Mon Sep 17 00:00:00 2001 From: 18923810322 <1666941798@qq.com> Date: Wed, 28 May 2025 15:42:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=98=E7=82=B9=E6=8A=A5?= =?UTF-8?q?=E7=89=A9=E6=96=99=E5=BA=93=E5=AD=98=E4=B8=8D=E8=B6=B3=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 | Bin 279122 -> 279122 bytes src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml | 4 +-- .../IService/IInventoryDetailsService.cs | 2 +- .../Services/BoxInventoryService.cs | 19 ++++++------ .../Services/ChangeMoveBoxService.cs | 9 +++--- .../Services/InventoryDetailsService.cs | 28 ++++++++++++++---- 6 files changed, 41 insertions(+), 21 deletions(-) diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index a792b8e05cf7fdf2056107d5404cf32af7ef4bc0..b2c375e3e3d270d144e6ea53d36219fe19668efc 100644 GIT binary patch delta 19072 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 V!o>28NcaYfXM6sxpK-9TwbcVy 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 - + 生成:即时库存明细 @@ -5794,7 +5794,7 @@ 即时库存-服务 - + 生成:即时库存明细 diff --git a/src/WMS.Web.Domain/IService/IInventoryDetailsService.cs b/src/WMS.Web.Domain/IService/IInventoryDetailsService.cs index 787358a4..86e62d99 100644 --- a/src/WMS.Web.Domain/IService/IInventoryDetailsService.cs +++ b/src/WMS.Web.Domain/IService/IInventoryDetailsService.cs @@ -18,7 +18,7 @@ namespace WMS.Web.Domain.IService /// /// /// - Task GenerateInventoryDetails(List dtos, bool isTransaction); + Task GenerateInventoryDetails(List dtos, bool isTransaction,string isPandian); /// /// 获取即时库存明细汇总 diff --git a/src/WMS.Web.Domain/Services/BoxInventoryService.cs b/src/WMS.Web.Domain/Services/BoxInventoryService.cs index e66019cc..6d6cb86a 100644 --- a/src/WMS.Web.Domain/Services/BoxInventoryService.cs +++ b/src/WMS.Web.Domain/Services/BoxInventoryService.cs @@ -888,7 +888,7 @@ namespace WMS.Web.Domain.Services invDetGenDtos.AddRange(invDetGenDtos_out); if (invDetGenDtos.Count != 0) { - var InventoryDetailsGenerate_result = await _inventoryDetailsService.GenerateInventoryDetails(invDetGenDtos, isTransaction); + var InventoryDetailsGenerate_result = await _inventoryDetailsService.GenerateInventoryDetails(invDetGenDtos, isTransaction,"0"); if (!InventoryDetailsGenerate_result.IsSuccess) return InventoryDetailsGenerate_result; } @@ -1035,7 +1035,7 @@ namespace WMS.Web.Domain.Services if (invDetGenDtos.Count != 0) { - var InventoryDetailsGenerate_result = await _inventoryDetailsService.GenerateInventoryDetails(invDetGenDtos, isTransaction); + var InventoryDetailsGenerate_result = await _inventoryDetailsService.GenerateInventoryDetails(invDetGenDtos, isTransaction, "0"); if (!InventoryDetailsGenerate_result.IsSuccess) return InventoryDetailsGenerate_result; } @@ -1305,7 +1305,7 @@ namespace WMS.Web.Domain.Services invDetGenDtos.AddRange(invDetGenDtos_out); if (invDetGenDtos.Count != 0) { - var InventoryDetailsGenerate_result = await _inventoryDetailsService.GenerateInventoryDetails(invDetGenDtos, isTransaction); + var InventoryDetailsGenerate_result = await _inventoryDetailsService.GenerateInventoryDetails(invDetGenDtos, isTransaction, "0"); if (!InventoryDetailsGenerate_result.IsSuccess) return InventoryDetailsGenerate_result; } @@ -1514,7 +1514,7 @@ namespace WMS.Web.Domain.Services invDetGenDtos.AddRange(invDetGenDtos_out); if (invDetGenDtos.Count != 0) { - var InventoryDetailsGenerate_result = await _inventoryDetailsService.GenerateInventoryDetails(invDetGenDtos, isTransaction); + var InventoryDetailsGenerate_result = await _inventoryDetailsService.GenerateInventoryDetails(invDetGenDtos, isTransaction, "0"); if (!InventoryDetailsGenerate_result.IsSuccess) return InventoryDetailsGenerate_result; } @@ -1565,7 +1565,8 @@ namespace WMS.Web.Domain.Services inventoryDet.OrgCode = item.OrgCode; inventoryDet.StockCode = item.StockCode; inventoryDet.SubStockCode = item.SubStockCode; - inventoryDet.Qty = current_sers_info.Count; + //inventoryDet.Qty = current_sers_info.Count; + inventoryDet.Qty = current_sers_infoCount.Count; inventoryDet.InventoryInOutType = (int)InventoryInOutType.Out; //3.2.2即时库存:修改的集合 InventoryDetailsGenerateDto1.Add(inventoryDet); @@ -1612,7 +1613,7 @@ namespace WMS.Web.Domain.Services } if (InventoryDetailsGenerateDto1.Count != 0) { - var InventoryDetailsGenerate_result = await _inventoryDetailsService.GenerateInventoryDetails(InventoryDetailsGenerateDto1, isTransaction); + var InventoryDetailsGenerate_result = await _inventoryDetailsService.GenerateInventoryDetails(InventoryDetailsGenerateDto1, isTransaction, "1"); if (!InventoryDetailsGenerate_result.IsSuccess) return InventoryDetailsGenerate_result; } @@ -1811,7 +1812,7 @@ namespace WMS.Web.Domain.Services _logger.LogInformation($"入库对应即时库存:{JsonConvert.SerializeObject(invDetGenDtos)} 操作时间:{DateTime.Now.ToString()}"); if (invDetGenDtos.Count != 0) { - var InventoryDetailsGenerate_result = await _inventoryDetailsService.GenerateInventoryDetails(invDetGenDtos, isTransaction); + var InventoryDetailsGenerate_result = await _inventoryDetailsService.GenerateInventoryDetails(invDetGenDtos, isTransaction, "0"); if (!InventoryDetailsGenerate_result.IsSuccess) return InventoryDetailsGenerate_result; } @@ -1964,7 +1965,7 @@ namespace WMS.Web.Domain.Services }).ToList(); if (invDetGenDtos.Count != 0) { - var inventoryDetails_result = await _inventoryDetailsService.GenerateInventoryDetails(invDetGenDtos, isTransaction); + var inventoryDetails_result = await _inventoryDetailsService.GenerateInventoryDetails(invDetGenDtos, isTransaction, "0"); if (!inventoryDetails_result.IsSuccess) return inventoryDetails_result; } @@ -2099,7 +2100,7 @@ namespace WMS.Web.Domain.Services //5.即时库存:变更处理 if (InventoryDetailsGenerateDto.Count != 0) { - var inventoryDetails_result = await _inventoryDetailsService.GenerateInventoryDetails(InventoryDetailsGenerateDto, isTransaction); + var inventoryDetails_result = await _inventoryDetailsService.GenerateInventoryDetails(InventoryDetailsGenerateDto, isTransaction, "0"); if (!inventoryDetails_result.IsSuccess) return inventoryDetails_result; } diff --git a/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs b/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs index 2c98e3d6..fea597dd 100644 --- a/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs +++ b/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs @@ -96,17 +96,18 @@ namespace WMS.Web.Domain.Services var boxs = await _boxInventoryRepositories.GetList(srcIds); var destIds_boxs = await _boxInventoryRepositories.GetList(destIds); - var serialNumbers = dto.SelectMany(s => s.Details).SelectMany(s => s.SerialNumbers).ToList(); - var TwoserialNumbers = dto.SelectMany(s => s.Details).SelectMany(s => s.TwoSerialNumbers).ToList(); + var serialNumbers = dto.SelectMany(s => s.Details).SelectMany(s => s.SerialNumbers).Distinct().ToList(); + var TwoserialNumbers = dto.SelectMany(s => s.Details).SelectMany(s => s.TwoSerialNumbers).Distinct().ToList(); serialNumbers.AddRange(TwoserialNumbers); serialNumbers.Sort(); + var serialNumberList = await _serialNumbersRepositories.GetEntityList(serialNumbers); foreach (var d in dto) { if (d.SrcBoxId == 0) { //没有原箱的情况下需要验证序列号是否有箱子绑定 - var s = d.Details.SelectMany(s => s.SerialNumbers).ToList(); + var s = d.Details.SelectMany(s => s.SerialNumbers).Distinct().ToList(); var sCount = serialNumberList.Where(w => s.Contains(w.SerialNumber) && w.BoxId != 0).Count(); if (sCount > 0) return Result.ReFailure(ResultCodes.SerialNumbersBoxError); @@ -119,7 +120,7 @@ namespace WMS.Web.Domain.Services else { //有原箱的情况下验证序列号和原箱是否一致(排除没有绑定箱的老ops条码数据) - var s = d.Details.SelectMany(s => s.SerialNumbers).ToList(); + var s = d.Details.SelectMany(s => s.SerialNumbers).Distinct().ToList(); var boxCount = serialNumberList.Where(w => !(w.BoxId == 0 && w.Creator == "ops")).Where(w => s.Contains(w.SerialNumber)).GroupBy(s => s.BoxId).Select(s => s.Key).ToList(); if (boxCount.Count() > 1 || (boxCount.Count() == 1 && boxCount[0] != d.SrcBoxId)) return Result.ReFailure(ResultCodes.SerialNumbersSrcBoxError); diff --git a/src/WMS.Web.Domain/Services/InventoryDetailsService.cs b/src/WMS.Web.Domain/Services/InventoryDetailsService.cs index 5301e7e9..6d1b6db6 100644 --- a/src/WMS.Web.Domain/Services/InventoryDetailsService.cs +++ b/src/WMS.Web.Domain/Services/InventoryDetailsService.cs @@ -42,7 +42,7 @@ namespace WMS.Web.Domain.Services /// /// /// - public async Task GenerateInventoryDetails(List dtos,bool isTransaction) + public async Task GenerateInventoryDetails(List dtos,bool isTransaction,string isPanDian) { //找到物料对应的即时库存明细 var orgCodes = dtos.Select(x => x.OrgCode).ToList(); @@ -86,10 +86,28 @@ namespace WMS.Web.Domain.Services else { //出库的时候,判断是否有库存,没有就返回错误 - if (entity.Qty