Browse Source

临时 提交

dev_DY_CC
郑勃旭 1 year ago
parent
commit
73c9b18776
  1. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/Inputs/AssembleRequestEditInput.cs
  2. 18
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/AssembleIssueRequests/AssembleIssueRequestsAppService.cs
  3. 0
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/AssembleIssueRequests/AssembleIssueRequestsAutoMapperProfile.cs
  4. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/AssembleRequestManager.cs
  5. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/IAssembleRequestManager.cs
  6. 4
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Jobs/AssembleJobAutoMapperProfile.cs
  7. 36
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/AssembleRequestEventHandler.cs

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/Inputs/AssembleRequestEditInput.cs

@ -24,7 +24,7 @@ public class AssembleIssueRequestsEditInput : SfsStoreRequestCreateOrUpdateInput
/// 明细列表 /// 明细列表
/// </summary> /// </summary>
[Display(Name = "明细列表")] [Display(Name = "明细列表")]
public List<AssembleRequestDetailInput> Details { get; set; } = new List<AssembleRequestDetailInput>(); public List<AssembleIssueRequestsDetailInput> Details { get; set; } = new List<AssembleIssueRequestsDetailInput>();
#endregion #endregion
#region Create #region Create

18
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/AssembleRequests/AssembleRequestAppService.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/AssembleIssueRequests/AssembleIssueRequestsAppService.cs

@ -44,9 +44,9 @@ public class AssembleIssueRequestsAppService : SfsStoreRequestAppServiceBase<Ass
private readonly IProductionLineAppService _productionLineAppService; private readonly IProductionLineAppService _productionLineAppService;
private readonly ITransactionTypeAppService _transactionTypeAppService; private readonly ITransactionTypeAppService _transactionTypeAppService;
public AssembleRequestAppService( public AssembleIssueRequestsAppService(
IAssembleRequestRepository repository, IAssembleIssueRequestsRepository repository,
IAssembleRequestManager assembleRequestManager, IAssembleIssueRequestsManager assembleRequestManager,
IPreparationPlanManager preparationPlanManager, IPreparationPlanManager preparationPlanManager,
IItemStoreRelationAppService itemStoreRelationApp, IItemStoreRelationAppService itemStoreRelationApp,
IAreaAppService areaApp, IAreaAppService areaApp,
@ -77,7 +77,7 @@ public class AssembleIssueRequestsAppService : SfsStoreRequestAppServiceBase<Ass
} }
[HttpPost("")] [HttpPost("")]
public override async Task<AssembleRequestDTO> CreateAsync(AssembleRequestEditInput input) public override async Task<AssembleIssueRequestsDTO> CreateAsync(AssembleIssueRequestsEditInput input)
{ {
foreach (var item in input.Details) foreach (var item in input.Details)
{ {
@ -113,7 +113,7 @@ public class AssembleIssueRequestsAppService : SfsStoreRequestAppServiceBase<Ass
} }
await SetRequestAutoPropertiesAsync(input).ConfigureAwait(false); await SetRequestAutoPropertiesAsync(input).ConfigureAwait(false);
var entity = ObjectMapper.Map<AssembleRequestEditInput, AssembleRequest>(input); var entity = ObjectMapper.Map<AssembleIssueRequestsEditInput, AssembleIssueRequests>(input);
var result = await _assembleRequestManager.CreateByNumberAsync(entity).ConfigureAwait(false); var result = await _assembleRequestManager.CreateByNumberAsync(entity).ConfigureAwait(false);
@ -127,7 +127,7 @@ public class AssembleIssueRequestsAppService : SfsStoreRequestAppServiceBase<Ass
/// </summary> /// </summary>
/// <param name="entity"></param> /// <param name="entity"></param>
/// <returns></returns> /// <returns></returns>
private async Task SetRequestAutoPropertiesAsync(AssembleRequestEditInput entity) private async Task SetRequestAutoPropertiesAsync(AssembleIssueRequestsEditInput entity)
{ {
var tranType = await _transactionTypeAppService.GetByTransTypeAsync(EnumTransType.Issue, EnumTransSubType.None).ConfigureAwait(false); var tranType = await _transactionTypeAppService.GetByTransTypeAsync(EnumTransType.Issue, EnumTransSubType.None).ConfigureAwait(false);
Check.NotNull(tranType, "事务类型", "事务类型不存在"); Check.NotNull(tranType, "事务类型", "事务类型不存在");
@ -233,7 +233,7 @@ public class AssembleIssueRequestsAppService : SfsStoreRequestAppServiceBase<Ass
return await base.ValidateImportEntities(dict).ConfigureAwait(false); return await base.ValidateImportEntities(dict).ConfigureAwait(false);
} }
protected async Task CheckAreaAsync(AssembleRequestImportInput importInput, protected async Task CheckAreaAsync(AssembleIssueRequestsImportInput importInput,
List<ValidationResult> validationRresult) List<ValidationResult> validationRresult)
{ {
var area = await _areaApp.GetByCodeAsync(importInput.FromLocationArea).ConfigureAwait(false); var area = await _areaApp.GetByCodeAsync(importInput.FromLocationArea).ConfigureAwait(false);
@ -276,7 +276,7 @@ public class AssembleIssueRequestsAppService : SfsStoreRequestAppServiceBase<Ass
} }
} }
protected async Task<ItemBasicDTO> CheckItemBasicAsync(AssembleRequestImportInput importInput, protected async Task<ItemBasicDTO> CheckItemBasicAsync(AssembleIssueRequestsImportInput importInput,
List<ValidationResult> validationRresult) List<ValidationResult> validationRresult)
{ {
var item = await _itemBasicAppService.GetByCodeAsync(importInput.ItemCode).ConfigureAwait(false); var item = await _itemBasicAppService.GetByCodeAsync(importInput.ItemCode).ConfigureAwait(false);
@ -293,7 +293,7 @@ public class AssembleIssueRequestsAppService : SfsStoreRequestAppServiceBase<Ass
return item; return item;
} }
protected async Task<LocationDTO> CheckLocationAsync(AssembleRequestImportInput importInput, protected async Task<LocationDTO> CheckLocationAsync(AssembleIssueRequestsImportInput importInput,
List<ValidationResult> validationRresult) List<ValidationResult> validationRresult)
{ {
var location = await _locationAppService.GetByCodeAsync(importInput.ToLocationCode).ConfigureAwait(false); var location = await _locationAppService.GetByCodeAsync(importInput.ToLocationCode).ConfigureAwait(false);

0
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/AssembleRequests/AssembleRequestAutoMapperProfile.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/AssembleIssueRequests/AssembleIssueRequestsAutoMapperProfile.cs

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/AssembleRequestManager.cs

@ -34,7 +34,7 @@ public class AssembleIssueRequestsManager
/// </summary> /// </summary>
/// <param name="entity"></param> /// <param name="entity"></param>
/// <returns></returns> /// <returns></returns>
public virtual async Task<AssembleRequest> CreateByNumberAsync(AssembleRequest entity) public virtual async Task<AssembleIssueRequests> CreateByNumberAsync(AssembleIssueRequests entity)
{ {
var number = string.IsNullOrEmpty(entity.Number) ? await GenerateNumberAsync(nameof(AssembleIssueRequests), entity.ActiveDate).ConfigureAwait(false) : entity.Number; var number = string.IsNullOrEmpty(entity.Number) ? await GenerateNumberAsync(nameof(AssembleIssueRequests), entity.ActiveDate).ConfigureAwait(false) : entity.Number;
entity.SetIdAndNumberWithDetails(GuidGenerator, number); entity.SetIdAndNumberWithDetails(GuidGenerator, number);

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/IAssembleRequestManager.cs

@ -9,6 +9,6 @@ public interface IAssembleIssueRequestsManager : ISfsStoreRequestManager<Assembl
{ {
Task CompleteAsync(string number); Task CompleteAsync(string number);
Task<AssembleRequest> CreateByNumberAsync(AssembleRequest entity); Task<AssembleIssueRequests> CreateByNumberAsync(AssembleIssueRequests entity);
} }

4
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Jobs/AssembleJobAutoMapperProfile.cs

@ -15,7 +15,7 @@ public partial class StoreEventAutoMapperProfile : Profile
CreateMap<AssembleJob, AssembleNote>() CreateMap<AssembleJob, AssembleNote>()
.ForMember(x => x.JobNumber, y => y.MapFrom(d => d.Number)) .ForMember(x => x.JobNumber, y => y.MapFrom(d => d.Number))
.ForMember(x => x.RequestNumber, y => y.MapFrom(d => d.AssembleIssueRequestsNumber)) .ForMember(x => x.RequestNumber, y => y.MapFrom(d => d.AssembleRequestNumber))
.ForMember(x => x.ActiveDate, y => y.MapFrom(d => DateTime.Now)) .ForMember(x => x.ActiveDate, y => y.MapFrom(d => DateTime.Now))
.ForMember(x => x.Worker, y => y.MapFrom(d => d.CompleteUserName)) .ForMember(x => x.Worker, y => y.MapFrom(d => d.CompleteUserName))
.Ignore(x => x.Confirmed) .Ignore(x => x.Confirmed)
@ -26,7 +26,7 @@ public partial class StoreEventAutoMapperProfile : Profile
; ;
CreateMap<AssembleJob, AssembleNoteEditInput>() CreateMap<AssembleJob, AssembleNoteEditInput>()
.ForMember(x => x.RequestNumber, y => y.MapFrom(d => d.AssembleIssueRequestsNumber)) .ForMember(x => x.RequestNumber, y => y.MapFrom(d => d.AssembleRequestNumber))
.Ignore(x => x.Confirmed) .Ignore(x => x.Confirmed)
.Ignore(x => x.JobNumber) .Ignore(x => x.JobNumber)
.Ignore(x => x.ActiveDate) .Ignore(x => x.ActiveDate)

36
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/AssembleRequestEventHandler.cs

@ -19,11 +19,11 @@ namespace Win_in.Sfs.Wms.Store.Event.BusinessRequest;
public class AssembleIssueRequestsEventHandler public class AssembleIssueRequestsEventHandler
: StoreEventHandlerBase : StoreEventHandlerBase
, ILocalEventHandler<SfsHandledEntityEventData<AssembleRequest>> , ILocalEventHandler<SfsHandledEntityEventData<AssembleIssueRequests>>
, ILocalEventHandler<SfsAbortedEntityEventData<AssembleRequest>> , ILocalEventHandler<SfsAbortedEntityEventData<AssembleIssueRequests>>
, ILocalEventHandler<SfsCompletedEntityEventData<AssembleRequest>> , ILocalEventHandler<SfsCompletedEntityEventData<AssembleIssueRequests>>
, ILocalEventHandler<SfsCreatedEntityEventData<AssembleRequest>> , ILocalEventHandler<SfsCreatedEntityEventData<AssembleIssueRequests>>
, ILocalEventHandler<SfsCreatedEntityEventData<List<AssembleRequest>>> , ILocalEventHandler<SfsCreatedEntityEventData<List<AssembleIssueRequests>>>
{ {
private readonly IAssembleJobAppService _assembleJobAppService; private readonly IAssembleJobAppService _assembleJobAppService;
private readonly IProductionLineAppService _productionLineAppService; private readonly IProductionLineAppService _productionLineAppService;
@ -31,7 +31,7 @@ public class AssembleIssueRequestsEventHandler
private readonly ILocationAppService _locationAppService; private readonly ILocationAppService _locationAppService;
private readonly IBalanceAppService _balanceAppService; private readonly IBalanceAppService _balanceAppService;
public AssembleRequestEventHandler( public AssembleIssueRequestsEventHandler(
IAssembleJobAppService assembleJobAppService, IProductionLineAppService productionLineAppService, IAssembleJobAppService assembleJobAppService, IProductionLineAppService productionLineAppService,
ILocationAppService locationAppService, ILocationAppService locationAppService,
IBalanceAppService balanceAppService, IProductionLineItemAppService productionLineItemAppService) IBalanceAppService balanceAppService, IProductionLineItemAppService productionLineItemAppService)
@ -122,7 +122,7 @@ public class AssembleIssueRequestsEventHandler
/// <returns></returns> /// <returns></returns>
/// <exception cref="UserFriendlyException"></exception> /// <exception cref="UserFriendlyException"></exception>
private async Task<List<AssembleJobEditInput>> CreateAssembleJobWithQtyTypeAsync private async Task<List<AssembleJobEditInput>> CreateAssembleJobWithQtyTypeAsync
(AssembleRequest assembleRequest) (AssembleIssueRequests assembleRequest)
{ {
var jobs = new List<AssembleJobEditInput>(); var jobs = new List<AssembleJobEditInput>();
@ -201,7 +201,7 @@ public class AssembleIssueRequestsEventHandler
/// <param name="fromLocation"></param> /// <param name="fromLocation"></param>
/// <returns></returns> /// <returns></returns>
private async Task<AssembleJobEditInput> BuildAssembleJobCreateInputWithQtyTypeAsync( private async Task<AssembleJobEditInput> BuildAssembleJobCreateInputWithQtyTypeAsync(
AssembleRequest assembleRequest, AssembleIssueRequests assembleRequest,
LocationDTO fromLocation) LocationDTO fromLocation)
{ {
AssembleJobEditInput job; AssembleJobEditInput job;
@ -216,7 +216,7 @@ public class AssembleIssueRequestsEventHandler
job.Worker = "admin"; job.Worker = "admin";
} }
job.AssembleRequestNumber = assembleRequest.Number; job.AssembleIssueRequestsNumber = assembleRequest.Number;
await Task.CompletedTask.ConfigureAwait(false); await Task.CompletedTask.ConfigureAwait(false);
@ -232,8 +232,8 @@ public class AssembleIssueRequestsEventHandler
/// <returns></returns> /// <returns></returns>
/// <exception cref="UserFriendlyException"></exception> /// <exception cref="UserFriendlyException"></exception>
private async Task<List<AssembleJobDetailInput>> CreateAssembleJobDetailInputsWithQtyTypeAsync( private async Task<List<AssembleJobDetailInput>> CreateAssembleJobDetailInputsWithQtyTypeAsync(
AssembleRequest assembleRequest, AssembleIssueRequests assembleRequest,
AssembleRequestDetail assembleRequestDetail, string toLocationGroupCode) AssembleIssueRequestsDetail assembleRequestDetail, string toLocationGroupCode)
{ {
var jobDetails = new List<AssembleJobDetailInput>(); var jobDetails = new List<AssembleJobDetailInput>();
@ -296,7 +296,7 @@ public class AssembleIssueRequestsEventHandler
/// <param name="toLocationGroupCode"></param> /// <param name="toLocationGroupCode"></param>
/// <returns></returns> /// <returns></returns>
private async Task<AssembleJobDetailInput> BuildAssembleJobDetailWithQtyTypeAsync( private async Task<AssembleJobDetailInput> BuildAssembleJobDetailWithQtyTypeAsync(
AssembleRequestDetail assembleRequestDetail, BalanceDTO balance, string toLocationGroupCode) AssembleIssueRequestsDetail assembleRequestDetail, BalanceDTO balance, string toLocationGroupCode)
{ {
//ProductionLineDTO prodLine = await _productionLineAppService.GetByLocationGroupCodeAsync(toLocationGroupCode).ConfigureAwait(false); //ProductionLineDTO prodLine = await _productionLineAppService.GetByLocationGroupCodeAsync(toLocationGroupCode).ConfigureAwait(false);
@ -343,7 +343,7 @@ public class AssembleIssueRequestsEventHandler
/// <returns></returns> /// <returns></returns>
/// <exception cref="UserFriendlyException"></exception> /// <exception cref="UserFriendlyException"></exception>
private async Task<List<AssembleJobEditInput>> CreateAssembleJobWithBoxQtyTypeAsync private async Task<List<AssembleJobEditInput>> CreateAssembleJobWithBoxQtyTypeAsync
(AssembleRequest assembleRequest) (AssembleIssueRequests assembleRequest)
{ {
var inputJobs = new List<AssembleJobEditInput>(); var inputJobs = new List<AssembleJobEditInput>();
var inputExpectOutEditInput = new ExpectOutEditInput(); var inputExpectOutEditInput = new ExpectOutEditInput();
@ -418,16 +418,16 @@ public class AssembleIssueRequestsEventHandler
/// <param name="balanceDtos"></param> /// <param name="balanceDtos"></param>
/// <returns></returns> /// <returns></returns>
private async Task<AssembleJobEditInput> BuildAssembleJobCreateInputWithBoxQtyTypeAsync( private async Task<AssembleJobEditInput> BuildAssembleJobCreateInputWithBoxQtyTypeAsync(
AssembleRequest assembleRequest, AssembleIssueRequests assembleRequest,
AssembleRequestDetail assembleRequestDetail, BalanceDTO balanceDtos) AssembleIssueRequestsDetail assembleRequestDetail, BalanceDTO balanceDtos)
{ {
var job = ObjectMapper.Map<AssembleRequest, AssembleJobEditInput>(assembleRequest); var job = ObjectMapper.Map<AssembleIssueRequests, AssembleJobEditInput>(assembleRequest);
job.JobType = EnumJobType.IssueJob; job.JobType = EnumJobType.IssueJob;
job.JobStatus = EnumJobStatus.Open; job.JobStatus = EnumJobStatus.Open;
job.WorkGroupCode = assembleRequestDetail.ToLocationGroup; job.WorkGroupCode = assembleRequestDetail.ToLocationGroup;
job.WarehouseCode = assembleRequestDetail.ToWarehouseCode; job.WarehouseCode = assembleRequestDetail.ToWarehouseCode;
job.Worker = assembleRequest.Worker; job.Worker = assembleRequest.Worker;
job.AssembleRequestNumber = assembleRequest.Number; job.AssembleIssueRequestsNumber = assembleRequest.Number;
job.Details.Add(await BuildAssembleJobDetailWithBoxQtyTypeAsync(assembleRequestDetail, balanceDtos) job.Details.Add(await BuildAssembleJobDetailWithBoxQtyTypeAsync(assembleRequestDetail, balanceDtos)
.ConfigureAwait(false)); .ConfigureAwait(false));
@ -445,7 +445,7 @@ public class AssembleIssueRequestsEventHandler
/// <param name="toLocationGroupCode"></param> /// <param name="toLocationGroupCode"></param>
/// <returns></returns> /// <returns></returns>
private async Task<AssembleJobDetailInput> BuildAssembleJobDetailWithBoxQtyTypeAsync( private async Task<AssembleJobDetailInput> BuildAssembleJobDetailWithBoxQtyTypeAsync(
AssembleRequestDetail assembleRequestDetail, BalanceDTO balance) AssembleIssueRequestsDetail assembleRequestDetail, BalanceDTO balance)
{ {
var detail = new AssembleJobDetailInput(); var detail = new AssembleJobDetailInput();
detail.RequestLocationCode = assembleRequestDetail.ToLocationCode; detail.RequestLocationCode = assembleRequestDetail.ToLocationCode;

Loading…
Cancel
Save