From a0131a68fd6c25656507fcca6a4e68a08e45bb46 Mon Sep 17 00:00:00 2001 From: "boxu.zheng" Date: Wed, 8 Jan 2025 16:56:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DTOs/DeliverRequestByContainerDTO.cs | 22 ++++++++++++++ .../IntegrationPackingNoteAppService.cs | 6 ++-- .../SeparationPackingNoteAppService.cs | 2 +- .../DeliverRequestAppService.cs | 30 +++++++++++++++++-- 4 files changed, 53 insertions(+), 7 deletions(-) create mode 100644 be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/DeliverRequests/DTOs/DeliverRequestByContainerDTO.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/DeliverRequests/DTOs/DeliverRequestByContainerDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/DeliverRequests/DTOs/DeliverRequestByContainerDTO.cs new file mode 100644 index 000000000..4a01a494c --- /dev/null +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/DeliverRequests/DTOs/DeliverRequestByContainerDTO.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using Volo.Abp.Application.Dtos; +using Volo.Abp.Data; + +namespace Win_in.Sfs.Wms.Store.Application.Contracts; + +public class DeliverRequestByContainerDTO : AuditedEntityDto +{ + /// + /// Mes器具号 + /// + [Display(Name = "Mes器具号")] + public string MesDeliveryContainer { get; set; } + + public DateTime MaxDateTime { get; set; } + + public DateTime MinDateTime { get; set; } + + public List RequestDetailDtos { get; set; } +} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/OperationPacking/IntegrationPackingNotes/IntegrationPackingNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/OperationPacking/IntegrationPackingNotes/IntegrationPackingNoteAppService.cs index bba30a5f8..3de9ad21e 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/OperationPacking/IntegrationPackingNotes/IntegrationPackingNoteAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/OperationPacking/IntegrationPackingNotes/IntegrationPackingNoteAppService.cs @@ -80,7 +80,7 @@ public class IntegrationPackingNoteAppService : if (outDtos.Any()) { - throw new UserFriendlyException($"此物料已经被【任务编号：{outDtos.First().JobNumber}】占用"); + throw new UserFriendlyException($"此库存{input.PackingCode}已经被【任务编号：{outDtos.First().JobNumber}】占用"); } var entity = input.ToObject(); @@ -99,7 +99,7 @@ public class IntegrationPackingNoteAppService : var balanceDetailDto=await _balanceAppService.GetByPackingCodeAsync(detailInput.PackingCode).ConfigureAwait(false); if (balanceDetailDto.LocationCode != balanceMainDto.LocationCode) { - throw new UserFriendlyException($"箱码{detailInput.PackingCode}的库位与合并箱码{balanceMainDto.LocationCode}的库位不一致"); + throw new UserFriendlyException($"箱码【{detailInput.PackingCode}】的库存需要再{balanceMainDto.LocationCode}库位上才可合并"); } //库存移动 @@ -112,7 +112,7 @@ public class IntegrationPackingNoteAppService : if (balanceDetailDtos.Sum(p=>p.Qty) > input.StdPackQty) { - throw new UserFriendlyException($"合箱数量超过标包"); + throw new UserFriendlyException($"合箱数量超过标包数量"); } await _transferLogAppService.AddManyAsync(transferLogEditInputs).ConfigureAwait(false); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/OperationPacking/SeparationPackingNotes/SeparationPackingNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/OperationPacking/SeparationPackingNotes/SeparationPackingNoteAppService.cs index e9a4255df..70e35e2d4 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/OperationPacking/SeparationPackingNotes/SeparationPackingNoteAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/OperationPacking/SeparationPackingNotes/SeparationPackingNoteAppService.cs @@ -66,7 +66,7 @@ public class SeparationPackingNoteAppService : var outDtos = await _expectOutAppService.GetListByPackingCodeAsync(input.PackingCode).ConfigureAwait(false); if (outDtos.Any()) { - throw new UserFriendlyException($"此物料已经被【任务编号：{outDtos.First().JobNumber}】占用"); + throw new UserFriendlyException($"此库存{input.PackingCode}已经被【任务编号：{outDtos.First().JobNumber}】占用"); } if (input.Details.Sum(p => p.Qty) > input.Qty) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/DeliverRequests/DeliverRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/DeliverRequests/DeliverRequestAppService.cs index c2499ec2e..943a06507 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/DeliverRequests/DeliverRequestAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/DeliverRequests/DeliverRequestAppService.cs @@ -522,9 +522,6 @@ public class DeliverRequestAppService : await SetRequestAutoPropertiesAsync(entity).ConfigureAwait(false); } - - - private static void CheckTransactionType(TransactionTypeDTO transactionType, ItemBasicDTO item) { if (transactionType == null) @@ -546,5 +543,32 @@ public class DeliverRequestAppService : } } + private async Task> GetDetailListByFisAsync() + { + var list=await _repository.GetListAsync(p => p.DeliverRequestType == EnumDeliverRequestType.FIS).ConfigureAwait(false); + + var details=new List(); + + foreach (var deliverRequest in list) + { + foreach (var deliverRequestDetail in deliverRequest.Details) + { + details.Add(deliverRequestDetail); + } + } + + var byContainerDto=new List(); + + var groupBy=details.GroupBy(p => p.MesDeliveryContainer); + + foreach (var key in groupBy) + { + var dto= new DeliverRequestByContainerDTO(); + //dto.RequestDetailDtos + } + + return null; + } + #endregion }