|
@ -110,14 +110,23 @@ public class DeliverRequestFisAppService : |
|
|
{ |
|
|
{ |
|
|
var dto = new DeliverRequestByContainerDTO(); |
|
|
var dto = new DeliverRequestByContainerDTO(); |
|
|
dto.RequestDetailDtos = new EditableList<DeliverRequestDetailDTO>(); |
|
|
dto.RequestDetailDtos = new EditableList<DeliverRequestDetailDTO>(); |
|
|
|
|
|
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.MesDeliveryContainer = groupKey.Key; |
|
|
dto.MaxDateTime = groupKey.Max(p => p.CreationTime); |
|
|
dto.MaxDateTime = groupKey.Max(p => p.CreationTime); |
|
|
dto.MinDateTime = groupKey.Min(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); |
|
|
resultDto.Add(dto); |
|
|