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 index 4a01a494c..6473a5fa2 100644 --- 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 @@ -19,4 +19,12 @@ public class DeliverRequestByContainerDTO : AuditedEntityDto public DateTime MinDateTime { get; set; } public List RequestDetailDtos { get; set; } + + public string CustomerCode { get; set; } + + public string CustomerName { get; set; } + + public string CustomerShortName { get; set; } + + public string CustomerAddress { get; set; } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/DeliverRequests/DeliverRequestFisAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/DeliverRequests/DeliverRequestFisAppService.cs index 01711b657..3ec9bfc9a 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/DeliverRequests/DeliverRequestFisAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/DeliverRequests/DeliverRequestFisAppService.cs @@ -110,14 +110,23 @@ public class DeliverRequestFisAppService : { var dto = new DeliverRequestByContainerDTO(); dto.RequestDetailDtos = new EditableList(); + var masterDto = list.FirstOrDefault(p => p.Id == groupKey.First().MasterID); + var customerDto=await _customerApp.GetByCodeAsync(masterDto.CustomerCode).ConfigureAwait(false); + var customerAddressDto=await _customerAddressApp.GetByCodeAsync(masterDto.CustomerCode).ConfigureAwait(false); dto.MesDeliveryContainer = groupKey.Key; dto.MaxDateTime = groupKey.Max(p => p.CreationTime); dto.MinDateTime = groupKey.Min(p => p.CreationTime); + dto.CustomerCode = customerDto.Code; + dto.CustomerName= customerDto.Name; + dto.CustomerShortName= customerDto.ShortName; + dto.CustomerAddress= customerAddressDto.Address; - foreach (var groupList in groupKey) + + foreach (var groupDetailDto in groupKey) { - dto.RequestDetailDtos.Add(groupList); + + dto.RequestDetailDtos.Add(groupDetailDto); } resultDto.Add(dto);