From 73c9b187762ed97767dbd0a43ff4974ccc06b057 Mon Sep 17 00:00:00 2001 From: "boxu.zheng" Date: Wed, 17 Apr 2024 09:26:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=20=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Inputs/AssembleRequestEditInput.cs | 2 +- .../AssembleIssueRequestsAppService.cs} | 18 +++++----- ...AssembleIssueRequestsAutoMapperProfile.cs} | 0 .../AssembleRequestManager.cs | 2 +- .../IAssembleRequestManager.cs | 2 +- .../Jobs/AssembleJobAutoMapperProfile.cs | 4 +-- .../Requests/AssembleRequestEventHandler.cs | 36 +++++++++---------- 7 files changed, 32 insertions(+), 32 deletions(-) rename be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/{AssembleRequests/AssembleRequestAppService.cs => AssembleIssueRequests/AssembleIssueRequestsAppService.cs} (95%) rename be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/{AssembleRequests/AssembleRequestAutoMapperProfile.cs => AssembleIssueRequests/AssembleIssueRequestsAutoMapperProfile.cs} (100%) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/Inputs/AssembleRequestEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/Inputs/AssembleRequestEditInput.cs index 7b68689e2..1f091f3dc 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/Inputs/AssembleRequestEditInput.cs +++ b/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 /// 明细列表 /// [Display(Name = "明细列表")] - public List Details { get; set; } = new List(); + public List Details { get; set; } = new List(); #endregion #region Create diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/AssembleRequests/AssembleRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/AssembleIssueRequests/AssembleIssueRequestsAppService.cs similarity index 95% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/AssembleRequests/AssembleRequestAppService.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/AssembleIssueRequests/AssembleIssueRequestsAppService.cs index 430ffe889..6e3f346ac 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/AssembleRequests/AssembleRequestAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/AssembleIssueRequests/AssembleIssueRequestsAppService.cs @@ -44,9 +44,9 @@ public class AssembleIssueRequestsAppService : SfsStoreRequestAppServiceBase CreateAsync(AssembleRequestEditInput input) + public override async Task CreateAsync(AssembleIssueRequestsEditInput input) { foreach (var item in input.Details) { @@ -113,7 +113,7 @@ public class AssembleIssueRequestsAppService : SfsStoreRequestAppServiceBase(input); + var entity = ObjectMapper.Map(input); var result = await _assembleRequestManager.CreateByNumberAsync(entity).ConfigureAwait(false); @@ -127,7 +127,7 @@ public class AssembleIssueRequestsAppService : SfsStoreRequestAppServiceBase /// /// - private async Task SetRequestAutoPropertiesAsync(AssembleRequestEditInput entity) + private async Task SetRequestAutoPropertiesAsync(AssembleIssueRequestsEditInput entity) { var tranType = await _transactionTypeAppService.GetByTransTypeAsync(EnumTransType.Issue, EnumTransSubType.None).ConfigureAwait(false); Check.NotNull(tranType, "事务类型", "事务类型不存在"); @@ -233,7 +233,7 @@ public class AssembleIssueRequestsAppService : SfsStoreRequestAppServiceBase validationRresult) { var area = await _areaApp.GetByCodeAsync(importInput.FromLocationArea).ConfigureAwait(false); @@ -276,7 +276,7 @@ public class AssembleIssueRequestsAppService : SfsStoreRequestAppServiceBase CheckItemBasicAsync(AssembleRequestImportInput importInput, + protected async Task CheckItemBasicAsync(AssembleIssueRequestsImportInput importInput, List validationRresult) { var item = await _itemBasicAppService.GetByCodeAsync(importInput.ItemCode).ConfigureAwait(false); @@ -293,7 +293,7 @@ public class AssembleIssueRequestsAppService : SfsStoreRequestAppServiceBase CheckLocationAsync(AssembleRequestImportInput importInput, + protected async Task CheckLocationAsync(AssembleIssueRequestsImportInput importInput, List validationRresult) { var location = await _locationAppService.GetByCodeAsync(importInput.ToLocationCode).ConfigureAwait(false); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/AssembleRequests/AssembleRequestAutoMapperProfile.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/AssembleIssueRequests/AssembleIssueRequestsAutoMapperProfile.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/AssembleRequests/AssembleRequestAutoMapperProfile.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/AssembleIssueRequests/AssembleIssueRequestsAutoMapperProfile.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/AssembleRequestManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/AssembleRequestManager.cs index a6813cbad..978ab2d1e 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/AssembleRequestManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/AssembleRequestManager.cs @@ -34,7 +34,7 @@ public class AssembleIssueRequestsManager /// /// /// - public virtual async Task CreateByNumberAsync(AssembleRequest entity) + public virtual async Task CreateByNumberAsync(AssembleIssueRequests entity) { var number = string.IsNullOrEmpty(entity.Number) ? await GenerateNumberAsync(nameof(AssembleIssueRequests), entity.ActiveDate).ConfigureAwait(false) : entity.Number; entity.SetIdAndNumberWithDetails(GuidGenerator, number); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/IAssembleRequestManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/IAssembleRequestManager.cs index ece4383f9..c834d5dab 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/IAssembleRequestManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/IAssembleRequestManager.cs @@ -9,6 +9,6 @@ public interface IAssembleIssueRequestsManager : ISfsStoreRequestManager CreateByNumberAsync(AssembleRequest entity); + Task CreateByNumberAsync(AssembleIssueRequests entity); } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Jobs/AssembleJobAutoMapperProfile.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Jobs/AssembleJobAutoMapperProfile.cs index d8208d684..cfa65b89c 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Jobs/AssembleJobAutoMapperProfile.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Jobs/AssembleJobAutoMapperProfile.cs @@ -15,7 +15,7 @@ public partial class StoreEventAutoMapperProfile : Profile CreateMap() .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.Worker, y => y.MapFrom(d => d.CompleteUserName)) .Ignore(x => x.Confirmed) @@ -26,7 +26,7 @@ public partial class StoreEventAutoMapperProfile : Profile ; CreateMap() - .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.JobNumber) .Ignore(x => x.ActiveDate) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/AssembleRequestEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/AssembleRequestEventHandler.cs index e62ac9608..1a60eb749 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/AssembleRequestEventHandler.cs +++ b/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 : StoreEventHandlerBase - , ILocalEventHandler> - , ILocalEventHandler> - , ILocalEventHandler> - , ILocalEventHandler> - , ILocalEventHandler>> + , ILocalEventHandler> + , ILocalEventHandler> + , ILocalEventHandler> + , ILocalEventHandler> + , ILocalEventHandler>> { private readonly IAssembleJobAppService _assembleJobAppService; private readonly IProductionLineAppService _productionLineAppService; @@ -31,7 +31,7 @@ public class AssembleIssueRequestsEventHandler private readonly ILocationAppService _locationAppService; private readonly IBalanceAppService _balanceAppService; - public AssembleRequestEventHandler( + public AssembleIssueRequestsEventHandler( IAssembleJobAppService assembleJobAppService, IProductionLineAppService productionLineAppService, ILocationAppService locationAppService, IBalanceAppService balanceAppService, IProductionLineItemAppService productionLineItemAppService) @@ -122,7 +122,7 @@ public class AssembleIssueRequestsEventHandler /// /// private async Task> CreateAssembleJobWithQtyTypeAsync - (AssembleRequest assembleRequest) + (AssembleIssueRequests assembleRequest) { var jobs = new List(); @@ -201,7 +201,7 @@ public class AssembleIssueRequestsEventHandler /// /// private async Task BuildAssembleJobCreateInputWithQtyTypeAsync( - AssembleRequest assembleRequest, + AssembleIssueRequests assembleRequest, LocationDTO fromLocation) { AssembleJobEditInput job; @@ -216,7 +216,7 @@ public class AssembleIssueRequestsEventHandler job.Worker = "admin"; } - job.AssembleRequestNumber = assembleRequest.Number; + job.AssembleIssueRequestsNumber = assembleRequest.Number; await Task.CompletedTask.ConfigureAwait(false); @@ -232,8 +232,8 @@ public class AssembleIssueRequestsEventHandler /// /// private async Task> CreateAssembleJobDetailInputsWithQtyTypeAsync( - AssembleRequest assembleRequest, - AssembleRequestDetail assembleRequestDetail, string toLocationGroupCode) + AssembleIssueRequests assembleRequest, + AssembleIssueRequestsDetail assembleRequestDetail, string toLocationGroupCode) { var jobDetails = new List(); @@ -296,7 +296,7 @@ public class AssembleIssueRequestsEventHandler /// /// private async Task BuildAssembleJobDetailWithQtyTypeAsync( - AssembleRequestDetail assembleRequestDetail, BalanceDTO balance, string toLocationGroupCode) + AssembleIssueRequestsDetail assembleRequestDetail, BalanceDTO balance, string toLocationGroupCode) { //ProductionLineDTO prodLine = await _productionLineAppService.GetByLocationGroupCodeAsync(toLocationGroupCode).ConfigureAwait(false); @@ -343,7 +343,7 @@ public class AssembleIssueRequestsEventHandler /// /// private async Task> CreateAssembleJobWithBoxQtyTypeAsync - (AssembleRequest assembleRequest) + (AssembleIssueRequests assembleRequest) { var inputJobs = new List(); var inputExpectOutEditInput = new ExpectOutEditInput(); @@ -418,16 +418,16 @@ public class AssembleIssueRequestsEventHandler /// /// private async Task BuildAssembleJobCreateInputWithBoxQtyTypeAsync( - AssembleRequest assembleRequest, - AssembleRequestDetail assembleRequestDetail, BalanceDTO balanceDtos) + AssembleIssueRequests assembleRequest, + AssembleIssueRequestsDetail assembleRequestDetail, BalanceDTO balanceDtos) { - var job = ObjectMapper.Map(assembleRequest); + var job = ObjectMapper.Map(assembleRequest); job.JobType = EnumJobType.IssueJob; job.JobStatus = EnumJobStatus.Open; job.WorkGroupCode = assembleRequestDetail.ToLocationGroup; job.WarehouseCode = assembleRequestDetail.ToWarehouseCode; job.Worker = assembleRequest.Worker; - job.AssembleRequestNumber = assembleRequest.Number; + job.AssembleIssueRequestsNumber = assembleRequest.Number; job.Details.Add(await BuildAssembleJobDetailWithBoxQtyTypeAsync(assembleRequestDetail, balanceDtos) .ConfigureAwait(false)); @@ -445,7 +445,7 @@ public class AssembleIssueRequestsEventHandler /// /// private async Task BuildAssembleJobDetailWithBoxQtyTypeAsync( - AssembleRequestDetail assembleRequestDetail, BalanceDTO balance) + AssembleIssueRequestsDetail assembleRequestDetail, BalanceDTO balance) { var detail = new AssembleJobDetailInput(); detail.RequestLocationCode = assembleRequestDetail.ToLocationCode;