Browse Source

Merge branch 'Agv分支2024-11-19' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2 into Agv分支2024-11-19

Agv分支2024-11-19
赵新宇 4 months ago
parent
commit
6fa3d0add1
  1. 1
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/DeliverRequests/IDeliverRequestAppService.cs
  2. 38
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/DeliverRequests/DeliverRequestAppService.cs
  3. 41
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/DeliverRequests/DeliverRequestFisAppService.cs

1
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/DeliverRequests/IDeliverRequestAppService.cs

@ -12,4 +12,5 @@ public interface IDeliverRequestAppService
{
Task<bool> DeleteByIdAsync(Guid id);
Task<List<DeliverRequestDTO>> HandleListAsync(List<Guid> ids, string truckNumber);
Task<List<DeliverRequestByContainerDTO>> GetListByContainerAsync();
}

38
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/DeliverRequests/DeliverRequestAppService.cs

@ -42,9 +42,6 @@ public class DeliverRequestAppService :
private readonly ICustomerItemAppService _customerItemAppService;
private readonly ISalePriceSheetRepository _salePriceSheetRepository;
public DeliverRequestAppService(
IDeliverRequestRepository repository
, IDeliverRequestManager deliverRequestManager
@ -276,6 +273,14 @@ public class DeliverRequestAppService :
var dtos = ObjectMapper.Map<List<DeliverRequest>, List<DeliverRequestDTO>>(entitys);
return dtos;
}
[HttpPost("get-list-by-container")]
public virtual async Task<List<DeliverRequestByContainerDTO>> GetListByContainerAsync()
{
var result=new List<DeliverRequestByContainerDTO>();
return result;
}
[HttpPost("list")]
public override Task<PagedResultDto<DeliverRequestDTO>> GetPagedListByFilterAsync(
SfsStoreRequestInputBase sfsRequestInput,
@ -543,32 +548,5 @@ public class DeliverRequestAppService :
}
}
private async Task<List<DeliverRequestDetailDTO>> GetDetailListByFisAsync()
{
var list=await _repository.GetListAsync(p => p.DeliverRequestType == EnumDeliverRequestType.FIS).ConfigureAwait(false);
var details=new List<DeliverRequestDetail>();
foreach (var deliverRequest in list)
{
foreach (var deliverRequestDetail in deliverRequest.Details)
{
details.Add(deliverRequestDetail);
}
}
var byContainerDto=new List<DeliverRequestByContainerDTO>();
var groupBy=details.GroupBy(p => p.MesDeliveryContainer);
foreach (var key in groupBy)
{
var dto= new DeliverRequestByContainerDTO();
//dto.RequestDetailDtos
}
return null;
}
#endregion
}

41
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/DeliverRequests/DeliverRequestFisAppService.cs

@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Castle.Components.DictionaryAdapter;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
@ -87,6 +87,45 @@ public class DeliverRequestFisAppService :
}
return result;
}
[HttpPost("get-list-by-container")]
public async Task<List<DeliverRequestByContainerDTO>> GetListByContainerAsync()
{
var list = await _repository.GetListAsync(p => p.RequestStatus != EnumRequestStatus.Completed && p.DeliverRequestType == EnumDeliverRequestType.FIS,"",true).ConfigureAwait(false);
var listDetail = new List<DeliverRequestDetailDTO>();
foreach (var deliverRequest in list)
{
var detailDto = ObjectMapper.Map<List<DeliverRequestDetail>, List<DeliverRequestDetailDTO>>(deliverRequest.Details);
listDetail.AddRange(detailDto);
}
var groupBy = listDetail.GroupBy(p => p.MesDeliveryContainer);
var resultDto = new List<DeliverRequestByContainerDTO>();
foreach (var groupKey in groupBy)
{
var dto = new DeliverRequestByContainerDTO();
dto.RequestDetailDtos = new EditableList<DeliverRequestDetailDTO>();
dto.MesDeliveryContainer = groupKey.Key;
dto.MaxDateTime = groupKey.Max(p => p.CreationTime);
dto.MinDateTime = groupKey.Min(p => p.CreationTime);
foreach (var groupList in groupKey)
{
dto.RequestDetailDtos.Add(groupList);
}
resultDto.Add(dto);
}
return resultDto;
}
#region 东阳
private async Task SetRequestAutoPropertiesAsync(DeliverRequest entity)

Loading…
Cancel
Save