装配名称更新

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleIssueJobs/Inputs/AssembleIssueJobEditInput.cs

@@ -22,7 +22,7 @@ public class AssembleIssueJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobCre
     [Display(Name = "要货单号")]
     [Required(ErrorMessage = "{0}是必填项")]
     [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
-    public string AssembleIssueRequestsNumber { get; set; }
+    public string AssembleIssueRequestNumber { get; set; }
 
     /// <summary>
     /// 叫料请求类型

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Permissions/StorePermissionDefinitionProvider.cs

@@ -28,7 +28,7 @@ public class StorePermissionDefinitionProvider : PermissionDefinitionProvider
         storeGroup.AddMaterialRequestPermission();
         storeGroup.AddInjectionIssueRequestPermission();
         storeGroup.AddKittingIssueRequestPermission();
-        storeGroup.AddAssembleIssueRequestsPermission();
+        storeGroup.AddAssembleIssueRequestPermission();
         storeGroup.AddThirdLocationRequestPermission();
         storeGroup.AddContainerRequestPermission();
         storeGroup.AddIssueNotePermission();

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/AssembleIssueRequests/AssembleIssueRequestPermissions.cs

@@ -0,0 +1,24 @@
+using Volo.Abp.Authorization.Permissions;
+using Win_in.Sfs.Wms.Store.Domain;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public static class AssembleIssueRequestPermissions
+{
+
+    public const string Default = StorePermissions.GroupName + "." + nameof(AssembleIssueRequest);
+    public const string Create = Default + "." + StorePermissions.CreateStr;
+    public const string Update = Default + "." + StorePermissions.UpdateStr;
+    public const string Delete = Default + "." + StorePermissions.DeleteStr;
+
+    
+    public static void AddAssembleIssueRequestPermission(this PermissionGroupDefinition permissionGroup)
+    {
+        var AssembleIssueRequestPermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(AssembleIssueRequest)));
+        AssembleIssueRequestPermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr));
+        AssembleIssueRequestPermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr));
+        AssembleIssueRequestPermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr));
+
+       
+    }
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/AssembleIssueRequests/AssembleIssueRequestsPermissions.cs

@@ -1,27 +0,0 @@
-using Volo.Abp.Authorization.Permissions;
-using Win_in.Sfs.Wms.Store.Domain;
-
-namespace Win_in.Sfs.Wms.Store.Application.Contracts;
-
-public static class AssembleIssueRequestsPermissions
-{
-
-    public const string Default = StorePermissions.GroupName + "." + nameof(AssembleIssueRequests);
-    public const string Create = Default + "." + StorePermissions.CreateStr;
-    public const string Update = Default + "." + StorePermissions.UpdateStr;
-    public const string Delete = Default + "." + StorePermissions.DeleteStr;
-
-    //自动叫料申请
-    public const string AutoAssembleIssueRequests = StorePermissions.GroupName + "." + nameof(AutoAssembleIssueRequests);
-
-    public static void AddAssembleIssueRequestsPermission(this PermissionGroupDefinition permissionGroup)
-    {
-        var AssembleIssueRequestsPermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(AssembleIssueRequests)));
-        AssembleIssueRequestsPermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr));
-        AssembleIssueRequestsPermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr));
-        AssembleIssueRequestsPermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr));
-
-        permissionGroup.AddPermission(AutoAssembleIssueRequests, StorePermissionDefinitionProvider.L(nameof(AutoAssembleIssueRequests)));
-
-    }
-}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/AssembleIssueRequests/DTOs/AssembleIssueRequestsDTO.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/AssembleIssueRequests/DTOs/AssembleIssueRequestDTO.cs

@@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
-public class AssembleIssueRequestsDTO : SfsStoreRequestDTOBase<AssembleIssueRequestsDetailDTO>, IHasNumber
+public class AssembleIssueRequestDTO : SfsStoreRequestDTOBase<AssembleIssueRequestDetailDTO>, IHasNumber
 {
     /// <summary>
     ///     叫料类型

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/AssembleIssueRequests/DTOs/AssembleIssueRequestsDetailDTO.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/AssembleIssueRequests/DTOs/AssembleIssueRequestDetailDTO.cs

@@ -6,7 +6,7 @@ using Win_in.Sfs.Shared.Domain.Shared;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
-public class AssembleIssueRequestsDetailDTO : SfsStoreDetailWithQtyDTOBase
+public class AssembleIssueRequestDetailDTO : SfsStoreDetailWithQtyDTOBase
 {
     /// <summary>
     /// 已发数量

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/AssembleIssueRequests/IAssembleIssueRequestAppService.cs

@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public interface IAssembleIssueRequestAppService
+    : ISfsStoreRequestMasterAppServiceBase<AssembleIssueRequestDTO, SfsStoreRequestInputBase, AssembleIssueRequestEditInput, AssembleIssueRequestDetailDTO, SfsStoreRequestInputBase>
+
+{
+    Task<AssembleIssueRequestDTO> CreateAndHandleAsync(AssembleIssueRequestEditInput input);
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/AssembleIssueRequests/IAssembleIssueRequestsAppService.cs

@@ -1,13 +0,0 @@
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
-
-namespace Win_in.Sfs.Wms.Store.Application.Contracts;
-
-public interface IAssembleIssueRequestsAppService
-    : ISfsStoreRequestMasterAppServiceBase<AssembleIssueRequestsDTO, SfsStoreRequestInputBase, AssembleIssueRequestsEditInput, AssembleIssueRequestsDetailDTO, SfsStoreRequestInputBase>
-
-{
-    Task<AssembleIssueRequestsDTO> CreateAndHandleAsync(AssembleIssueRequestsEditInput input);
-}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/AssembleIssueRequests/Inputs/AssembleIssueRequestsDetailInput.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/AssembleIssueRequests/Inputs/AssembleIssueRequestDetailInput.cs

@@ -5,7 +5,7 @@ using Win_in.Sfs.Shared.Domain.Shared;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
-public class AssembleIssueRequestsDetailInput : SfsStoreDetailWithQtyInputBase
+public class AssembleIssueRequestDetailInput : SfsStoreDetailWithQtyInputBase
 {
     #region 目标库位信息
 

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/AssembleIssueRequests/Inputs/AssembleIssueRequestsEditInput.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/AssembleIssueRequests/Inputs/AssembleIssueRequestEditInput.cs

@@ -4,7 +4,7 @@ using Win_in.Sfs.Shared.Domain;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
-public class AssembleIssueRequestsEditInput : SfsStoreRequestCreateOrUpdateInputBase
+public class AssembleIssueRequestEditInput : SfsStoreRequestCreateOrUpdateInputBase
 {
     #region Base   
 
@@ -24,7 +24,7 @@ public class AssembleIssueRequestsEditInput : SfsStoreRequestCreateOrUpdateInput
     /// 明细列表
     /// </summary>
     [Display(Name = "明细列表")]
-    public List<AssembleIssueRequestsDetailInput> Details { get; set; } = new List<AssembleIssueRequestsDetailInput>();
+    public List<AssembleIssueRequestDetailInput> Details { get; set; } = new List<AssembleIssueRequestDetailInput>();
     #endregion
 
     #region Create  

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/AssembleIssueRequests/Inputs/AssembleIssueRequestsImportInput.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/AssembleIssueRequests/Inputs/AssembleIssueRequestImportInput.cs

@@ -5,7 +5,7 @@ using Win_in.Sfs.Shared.Domain.Shared;
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
 [Display(Name = "叫料申请")]
-public class AssembleIssueRequestsImportInput : SfsStoreImportInputBase
+public class AssembleIssueRequestImportInput : SfsStoreImportInputBase
 {
 
     /// <summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Win_in.Sfs.Wms.Store.Application.Contracts.csproj

@@ -11,10 +11,13 @@
 	<ItemGroup>
 		<Compile Remove="DocumentSettings\**" />
 		<Compile Remove="JisContainers\**" />
+		<Compile Remove="Requests\IssueRequest\InjectionRequests\**" />
 		<EmbeddedResource Remove="DocumentSettings\**" />
 		<EmbeddedResource Remove="JisContainers\**" />
+		<EmbeddedResource Remove="Requests\IssueRequest\InjectionRequests\**" />
 		<None Remove="DocumentSettings\**" />
 		<None Remove="JisContainers\**" />
+		<None Remove="Requests\IssueRequest\InjectionRequests\**" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -43,7 +46,6 @@
 
 	<ItemGroup>
 	  <Folder Include="Orders" />
-	  <Folder Include="Requests\IssueRequest\InjectionRequests\" />
 	  <Folder Include="Requests\MaterialRequests\" />
 	</ItemGroup>
 

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/AssembleIssueRequests/AssembleIssueRequestsAppService.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/AssembleIssueRequests/AssembleIssueRequestAppService.cs

@@ -31,12 +31,12 @@ namespace Win_in.Sfs.Wms.Store.Application;
 /// </summary>
 [Authorize]
 [Route($"{StoreConsts.RootPath}assemble-request")]
-public class AssembleIssueRequestsAppService : SfsStoreRequestAppServiceBase<AssembleIssueRequests, AssembleIssueRequestsDTO,
-        SfsStoreRequestInputBase, AssembleIssueRequestsEditInput, AssembleIssueRequestsDetail, AssembleIssueRequestsDetailDTO,
-        SfsStoreRequestInputBase, AssembleIssueRequestsImportInput>,
-    IAssembleIssueRequestsAppService
+public class AssembleIssueRequestAppService : SfsStoreRequestAppServiceBase<AssembleIssueRequest, AssembleIssueRequestDTO,
+        SfsStoreRequestInputBase, AssembleIssueRequestEditInput, AssembleIssueRequestDetail, AssembleIssueRequestDetailDTO,
+        SfsStoreRequestInputBase, AssembleIssueRequestImportInput>,
+    IAssembleIssueRequestAppService
 {
-    private readonly IAssembleIssueRequestsManager _assembleRequestManager;
+    private readonly IAssembleIssueRequestManager _assembleRequestManager;
     private readonly IItemStoreRelationAppService _itemStoreRelationApp;
     private readonly IAreaAppService _areaApp;
     private readonly ILocationAppService _locationAppService;
@@ -44,9 +44,9 @@ public class AssembleIssueRequestsAppService : SfsStoreRequestAppServiceBase<Ass
     private readonly IProductionLineAppService _productionLineAppService;    
     private readonly ITransactionTypeAppService _transactionTypeAppService;
 
-    public AssembleIssueRequestsAppService(
-        IAssembleIssueRequestsRepository repository,
-        IAssembleIssueRequestsManager assembleRequestManager,
+    public AssembleIssueRequestAppService(
+        IAssembleIssueRequestRepository repository,
+        IAssembleIssueRequestManager assembleRequestManager,
         IPreparationPlanManager preparationPlanManager,
         IItemStoreRelationAppService itemStoreRelationApp,
         IAreaAppService areaApp,
@@ -70,14 +70,14 @@ public class AssembleIssueRequestsAppService : SfsStoreRequestAppServiceBase<Ass
 
     #region 东阳V2
 
-    public override async Task<AssembleIssueRequestsDTO> HandleAsync(Guid id)
+    public override async Task<AssembleIssueRequestDTO> HandleAsync(Guid id)
     {
         await Task.CompletedTask.ConfigureAwait(false);
         return null;
     }
 
     [HttpPost("")]
-    public override async Task<AssembleIssueRequestsDTO> CreateAsync(AssembleIssueRequestsEditInput input)
+    public override async Task<AssembleIssueRequestDTO> CreateAsync(AssembleIssueRequestEditInput input)
     {
         foreach (var item in input.Details)
         {
@@ -113,11 +113,11 @@ public class AssembleIssueRequestsAppService : SfsStoreRequestAppServiceBase<Ass
         }
 
         await SetRequestAutoPropertiesAsync(input).ConfigureAwait(false);
-        var entity = ObjectMapper.Map<AssembleIssueRequestsEditInput, AssembleIssueRequests>(input);
+        var entity = ObjectMapper.Map<AssembleIssueRequestEditInput, AssembleIssueRequest>(input);
 
         var result = await _assembleRequestManager.CreateByNumberAsync(entity).ConfigureAwait(false);
 
-        var dto = ObjectMapper.Map<AssembleIssueRequests, AssembleIssueRequestsDTO>(result);
+        var dto = ObjectMapper.Map<AssembleIssueRequest, AssembleIssueRequestDTO>(result);
 
         return dto;
     }
@@ -127,7 +127,7 @@ public class AssembleIssueRequestsAppService : SfsStoreRequestAppServiceBase<Ass
     /// </summary>
     /// <param name="entity"></param>
     /// <returns></returns>
-    private async Task SetRequestAutoPropertiesAsync(AssembleIssueRequestsEditInput entity)
+    private async Task SetRequestAutoPropertiesAsync(AssembleIssueRequestEditInput entity)
     {
         var tranType = await _transactionTypeAppService.GetByTransTypeAsync(EnumTransType.Issue, EnumTransSubType.None).ConfigureAwait(false);
         Check.NotNull(tranType, "事务类型", "事务类型不存在");
@@ -139,7 +139,7 @@ public class AssembleIssueRequestsAppService : SfsStoreRequestAppServiceBase<Ass
     }
 
     [HttpPost("create-and-handle")]
-    public async Task<AssembleIssueRequestsDTO> CreateAndHandleAsync(AssembleIssueRequestsEditInput input)
+    public async Task<AssembleIssueRequestDTO> CreateAndHandleAsync(AssembleIssueRequestEditInput input)
     {
         var assembleRequestDto = await CreateAsync(input).ConfigureAwait(false);
 
@@ -157,8 +157,8 @@ public class AssembleIssueRequestsAppService : SfsStoreRequestAppServiceBase<Ass
     /// </summary>
     /// <param name="dictionary"></param>
     /// <returns></returns>
-    protected override async Task<Dictionary<AssembleIssueRequests, EntityState>> ImportProcessingEntityAsync(
-        Dictionary<AssembleIssueRequests, EntityState> dictionary)
+    protected override async Task<Dictionary<AssembleIssueRequest, EntityState>> ImportProcessingEntityAsync(
+        Dictionary<AssembleIssueRequest, EntityState> dictionary)
     {
         var addList = dictionary.Where(p => p.Value == EntityState.Added).Select(p => p.Key);
 
@@ -200,7 +200,7 @@ public class AssembleIssueRequestsAppService : SfsStoreRequestAppServiceBase<Ass
     /// <param name="model"></param>
     /// <param name="validationRresult"></param>
     /// <returns></returns>
-    protected override async Task ValidateImportModelAsync(AssembleIssueRequestsImportInput model,
+    protected override async Task ValidateImportModelAsync(AssembleIssueRequestImportInput model,
         List<ValidationResult> validationRresult)
     {
         _ = new Dictionary<string, string>();
@@ -214,7 +214,7 @@ public class AssembleIssueRequestsAppService : SfsStoreRequestAppServiceBase<Ass
 
     #region 校验
 
-    protected override async Task<bool> ValidateImportEntities(Dictionary<AssembleIssueRequests, EntityState> dict)
+    protected override async Task<bool> ValidateImportEntities(Dictionary<AssembleIssueRequest, EntityState> dict)
     {
         foreach (var entity in dict.Keys)
         {
@@ -233,7 +233,7 @@ public class AssembleIssueRequestsAppService : SfsStoreRequestAppServiceBase<Ass
         return await base.ValidateImportEntities(dict).ConfigureAwait(false);
     }
 
-    protected async Task CheckAreaAsync(AssembleIssueRequestsImportInput importInput,
+    protected async Task CheckAreaAsync(AssembleIssueRequestImportInput importInput,
         List<ValidationResult> validationRresult)
     {
         var area = await _areaApp.GetByCodeAsync(importInput.FromLocationArea).ConfigureAwait(false);
@@ -243,7 +243,7 @@ public class AssembleIssueRequestsAppService : SfsStoreRequestAppServiceBase<Ass
         }
     }
 
-    protected async Task CheckStoreRelationAsync(AssembleIssueRequestsImportInput importInput,
+    protected async Task CheckStoreRelationAsync(AssembleIssueRequestImportInput importInput,
         List<ValidationResult> validationRresult)
     {
         var itemStoreRelation = await _itemStoreRelationApp
@@ -276,7 +276,7 @@ public class AssembleIssueRequestsAppService : SfsStoreRequestAppServiceBase<Ass
         }
     }
 
-    protected async Task<ItemBasicDTO> CheckItemBasicAsync(AssembleIssueRequestsImportInput importInput,
+    protected async Task<ItemBasicDTO> CheckItemBasicAsync(AssembleIssueRequestImportInput importInput,
         List<ValidationResult> validationRresult)
     {
         var item = await _itemBasicAppService.GetByCodeAsync(importInput.ItemCode).ConfigureAwait(false);
@@ -293,7 +293,7 @@ public class AssembleIssueRequestsAppService : SfsStoreRequestAppServiceBase<Ass
         return item;
     }
 
-    protected async Task<LocationDTO> CheckLocationAsync(AssembleIssueRequestsImportInput importInput,
+    protected async Task<LocationDTO> CheckLocationAsync(AssembleIssueRequestImportInput importInput,
         List<ValidationResult> validationRresult)
     {
         var location = await _locationAppService.GetByCodeAsync(importInput.ToLocationCode).ConfigureAwait(false);

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/AssembleIssueRequests/AssembleIssueRequestsAutoMapperProfile.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/AssembleIssueRequests/AssembleIssueRequestAutoMapperProfile.cs

@@ -8,22 +8,22 @@ namespace Win_in.Sfs.Wms.Store.Application;
 
 public partial class StoreApplicationAutoMapperProfile : Profile
 {
-    private void AssembleIssueRequestsAutoMapperProfile()
+    private void AssembleIssueRequestAutoMapperProfile()
     {
-        CreateMap<AssembleIssueRequests, AssembleIssueRequestsDTO>()
+        CreateMap<AssembleIssueRequest, AssembleIssueRequestDTO>()
             .ReverseMap();
 
-        CreateMap<AssembleIssueRequestsDetail, AssembleIssueRequestsDetailDTO>()
+        CreateMap<AssembleIssueRequestDetail, AssembleIssueRequestDetailDTO>()
             .ReverseMap();
 
-        CreateMap<AssembleIssueRequestsDetailInput, AssembleIssueRequestsDetail>()
+        CreateMap<AssembleIssueRequestDetailInput, AssembleIssueRequestDetail>()
               .IgnoreAuditedObjectProperties()
               .Ignore(x => x.MasterID)
               .Ignore(x => x.TenantId)
               .Ignore(x => x.Number)
               .Ignore(x => x.Id);
 
-        CreateMap<AssembleIssueRequestsImportInput, AssembleIssueRequests>()
+        CreateMap<AssembleIssueRequestImportInput, AssembleIssueRequest>()
             .IgnoreAuditedObjectProperties()
             .ForMember(x => x.Type, y => y.MapFrom(t => t.Type.ToString()))
             .Ignore(x => x.UseOnTheWayLocation)
@@ -37,7 +37,7 @@ public partial class StoreApplicationAutoMapperProfile : Profile
             .Ignore(x => x.ActiveDate)
             .Ignore(x => x.Remark);
 
-        CreateMap<AssembleIssueRequestsImportInput, AssembleIssueRequestsDetail>()
+        CreateMap<AssembleIssueRequestImportInput, AssembleIssueRequestDetail>()
             .IgnoreAuditedObjectProperties()
             .ForMember(x => x.Status, y => y.MapFrom(t => EnumStatus.Open))
             .Ignore(x => x.ToLocationErpCode)
@@ -58,7 +58,7 @@ public partial class StoreApplicationAutoMapperProfile : Profile
             .Ignore(x => x.Number)
             .Ignore(x => x.Id)
             .Ignore(x => x.Remark);
-        CreateMap<AssembleIssueRequestsEditInput, AssembleIssueRequests>()
+        CreateMap<AssembleIssueRequestEditInput, AssembleIssueRequest>()
             .IgnoreAuditedObjectProperties()
             .Ignore(x => x.RequestStatus)
             .Ignore(x => x.ConcurrencyStamp).Ignore(x => x.Id);

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/StoreApplicationAutoMapperProfile.cs

@@ -16,7 +16,7 @@ public partial class StoreApplicationAutoMapperProfile : Profile
         MaterialRequestAutoMapperProfile();
         InjectionIssueRequestAutoMapperProfile();
         KittingIssueRequestAutoMapperProfile();
-        AssembleIssueRequestsAutoMapperProfile();
+        AssembleIssueRequestAutoMapperProfile();
         ThirdLocationRequestAutoMapperProfile();
         ProductionReturnRequestAutoMapperProfile();
         ProductReceiptRequestAutoMapperProfile();

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/AssembleIssueRequests/AssembleIssueRequests.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/AssembleIssueRequests/AssembleIssueRequest.cs

@@ -7,7 +7,7 @@ namespace Win_in.Sfs.Wms.Store.Domain;
 /// <summary>
 /// 装配叫料申请
 /// </summary>
-public class AssembleIssueRequests : SfsStoreRequestAggregateRootBase<AssembleIssueRequestsDetail>
+public class AssembleIssueRequest : SfsStoreRequestAggregateRootBase<AssembleIssueRequestDetail>
 {
     /// <summary>
     /// 叫料类型
@@ -25,5 +25,5 @@ public class AssembleIssueRequests : SfsStoreRequestAggregateRootBase<AssembleIs
     /// 明细列表 
     /// </summary>
     [IgnoreUpdate]
-    public override List<AssembleIssueRequestsDetail> Details { get; set; } = new List<AssembleIssueRequestsDetail>();
+    public override List<AssembleIssueRequestDetail> Details { get; set; } = new List<AssembleIssueRequestDetail>();
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/AssembleIssueRequests/AssembleIssueRequestsDetail.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/AssembleIssueRequests/AssembleIssueRequestDetail.cs

@@ -9,7 +9,7 @@ namespace Win_in.Sfs.Wms.Store.Domain;
 /// <summary>
 /// 装配叫料申请明细
 /// </summary>
-public class AssembleIssueRequestsDetail : SfsStoreDetailWithQtyEntityBase, IHasToLocation
+public class AssembleIssueRequestDetail : SfsStoreDetailWithQtyEntityBase, IHasToLocation
 {
 
     #region 目标库位信息

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/AssembleIssueRequests/AssembleIssueRequestsManager.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/AssembleIssueRequests/AssembleIssueRequestManager.cs

@@ -9,15 +9,15 @@ using static Win_in.Sfs.Wms.Store.Domain.Shared.StoreSettings;
 
 namespace Win_in.Sfs.Wms.Store.Domain;
 
-public class AssembleIssueRequestsManager
-    : SfsStoreRequestManagerBase<AssembleIssueRequests, AssembleIssueRequestsDetail>
-        , IAssembleIssueRequestsManager
+public class AssembleIssueRequestManager
+    : SfsStoreRequestManagerBase<AssembleIssueRequest, AssembleIssueRequestDetail>
+        , IAssembleIssueRequestManager
 {
-    private readonly IAssembleIssueRequestsRepository _repository;
+    private readonly IAssembleIssueRequestRepository _repository;
     
 
-    public AssembleIssueRequestsManager(
-        IAssembleIssueRequestsRepository repository
+    public AssembleIssueRequestManager(
+        IAssembleIssueRequestRepository repository
        
         ) : base(repository)
     {
@@ -34,14 +34,14 @@ public class AssembleIssueRequestsManager
     /// </summary>
     /// <param name="entity"></param>
     /// <returns></returns>
-    public virtual async Task<AssembleIssueRequests> CreateByNumberAsync(AssembleIssueRequests entity)
+    public virtual async Task<AssembleIssueRequest> CreateByNumberAsync(AssembleIssueRequest 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(AssembleIssueRequest), entity.ActiveDate).ConfigureAwait(false) : entity.Number;
         entity.SetIdAndNumberWithDetails(GuidGenerator, number);
         entity.Submit();
         entity.Agree();
         entity.RequestStatus = EnumRequestStatus.Partial;
-        await LocalEventBus.PublishAsync(new SfsHandledEntityEventData<AssembleIssueRequests>(entity), false)
+        await LocalEventBus.PublishAsync(new SfsHandledEntityEventData<AssembleIssueRequest>(entity), false)
             .ConfigureAwait(false);
         await _repository.InsertAsync(entity).ConfigureAwait(false);
         return entity;
@@ -63,7 +63,7 @@ public class AssembleIssueRequestsManager
     /// <summary>
     /// 执行导入
     /// </summary>
-    public virtual async Task ImportDataAsync(List<AssembleIssueRequests> mergeEntities, List<AssembleIssueRequests> deleteEntities = null)
+    public virtual async Task ImportDataAsync(List<AssembleIssueRequest> mergeEntities, List<AssembleIssueRequest> deleteEntities = null)
     {
         if (deleteEntities != null && deleteEntities.Count > 0)
         {

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/AssembleIssueRequests/IAssembleIssueRequestManager.cs

@@ -0,0 +1,14 @@
+using System.Threading.Tasks;
+
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+using Win_in.Sfs.Shared.Domain;
+
+public interface IAssembleIssueRequestManager : ISfsStoreRequestManager<AssembleIssueRequest, AssembleIssueRequestDetail>,
+                                            IBulkImportService<AssembleIssueRequest>
+{     
+    Task CompleteAsync(string number);
+
+    Task<AssembleIssueRequest> CreateByNumberAsync(AssembleIssueRequest entity);
+
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/AssembleIssueRequests/IAssembleIssueRequestsRepository.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/AssembleIssueRequests/IAssembleIssueRequestRepository.cs

@@ -2,8 +2,8 @@ using Win_in.Sfs.Shared.Domain;
 
 namespace Win_in.Sfs.Wms.Store.Domain;
 
-public interface IAssembleIssueRequestsRepository : ISfsStoreRepositoryBase<AssembleIssueRequests>,
-                                              ISfsBulkRepositoryBase<AssembleIssueRequests>
+public interface IAssembleIssueRequestRepository : ISfsStoreRepositoryBase<AssembleIssueRequest>,
+                                              ISfsBulkRepositoryBase<AssembleIssueRequest>
 {
 
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/AssembleIssueRequests/IAssembleIssueRequestsManager.cs

@@ -1,14 +0,0 @@
-using System.Threading.Tasks;
-
-namespace Win_in.Sfs.Wms.Store.Domain;
-
-using Win_in.Sfs.Shared.Domain;
-
-public interface IAssembleIssueRequestsManager : ISfsStoreRequestManager<AssembleIssueRequests, AssembleIssueRequestsDetail>,
-                                            IBulkImportService<AssembleIssueRequests>
-{     
-    Task CompleteAsync(string number);
-
-    Task<AssembleIssueRequests> CreateByNumberAsync(AssembleIssueRequests entity);
-
-}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/IStoreDbContext.cs

@@ -23,7 +23,7 @@ public interface IStoreDbContext : IEfCoreDbContext
     public DbSet<MaterialRequest> MaterialRequests { get; }
     public DbSet<InjectionIssueRequest> InjectionIssueRequests { get; }
     public DbSet<KittingIssueRequest> KittingIssueRequests { get; }
-    public DbSet<AssembleIssueRequests> AssembleIssueRequests { get; }
+    public DbSet<AssembleIssueRequest> AssembleIssueRequest { get; }
     public DbSet<ThirdLocationRequest> ThirdLocationRequests { get; }
     public DbSet<ContainerRequest> ContainerRequests { get; }
     public DbSet<DeliverRequest> DeliverRequests { get; }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/IssueRequests/AssembleIssueRequests/AssembleIssueRequestsDbContextModelCreatingExtensions.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/IssueRequests/AssembleIssueRequests/AssembleIssueRequestDbContextModelCreatingExtensions.cs

@@ -5,14 +5,14 @@ using Win_in.Sfs.Wms.Store.Domain;
 
 namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore;
 
-public static class AssembleIssueRequestsDbContextModelCreatingExtensions
+public static class AssembleIssueRequestDbContextModelCreatingExtensions
 {
-    public static void ConfigureAssembleIssueRequests(this ModelBuilder builder, StoreModelBuilderConfigurationOptions options)
+    public static void ConfigureAssembleIssueRequest(this ModelBuilder builder, StoreModelBuilderConfigurationOptions options)
     {
-        builder.Entity<AssembleIssueRequests>(b =>
+        builder.Entity<AssembleIssueRequest>(b =>
         {
             //Configure table & schema name
-            b.ToTable(options.TablePrefix + nameof(AssembleIssueRequests), options.Schema);
+            b.ToTable(options.TablePrefix + nameof(AssembleIssueRequest), options.Schema);
             //Configure ABP properties
             b.ConfigureByConvention();
             //Configure Sfs base properties
@@ -29,10 +29,10 @@ public static class AssembleIssueRequestsDbContextModelCreatingExtensions
             b.HasIndex(q => new { q.Number }).IsUnique();
         });
 
-        builder.Entity<AssembleIssueRequestsDetail>(b =>
+        builder.Entity<AssembleIssueRequestDetail>(b =>
         {
             //Configure table & schema name
-            b.ToTable(options.TablePrefix + nameof(AssembleIssueRequestsDetail), options.Schema);
+            b.ToTable(options.TablePrefix + nameof(AssembleIssueRequestDetail), options.Schema);
             //Configure ABP properties
             b.ConfigureByConvention();
             //Configure Sfs base properties

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/IssueRequests/AssembleIssueRequests/AssembleIssueRequestEfCoreRepository.cs

@@ -0,0 +1,11 @@
+using Volo.Abp.EntityFrameworkCore;
+using Win_in.Sfs.Wms.Store.Domain;
+
+namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore;
+
+public class AssembleIssueRequestEfCoreRepository : SfsStoreEfCoreRepositoryBase<StoreDbContext, AssembleIssueRequest>, IAssembleIssueRequestRepository
+{
+    public AssembleIssueRequestEfCoreRepository(IDbContextProvider<StoreDbContext> dbContextProvider) : base(dbContextProvider)
+    {
+    }
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/IssueRequests/AssembleIssueRequests/AssembleIssueRequestsEfCoreRepository.cs

@@ -1,11 +0,0 @@
-using Volo.Abp.EntityFrameworkCore;
-using Win_in.Sfs.Wms.Store.Domain;
-
-namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore;
-
-public class AssembleIssueRequestsEfCoreRepository : SfsStoreEfCoreRepositoryBase<StoreDbContext, AssembleIssueRequests>, IAssembleIssueRequestsRepository
-{
-    public AssembleIssueRequestsEfCoreRepository(IDbContextProvider<StoreDbContext> dbContextProvider) : base(dbContextProvider)
-    {
-    }
-}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreDbContext.cs

@@ -23,7 +23,7 @@ public class StoreDbContext : AbpDbContext<StoreDbContext>, IStoreDbContext
     public DbSet<MaterialRequest> MaterialRequests { get; set; }
     public DbSet<InjectionIssueRequest> InjectionIssueRequests { get; set; }
     public DbSet<KittingIssueRequest> KittingIssueRequests { get; set; }
-    public DbSet<AssembleIssueRequests> AssembleIssueRequests { get; set; }
+    public DbSet<AssembleIssueRequest> AssembleIssueRequest { get; set; }
     public DbSet<ThirdLocationRequest> ThirdLocationRequests { get; set; }
     public DbSet<ContainerRequest> ContainerRequests { get; set; }
     public DbSet<DeliverRequest> DeliverRequests { get; set; }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreDbContextModelCreatingExtensions.cs

@@ -49,7 +49,7 @@ public static class StoreDbContextModelCreatingExtensions
         builder.ConfigureMaterialRequest(options);
         builder.ConfigureInjectionIssueRequest(options);
         builder.ConfigureKittingIssueRequest(options);
-        builder.ConfigureAssembleIssueRequests(options);
+        builder.ConfigureAssembleIssueRequest(options);
         builder.ConfigureThirdLocationRequest(options);
         builder.ConfigureDeliverRequest(options);
         builder.ConfigureContainerRequest(options);       

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreEntityFrameworkCoreModule.cs

@@ -62,7 +62,7 @@ public class StoreEntityFrameworkCoreModule : AbpModule
         context.Services.AddTransient<IMaterialRequestRepository, MaterialRequestEfCoreRepository>();
         context.Services.AddTransient<IInjectionIssueRequestRepository, InjectionIssueRequestEfCoreRepository>();
         context.Services.AddTransient<IKittingIssueRequestRepository, KittingIssueRequestEfCoreRepository>();
-        context.Services.AddTransient<IAssembleIssueRequestsRepository, AssembleIssueRequestsEfCoreRepository>();
+        context.Services.AddTransient<IAssembleIssueRequestRepository, AssembleIssueRequestEfCoreRepository>();
         context.Services.AddTransient<IThirdLocationRequestRepository, ThirdLocationRequestEfCoreRepository>();
         context.Services.AddTransient<IDeliverRequestRepository, DeliverRequestEfCoreRepository>();        
         context.Services.AddTransient<IContainerRequestRepository, ContainerRequestEfCoreRepository>();
@@ -215,7 +215,7 @@ public class StoreEntityFrameworkCoreModule : AbpModule
                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<KittingIssueRequest>(orderOptions =>
                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
-            options.Entity<AssembleIssueRequests>(orderOptions =>
+            options.Entity<AssembleIssueRequest>(orderOptions =>
                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<ThirdLocationRequest>(orderOptions =>
                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/AssembleIssueRequestsAutoMapperProfile.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/AssembleIssueRequestAutoMapperProfile.cs

@@ -9,10 +9,10 @@ namespace Win_in.Sfs.Wms.Store.Event;
 
 public partial class StoreEventAutoMapperProfile : Profile
 {
-    private void AssembleIssueRequestsAutoMapperProfile()
+    private void AssembleIssueRequestAutoMapperProfile()
     {
-        CreateMap<AssembleIssueRequests, AssembleIssueJobEditInput>()
-            .ForMember(x => x.AssembleIssueRequestsNumber, y => y.MapFrom(d => d.Number))
+        CreateMap<AssembleIssueRequest, AssembleIssueJobEditInput>()
+            .ForMember(x => x.AssembleIssueRequestNumber, y => y.MapFrom(d => d.Number))
             .ForMember(x => x.RequestType, y => y.MapFrom(d => d.Type))
             .Ignore(x => x.WarehouseCode)
             .Ignore(x => x.UpStreamJobNumber)

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/AssembleIssueRequestsEventHandler.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/AssembleIssueRequestEventHandler.cs

@@ -17,13 +17,13 @@ using Win_in.Sfs.Wms.Store.Domain.Shared;
 
 namespace Win_in.Sfs.Wms.Store.Event.BusinessRequest;
 
-public class AssembleIssueRequestsEventHandler
+public class AssembleIssueRequestEventHandler
     : StoreEventHandlerBase
-        , ILocalEventHandler<SfsHandledEntityEventData<AssembleIssueRequests>>
-        , ILocalEventHandler<SfsAbortedEntityEventData<AssembleIssueRequests>>
-        , ILocalEventHandler<SfsCompletedEntityEventData<AssembleIssueRequests>>
-        , ILocalEventHandler<SfsCreatedEntityEventData<AssembleIssueRequests>>
-        , ILocalEventHandler<SfsCreatedEntityEventData<List<AssembleIssueRequests>>>
+        , ILocalEventHandler<SfsHandledEntityEventData<AssembleIssueRequest>>
+        , ILocalEventHandler<SfsAbortedEntityEventData<AssembleIssueRequest>>
+        , ILocalEventHandler<SfsCompletedEntityEventData<AssembleIssueRequest>>
+        , ILocalEventHandler<SfsCreatedEntityEventData<AssembleIssueRequest>>
+        , ILocalEventHandler<SfsCreatedEntityEventData<List<AssembleIssueRequest>>>
 {
     private readonly IAssembleIssueJobAppService _assembleJobAppService;
     private readonly IProductionLineAppService _productionLineAppService;
@@ -31,7 +31,7 @@ public class AssembleIssueRequestsEventHandler
     private readonly ILocationAppService _locationAppService;
     private readonly IBalanceAppService _balanceAppService;
 
-    public AssembleIssueRequestsEventHandler(
+    public AssembleIssueRequestEventHandler(
         IAssembleIssueJobAppService assembleJobAppService, IProductionLineAppService productionLineAppService,
         ILocationAppService locationAppService,
         IBalanceAppService balanceAppService, IProductionLineItemAppService productionLineItemAppService)
@@ -47,7 +47,7 @@ public class AssembleIssueRequestsEventHandler
     ///     创建后
     /// </summary>
     /// <param name="eventData">Event data</param>
-    public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<AssembleIssueRequests> eventData)
+    public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<AssembleIssueRequest> eventData)
     {
         await Task.CompletedTask.ConfigureAwait(false);
     }
@@ -56,7 +56,7 @@ public class AssembleIssueRequestsEventHandler
     ///     批量创建后
     /// </summary>
     /// <param name="eventData">Event data</param>
-    public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<List<AssembleIssueRequests>> eventData)
+    public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<List<AssembleIssueRequest>> eventData)
     {
         await Task.CompletedTask.ConfigureAwait(false);
     }
@@ -66,7 +66,7 @@ public class AssembleIssueRequestsEventHandler
     /// </summary>
     /// <param name="eventData"></param>
     /// <returns></returns>
-    public virtual async Task HandleEventAsync(SfsHandledEntityEventData<AssembleIssueRequests> eventData)
+    public virtual async Task HandleEventAsync(SfsHandledEntityEventData<AssembleIssueRequest> eventData)
     {
         var entity = eventData.Entity;
 
@@ -93,7 +93,7 @@ public class AssembleIssueRequestsEventHandler
     /// </summary>
     /// <param name="eventData"></param>
     /// <returns></returns>
-    public virtual async Task HandleEventAsync(SfsAbortedEntityEventData<AssembleIssueRequests> eventData)
+    public virtual async Task HandleEventAsync(SfsAbortedEntityEventData<AssembleIssueRequest> eventData)
     {
         await Task.CompletedTask.ConfigureAwait(false);
     }
@@ -103,10 +103,10 @@ public class AssembleIssueRequestsEventHandler
     /// </summary>
     /// <param name="eventData"></param>
     /// <returns></returns>
-    public virtual async Task HandleEventAsync(SfsCompletedEntityEventData<AssembleIssueRequests> eventData)
+    public virtual async Task HandleEventAsync(SfsCompletedEntityEventData<AssembleIssueRequest> eventData)
     {
         _ = eventData.Entity;
-        // await _assembleJobAppService.CompleteByAssembleIssueRequestsAsync(entity.Number);
+        // await _assembleJobAppService.CompleteByAssembleIssueRequestAsync(entity.Number);
 
         await Task.CompletedTask.ConfigureAwait(false);
     }
@@ -122,7 +122,7 @@ public class AssembleIssueRequestsEventHandler
     /// <returns></returns>
     /// <exception cref="UserFriendlyException"></exception>
     private async Task<List<AssembleIssueJobEditInput>> CreateAssembleIssueJobWithQtyTypeAsync
-        (AssembleIssueRequests assembleRequest)
+        (AssembleIssueRequest assembleRequest)
     {
         var jobs = new List<AssembleIssueJobEditInput>();
 
@@ -201,11 +201,11 @@ public class AssembleIssueRequestsEventHandler
     /// <param name="fromLocation"></param>
     /// <returns></returns>
     private async Task<AssembleIssueJobEditInput> BuildAssembleIssueJobCreateInputWithQtyTypeAsync(
-        AssembleIssueRequests assembleRequest,
+        AssembleIssueRequest assembleRequest,
         LocationDTO fromLocation)
     {
         AssembleIssueJobEditInput job;
-        job = ObjectMapper.Map<AssembleIssueRequests, AssembleIssueJobEditInput>(assembleRequest);
+        job = ObjectMapper.Map<AssembleIssueRequest, AssembleIssueJobEditInput>(assembleRequest);
         job.JobType = EnumJobType.IssueJob;
         job.JobStatus = EnumJobStatus.Open;
         job.WorkGroupCode = fromLocation.WorkGroupCode;
@@ -216,7 +216,7 @@ public class AssembleIssueRequestsEventHandler
             job.Worker = "admin";
         }
 
-        job.AssembleIssueRequestsNumber = assembleRequest.Number;
+        job.AssembleIssueRequestNumber = assembleRequest.Number;
 
         await Task.CompletedTask.ConfigureAwait(false);
 
@@ -232,8 +232,8 @@ public class AssembleIssueRequestsEventHandler
     /// <returns></returns>
     /// <exception cref="UserFriendlyException"></exception>
     private async Task<List<AssembleIssueJobDetailInput>> CreateAssembleIssueJobDetailInputsWithQtyTypeAsync(
-        AssembleIssueRequests assembleRequest,
-        AssembleIssueRequestsDetail assembleRequestDetail, string toLocationGroupCode)
+        AssembleIssueRequest assembleRequest,
+        AssembleIssueRequestDetail assembleRequestDetail, string toLocationGroupCode)
     {
         var jobDetails = new List<AssembleIssueJobDetailInput>();
 
@@ -296,7 +296,7 @@ public class AssembleIssueRequestsEventHandler
     /// <param name="toLocationGroupCode"></param>
     /// <returns></returns>
     private async Task<AssembleIssueJobDetailInput> BuildAssembleIssueJobDetailWithQtyTypeAsync(
-        AssembleIssueRequestsDetail assembleRequestDetail, BalanceDTO balance, string toLocationGroupCode)
+        AssembleIssueRequestDetail assembleRequestDetail, BalanceDTO balance, string toLocationGroupCode)
     {
         //ProductionLineDTO prodLine = await _productionLineAppService.GetByLocationGroupCodeAsync(toLocationGroupCode).ConfigureAwait(false);
 
@@ -343,7 +343,7 @@ public class AssembleIssueRequestsEventHandler
     /// <returns></returns>
     /// <exception cref="UserFriendlyException"></exception>
     private async Task<List<AssembleIssueJobEditInput>> CreateAssembleIssueJobWithBoxQtyTypeAsync
-        (AssembleIssueRequests assembleRequest)
+        (AssembleIssueRequest assembleRequest)
     {
         var inputJobs = new List<AssembleIssueJobEditInput>();
         var inputExpectOutEditInput = new ExpectOutEditInput();
@@ -418,16 +418,16 @@ public class AssembleIssueRequestsEventHandler
     /// <param name="balanceDtos"></param>
     /// <returns></returns>
     private async Task<AssembleIssueJobEditInput> BuildAssembleIssueJobCreateInputWithBoxQtyTypeAsync(
-        AssembleIssueRequests assembleRequest,
-        AssembleIssueRequestsDetail assembleRequestDetail, BalanceDTO balanceDtos)
+        AssembleIssueRequest assembleRequest,
+        AssembleIssueRequestDetail assembleRequestDetail, BalanceDTO balanceDtos)
     {
-        var job = ObjectMapper.Map<AssembleIssueRequests, AssembleIssueJobEditInput>(assembleRequest);
+        var job = ObjectMapper.Map<AssembleIssueRequest, AssembleIssueJobEditInput>(assembleRequest);
         job.JobType = EnumJobType.IssueJob;
         job.JobStatus = EnumJobStatus.Open;
         job.WorkGroupCode = assembleRequestDetail.ToLocationGroup;
         job.WarehouseCode = assembleRequestDetail.ToWarehouseCode;
         job.Worker = assembleRequest.Worker;
-        job.AssembleIssueRequestsNumber = assembleRequest.Number;
+        job.AssembleIssueRequestNumber = assembleRequest.Number;
 
         job.Details.Add(await BuildAssembleIssueJobDetailWithBoxQtyTypeAsync(assembleRequestDetail, balanceDtos)
             .ConfigureAwait(false));
@@ -445,7 +445,7 @@ public class AssembleIssueRequestsEventHandler
     /// <param name="toLocationGroupCode"></param>
     /// <returns></returns>
     private async Task<AssembleIssueJobDetailInput> BuildAssembleIssueJobDetailWithBoxQtyTypeAsync(
-        AssembleIssueRequestsDetail assembleRequestDetail, BalanceDTO balance)
+        AssembleIssueRequestDetail assembleRequestDetail, BalanceDTO balance)
     {
         var detail = new AssembleIssueJobDetailInput();
         detail.RequestLocationCode = assembleRequestDetail.ToLocationCode;

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/StoreEventAutoMapperProfile.cs

@@ -80,7 +80,7 @@ public partial class StoreEventAutoMapperProfile : Profile
         MaterialRequestAutoMapperProfile();
         InjectionIssueRequestAutoMapperProfile();
         KittingIssueRequestAutoMapperProfile();
-        AssembleIssueRequestsAutoMapperProfile();
+        AssembleIssueRequestAutoMapperProfile();
         ThirdLocationRequestAutoMapperProfile();
         ProductionReturnRequestAutoMapperProfile();
         ProductionReturnNoteAutoMapperProfile();