Merge branch 'dev_DY_CC' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2 into dev_DY_CC

1 year ago · 17de8ffa4d
62 changed files with 3464 additions and 0 deletions
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleJobs/AssembleJobPermissions.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleJobs/AssembleJobPermissions.cs
@ -0,0 +1,27 @@
+using Volo.Abp.Authorization.Permissions;
+using Win_in.Sfs.Wms.Store.Domain;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public static class AssembleJobPermissions
+{
+
+    public const string Default = StorePermissions.GroupName + "." + nameof(AssembleJob);
+    public const string Create = Default + "." + StorePermissions.CreateStr;
+    public const string Update = Default + "." + StorePermissions.UpdateStr;
+    public const string Delete = Default + "." + StorePermissions.DeleteStr;
+
+    //自动发料任务
+    public const string AutoAssembleJob = StorePermissions.GroupName + "." + nameof(AutoAssembleJob);
+
+    public static void AddAssembleJobPermission(this PermissionGroupDefinition permissionGroup)
+    {
+        var AssembleJobPermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(AssembleJob)));
+        AssembleJobPermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr));
+        AssembleJobPermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr));
+        AssembleJobPermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr));
+
+        permissionGroup.AddPermission(AutoAssembleJob, StorePermissionDefinitionProvider.L(nameof(AutoAssembleJob)));
+
+    }
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleJobs/DTOs/AssembleJobDTO.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleJobs/DTOs/AssembleJobDTO.cs
@ -0,0 +1,46 @@
+using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Shared.Domain;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+/// <summary>
+/// 装配发料任务
+/// </summary>
+[Display(Name = "装配发料任务")]
+public class AssembleJobDTO : SfsJobDTOBase<AssembleJobDetailDTO>
+{
+    /// <summary>
+    /// 叫料请求类型
+    /// </summary>
+    [Display(Name = "叫料请求类型")]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string RequestType { get; set; }
+
+    /// <summary>
+    /// 生产线
+    /// </summary>
+    [Display(Name = "生产线")]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string ProdLine { get; set; }
+
+    /// <summary>
+    /// 要货单号
+    /// </summary>
+    [Display(Name = "要货单号")]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string AssembleRequestNumber { get; set; }
+
+    /// <summary>
+    /// 车间
+    /// </summary>
+    [Display(Name = "车间")]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string Workshop { get; set; }
+
+    /// <summary>
+    /// 使用在途库
+    /// </summary>
+    [Display(Name = "使用在途库")]
+    public bool UseOnTheWayLocation { get; set; }
+
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleJobs/DTOs/AssembleJobDetailDTO.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleJobs/DTOs/AssembleJobDetailDTO.cs
@ -0,0 +1,112 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public class AssembleJobDetailDTO : SfsJobRecommendFromDetailDTOBase, IHasToLocation
+{
+
+    /// <summary>
+    /// 请求库位
+    /// </summary>
+    [Display(Name = "请求库位")]
+    public string RequestLocationCode { get; set; }
+
+    /// <summary>
+    /// 到库位
+    /// </summary>
+    [Display(Name = "到库位")]
+    public string ToLocationCode { get; set; }
+
+    /// <summary>
+    /// 到库区
+    /// </summary>
+    [Display(Name = "到库区")]
+    public string ToLocationArea { get; set; }
+
+    /// <summary>
+    /// 到库位组
+    /// </summary>
+    [Display(Name = "到库位组")]
+    public string ToLocationGroup { get; set; }
+
+    /// <summary>
+    /// 到ERP库位
+    /// </summary>
+    [Display(Name = "到ERP库位")]
+    public string ToLocationErpCode { get; set; }
+
+    /// <summary>
+    /// 到仓库
+    /// </summary>
+    [Display(Name = "到仓库")]
+    public string ToWarehouseCode { get; set; }
+
+    /// <summary>
+    /// 在途库库位
+    /// </summary>
+    [Display(Name = "在途库库位")]
+    public string OnTheWayLocationCode { get; set; }
+
+    /// <summary>
+    /// 生产线
+    /// </summary>
+    [Display(Name = "生产线")]
+    public string ProdLine { get; set; }
+
+    /// <summary>
+    /// 工作中心
+    /// </summary>
+    [Display(Name = "工作中心")]
+    public string WorkStation { get; set; }
+
+    /// <summary>
+    /// 过期时间
+    /// </summary>
+    [Display(Name = "过期时间")]
+    public DateTime ExpiredTime { get; set; }
+
+    /// <summary>
+    /// 工序
+    /// </summary>
+    [Display(Name = "工序")]
+    public string Operation { get; set; }
+
+    /// <summary>
+    /// 配送方式
+    /// </summary>
+    [Display(Name = "配送方式")]
+    public EnumDistributionType DistributionType { get; set; }
+
+    /// <summary>
+    /// 取整方式
+    /// </summary>
+    [Display(Name = "取整方式")]
+    public EnumTruncType TruncType { get; set; }
+
+    /// <summary>
+    /// 取整后数量
+    /// </summary>
+    [Display(Name = "取整后数量")]
+    public decimal RoundedQty { get; set; }
+
+    /// <summary>
+    /// 计划拆分规则
+    /// </summary>
+    [Display(Name = "计划拆分规则")]
+    public EnumPlannedSplitRule PlannedSplitRule { get; set; }
+
+    /// <summary>
+    /// 计划开始时间
+    /// </summary>
+    [Display(Name = "计划开始时间")]
+    public DateTime PlanBeginTime { get; set; }
+
+    /// <summary>
+    /// 每次配送数量
+    /// </summary>
+    [Display(Name = "每次配送数量")]
+    public decimal DeliveryQty { get; set; }
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleJobs/IAssembleJobAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleJobs/IAssembleJobAppService.cs
@ -0,0 +1,26 @@
+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 IAssembleJobAppService
+    : ISfsJobAppServiceBase<AssembleJobDTO, SfsJobRequestInputBase, AssembleJobCheckInput, AssembleJobEditInput>
+{
+    Task<List<AssembleJobDTO>> CheckJobExistByItemCodeAndLocationCode(string itemCode, string locationCode);
+
+    Task CancelByMaterialRequestAsync(string assembleNumber);
+
+    Task<PagedResultDto<AssembleJobDTO>> GetListByTypeAsync(SfsJobRequestInputBase requestInput, string requestType,
+        bool includeDetails = false, CancellationToken cancellationToken = default);
+
+    Task<List<AssembleJobDTO>> GetByRequestNumberAsync(string requestNumber);
+
+    /// <summary>
+    /// 保存拆箱时涉及的明细修改
+    /// </summary>
+    /// <returns></returns>
+    Task<AssembleJobDTO> SaveDetail_SplitPackingAsync(SplitPacking_UpdateJobDetailInput input);
+
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleJobs/Inputs/AssembleJobCheckInput.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleJobs/Inputs/AssembleJobCheckInput.cs
@ -0,0 +1,6 @@
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public class AssembleJobCheckInput : SfsJobCheckInputBase
+{
+
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleJobs/Inputs/AssembleJobDetailInput.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleJobs/Inputs/AssembleJobDetailInput.cs
@ -0,0 +1,134 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public class AssembleJobDetailInput : SfsJobRecommendFromDetailInputBase, IHasToLocation
+{
+
+    /// <summary>
+    /// 请求库位
+    /// </summary>
+    [Display(Name = "请求库位")]
+    [Required(ErrorMessage = "{0}是必填项")]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string RequestLocationCode { get; set; }
+
+    /// <summary>
+    /// 到库位
+    /// </summary>
+    [Display(Name = "到库位")]
+    [Required(ErrorMessage = "{0}是必填项")]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string ToLocationCode { get; set; }
+
+    /// <summary>
+    /// 到库区
+    /// </summary>
+    [Display(Name = "到库区")]
+    public string ToLocationArea { get; set; }
+
+    /// <summary>
+    /// 到库位组
+    /// </summary>
+    [Display(Name = "到库位组")]
+    public string ToLocationGroup { get; set; }
+
+    /// <summary>
+    /// 到ERP库位
+    /// </summary>
+    [Display(Name = "到ERP库位")]
+    [Required(ErrorMessage = "{0}是必填项")]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string ToLocationErpCode { get; set; }
+
+    /// <summary>
+    /// 到仓库
+    /// </summary>
+    [Display(Name = "到仓库")]
+    [Required(ErrorMessage = "{0}是必填项")]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string ToWarehouseCode { get; set; }
+
+    /// <summary>
+    /// 在途库库位
+    /// </summary>
+    [Display(Name = "在途库库位")]
+    public string OnTheWayLocationCode { get; set; }
+
+    /// <summary>
+    /// 生产线
+    /// </summary>
+    [Display(Name = "生产线")]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string ProdLine { get; set; }
+
+    /// <summary>
+    /// 工作中心
+    /// </summary>
+    [Display(Name = "工作中心")]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string WorkStation { get; set; }
+
+    /// <summary>
+    /// 过期时间
+    /// </summary>
+    [Display(Name = "过期时间")]
+    [Required(ErrorMessage = "{0}是必填项")]
+    public DateTime ExpiredTime { get; set; }
+
+    /// <summary>
+    /// 工序
+    /// </summary>
+    [Display(Name = "工序")]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string Operation { get; set; }
+
+    /// <summary>
+    /// 配送方式
+    /// </summary>
+    [Display(Name = "配送方式")]
+    public EnumDistributionType DistributionType { get; set; }
+
+    /// <summary>
+    /// 取整方式
+    /// </summary>
+    [Display(Name = "取整方式")]
+    public EnumTruncType TruncType { get; set; }
+
+    /// <summary>
+    /// 取整后数量
+    /// </summary>
+    [Display(Name = "取整后数量")]
+    public decimal RoundedQty { get; set; }
+
+    /// <summary>
+    /// 计划拆分规则
+    /// </summary>
+    [Display(Name = "计划拆分规则")]
+    public EnumPlannedSplitRule PlannedSplitRule { get; set; }
+
+    /// <summary>
+    /// 计划开始时间
+    /// </summary>
+    [Display(Name = "计划开始时间")]
+    public DateTime PlanBeginTime { get; set; }
+
+    /// <summary>
+    /// 每次配送数量
+    /// </summary>
+    [Display(Name = "每次配送数量")]
+    public decimal DeliveryQty { get; set; }
+
+    /// <summary>
+    /// 位置码
+    /// </summary>
+    public string PositionCode { get; set; }
+
+    /// <summary>
+    /// 推荐类型
+    /// </summary>
+    public EnumRecommendType RecommendType { get; set; }
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleJobs/Inputs/AssembleJobEditInput.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleJobs/Inputs/AssembleJobEditInput.cs
@ -0,0 +1,82 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public class AssembleJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobCreateInput<AssembleJobDetailInput>
+{
+    #region Create
+    /// <summary>
+    /// 上游任务编号
+    /// </summary>
+    [Display(Name = "上游任务编号")]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string UpStreamJobNumber { get; set; }
+
+    /// <summary>
+    /// 要货单号
+    /// </summary>
+    [Display(Name = "要货单号")]
+    [Required(ErrorMessage = "{0}是必填项")]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string AssembleRequestNumber { get; set; }
+
+    /// <summary>
+    /// 叫料请求类型
+    /// </summary>
+    [Display(Name = "叫料请求类型")]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string RequestType { get; set; }
+
+    /// <summary>
+    /// 任务类型
+    /// </summary>
+    [Display(Name = "任务类型")]
+    [Required(ErrorMessage = "{0}是必填项")]
+    public EnumJobType JobType { get; set; }
+
+    /// <summary>
+    /// 是否自动完成
+    /// </summary>
+    [Display(Name = "是否自动完成")]
+    [Required(ErrorMessage = "{0}是必填项")]
+    public bool IsAutoComplete { get; set; }
+
+    /// <summary>
+    /// 过期时间
+    /// </summary>
+    [Display(Name = "过期时间")]
+    [Required(ErrorMessage = "{0}是必填项")]
+    public DateTime ExpiredTime { get; set; }
+
+    /// <summary>
+    /// 任务明细
+    /// </summary>
+    [Display(Name = "任务明细")]
+    [Required(ErrorMessage = "{0}是必填项")]
+    public List<AssembleJobDetailInput> Details { get; set; } = new();
+
+    /// <summary>
+    /// 车间
+    /// </summary>
+    [Display(Name = "车间")]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string Workshop { get; set; }
+
+    /// <summary>
+    /// 生产线
+    /// </summary>
+    [Display(Name = "生产线")]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string ProdLine { get; set; }
+
+    /// <summary>
+    /// 使用在途库
+    /// </summary>
+    [Display(Name = "使用在途库")]
+    public bool UseOnTheWayLocation { get; set; }
+    #endregion
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleNotes/AssembleNotePermissions.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleNotes/AssembleNotePermissions.cs
@ -0,0 +1,30 @@
+using Volo.Abp.Authorization.Permissions;
+using Win_in.Sfs.Wms.Store.Domain;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public static class AssembleNotePermissions
+{
+
+    public const string Default = StorePermissions.GroupName + "." + nameof(AssembleNote);
+    public const string Create = Default + "." + StorePermissions.CreateStr;
+    public const string Update = Default + "." + StorePermissions.UpdateStr;
+    public const string Delete = Default + "." + StorePermissions.DeleteStr;
+
+    //自动发料记录
+    public const string AutoAssembleNote = StorePermissions.GroupName + "." + nameof(AutoAssembleNote);
+
+    //直接发料
+    public const string DirectAssembleNote = StorePermissions.GroupName + "." + nameof(DirectAssembleNote);
+
+    public static void AddAssembleNotePermission(this PermissionGroupDefinition permissionGroup)
+    {
+        var AssembleNotePermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(AssembleNote)));
+        AssembleNotePermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr));
+        AssembleNotePermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr));
+        AssembleNotePermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr));
+
+        permissionGroup.AddPermission(AutoAssembleNote, StorePermissionDefinitionProvider.L(nameof(AutoAssembleNote)));
+        permissionGroup.AddPermission(DirectAssembleNote, StorePermissionDefinitionProvider.L(nameof(DirectAssembleNote)));
+    }
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleNotes/DTOs/AssembleNoteDTO.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleNotes/DTOs/AssembleNoteDTO.cs
@ -0,0 +1,54 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Shared.Domain;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public class AssembleNoteDTO : SfsStoreDTOBase<AssembleNoteDetailDTO>, IHasJobNumber, IHasRequestNumber
+{
+
+    /// <summary>
+    /// 任务ID
+    /// </summary>
+    [Display(Name = "任务ID")]
+    public string JobNumber { get; set; }
+
+    /// <summary>
+    /// 车间
+    /// </summary>
+    [Display(Name = "车间")]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string Workshop { get; set; }
+
+    /// <summary>
+    /// 请求代码
+    /// </summary>
+    [Display(Name = "请求代码")]
+    public string RequestNumber { get; set; }
+
+    /// <summary>
+    /// 叫料请求类型
+    /// </summary>
+    [Display(Name = "叫料请求类型")]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string RequestType { get; set; }
+
+    /// <summary>
+    /// 使用在途库
+    /// </summary>
+    [Display(Name = "使用在途库")]
+    public bool UseOnTheWayLocation { get; set; }
+
+    /// <summary>
+    /// 已确认
+    /// </summary>
+    [Display(Name = "已确认")]
+    public bool Confirmed { get; set; }
+
+    /// <summary>
+    /// 确认时间
+    /// </summary>
+    [Display(Name = "确认时间")]
+    public DateTime? ConfirmTime { get; set; }
+
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleNotes/DTOs/AssembleNoteDetailDTO.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleNotes/DTOs/AssembleNoteDetailDTO.cs
@ -0,0 +1,42 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Shared.Domain;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public class AssembleNoteDetailDTO : SfsStoreRecommendFromDetailWithFromToDTOBase
+{
+
+    /// <summary>
+    /// 发料时间
+    /// </summary>
+    [Display(Name = "发料时间")]
+    public DateTime IssueTime { get; set; }
+
+    /// <summary>
+    /// 过期时间
+    /// </summary>
+    [Display(Name = "过期时间")]
+    public DateTime ExpiredTime { get; set; }
+
+    /// <summary>
+    /// 生产线
+    /// </summary>
+    [Display(Name = "生产线")]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string ProdLine { get; set; }
+
+    /// <summary>
+    /// 工作中心
+    /// </summary>
+    [Display(Name = "工作中心")]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string WorkStation { get; set; }
+
+    /// <summary>
+    /// 在途库库位
+    /// </summary>
+    [Display(Name = "在途库库位")]
+    public string OnTheWayLocationCode { get; set; }
+
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleNotes/IAssembleNoteAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleNotes/IAssembleNoteAppService.cs
@ -0,0 +1,21 @@
+using System;
+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 IAssembleNoteAppService : ISfsStoreMasterReadOnlyAppServiceBase<AssembleNoteDTO, SfsStoreRequestInputBase, AssembleNoteDetailDTO, SfsStoreRequestInputBase>
+{
+    Task<AssembleNoteDTO> CreateAsync(AssembleNoteEditInput input);
+
+    Task<AssembleNoteDTO> ConfirmAsync(Guid id);
+
+    Task<AssembleNoteDTO> ConfirmAsync(string number);
+
+    Task<PagedResultDto<AssembleNoteDTO>> GetListByTypeAsync(SfsStoreRequestInputBase requestInput,
+        string requestType, bool includeDetails = false, CancellationToken cancellationToken = default);
+
+    Task<List<AssembleNoteDTO>> GetListUnConfirmedByTypeAsync(string requestType);
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleNotes/Inputs/AssembleNoteDetailInput.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleNotes/Inputs/AssembleNoteDetailInput.cs
@ -0,0 +1,53 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public class AssembleNoteDetailInput : SfsStoreRecommendFromDetailWithFromToInputBase
+{
+
+    /// <summary>
+    /// 发料时间
+    /// </summary>
+    [Display(Name = "发料时间")]
+    public DateTime IssueTime { get; set; }
+
+    /// <summary>
+    /// 过期时间
+    /// </summary>
+    [Display(Name = "过期时间")]
+    public DateTime ExpiredTime { get; set; }
+
+    /// <summary>
+    /// 生产线
+    /// </summary>
+    [Display(Name = "生产线")]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string ProdLine { get; set; }
+
+    /// <summary>
+    /// 工作中心
+    /// </summary>
+    [Display(Name = "工作中心")]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string WorkStation { get; set; }
+
+    /// <summary>
+    /// 在途库库位
+    /// </summary>
+    [Display(Name = "在途库库位")]
+    public string OnTheWayLocationCode { get; set; }
+
+    /// <summary>
+    /// 位置码
+    /// </summary>
+    public string PositionCode { get; set; }
+
+    /// <summary>
+    /// 推荐类型
+    /// </summary>
+    public EnumRecommendType RecommendType { get; set; }
+
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleNotes/Inputs/AssembleNoteEditInput.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleNotes/Inputs/AssembleNoteEditInput.cs
@ -0,0 +1,63 @@
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Shared.Domain;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public class AssembleNoteEditInput : SfsStoreCreateOrUpdateInputBase
+{
+    #region Base
+    /// <summary>
+    /// 已确认
+    /// </summary>
+    [Display(Name = "已确认")]
+    public bool Confirmed { get; set; }
+    #endregion
+
+    #region Create
+    /// <summary>
+    /// 发料记录号
+    /// </summary>
+    [Display(Name = "发料记录号")]
+    public string Number { get; set; }
+
+    /// <summary>
+    /// 任务ID
+    /// </summary>
+    [Display(Name = "任务ID")]
+    [Required(ErrorMessage = "{0}是必填项")]
+    public string JobNumber { get; set; }
+
+    /// <summary>
+    /// 车间
+    /// </summary>
+    [Display(Name = "车间")]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string Workshop { get; set; }
+
+    /// <summary>
+    /// 明细列表
+    /// </summary>
+    [Display(Name = "明细列表")]
+    public List<AssembleNoteDetailInput> Details { get; set; }
+
+    /// <summary>
+    /// 请求号码
+    /// </summary>
+    [Display(Name = "请求号码")]
+    public string RequestNumber { get; set; }
+
+    /// <summary>
+    /// 叫料请求类型
+    /// </summary>
+    [Display(Name = "叫料请求类型")]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string RequestType { get; set; }
+
+    /// <summary>
+    /// 使用在途库
+    /// </summary>
+    [Display(Name = "使用在途库")]
+    public bool UseOnTheWayLocation { get; set; }
+    #endregion
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleNotes/Inputs/AssembleNoteImportInput.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleNotes/Inputs/AssembleNoteImportInput.cs
@ -0,0 +1,33 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public class AssembleNoteImportInput : SfsStoreImportInputBase, IHasJobNumber, IHasRequestNumber
+{
+    /// <summary>
+    /// 任务ID
+    /// </summary>
+    [Display(Name = "任务ID")]
+    public string JobNumber { get; set; }
+
+    /// <summary>
+    /// 车间
+    /// </summary>
+    [Display(Name = "车间")]
+    public string Workshop { get; set; }
+
+    public string RequestNumber { get; set; }
+
+    /// <summary>
+    /// 叫料请求类型
+    /// </summary>
+    [Display(Name = "叫料请求类型")]
+    public string RequestType { get; set; }
+
+    /// <summary>
+    /// 使用在途库
+    /// </summary>
+    [Display(Name = "使用在途库")]
+    [Required(ErrorMessage = "{0}是必填项")]
+    public bool UseOnTheWayLocation { get; set; }
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Permissions/StorePermissionDefinitionProvider.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Permissions/StorePermissionDefinitionProvider.cs
@ -27,9 +27,11 @@ public class StorePermissionDefinitionProvider : PermissionDefinitionProvider
        storeGroup.AddPutawayNotePermission();
        storeGroup.AddMaterialRequestPermission();
        storeGroup.AddInjectionRequestPermission();
+        storeGroup.AddAssembleRequestPermission();
        storeGroup.AddContainerRequestPermission();
        storeGroup.AddIssueNotePermission();
        storeGroup.AddInjectionNotePermission();
+        storeGroup.AddAssembleNotePermission();
        storeGroup.AddContainerNotePermission();
        storeGroup.AddUnplannedReceiptNotePermission();
        storeGroup.AddUnplannedIssueNotePermission();
@ -93,6 +95,7 @@ public class StorePermissionDefinitionProvider : PermissionDefinitionProvider
        storeGroup.AddPutawayJobPermission();
        storeGroup.AddIssueJobPermission();
        storeGroup.AddInjectionJobPermission();
+        storeGroup.AddAssembleJobPermission();
        storeGroup.AddContainerJobPermission();
        storeGroup.AddDeliverJobPermission();
        storeGroup.AddPurchaseReturnJobPermission();
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/AssembleRequestPermissions.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/AssembleRequestPermissions.cs
@ -0,0 +1,27 @@
+using Volo.Abp.Authorization.Permissions;
+using Win_in.Sfs.Wms.Store.Domain;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public static class AssembleRequestPermissions
+{
+
+    public const string Default = StorePermissions.GroupName + "." + nameof(AssembleRequest);
+    public const string Create = Default + "." + StorePermissions.CreateStr;
+    public const string Update = Default + "." + StorePermissions.UpdateStr;
+    public const string Delete = Default + "." + StorePermissions.DeleteStr;
+
+    //自动叫料申请
+    public const string AutoAssembleRequest = StorePermissions.GroupName + "." + nameof(AutoAssembleRequest);
+
+    public static void AddAssembleRequestPermission(this PermissionGroupDefinition permissionGroup)
+    {
+        var AssembleRequestPermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(AssembleRequest)));
+        AssembleRequestPermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr));
+        AssembleRequestPermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr));
+        AssembleRequestPermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr));
+
+        permissionGroup.AddPermission(AutoAssembleRequest, StorePermissionDefinitionProvider.L(nameof(AutoAssembleRequest)));
+
+    }
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/DTOs/AssembleRequestDTO.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/DTOs/AssembleRequestDTO.cs
@ -0,0 +1,40 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public class AssembleRequestDTO : SfsStoreRequestDTOBase<AssembleRequestDetailDTO>, IHasNumber
+{
+    /// <summary>
+    ///     叫料类型
+    /// </summary>
+    [Display(Name = "叫料类型")]
+    public string Type { get; set; }
+
+    /// <summary>
+    ///     生产线
+    /// </summary>
+    [Display(Name = "生产线")]
+    public string ProdLine { get; set; }
+
+    /// <summary>
+    ///     是否使用在途库
+    /// </summary>
+    [Display(Name = "是否使用在途库")]
+    public bool IsUseOnTheWayLocation { get; set; }
+
+    /// <summary>
+    ///     可用来源库位Json集合
+    /// </summary>
+    public string FromLocationCodeJsonList { get; set; }
+
+    /// <summary>
+    ///     叫料库位
+    /// </summary>
+    public string ToLocationCode { get; set; }
+
+    /// <summary>
+    ///     目标ERP储位
+    /// </summary>
+    [Display(Name = "目标ERP储位")]
+    public string ToLocationErpCode { get; set; }
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/DTOs/AssembleRequestDetailDTO.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/DTOs/AssembleRequestDetailDTO.cs
@ -0,0 +1,50 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public class AssembleRequestDetailDTO : SfsStoreDetailWithQtyDTOBase
+{
+    /// <summary>
+    /// 已发数量
+    /// </summary>
+    [Display(Name = "已发数量")]
+    public decimal IssuedQty { get; set; }
+
+    /// <summary>
+    /// 已收数量
+    /// </summary>
+    [Display(Name = "已收数量")]
+    public decimal ReceivedQty { get; set; }
+
+    /// <summary>
+    /// 明细状态
+    /// </summary>
+    [Display(Name = "明细状态")]
+    public EnumStatus Status { get; set; }
+
+    /// <summary>
+    /// 请求未发
+    /// </summary>
+    [Display(Name = "请求未发")]
+    [NotMapped]
+    public decimal ToBeIssuedQty => Qty - IssuedQty;
+
+    /// <summary>
+    /// 已发未收
+    /// </summary>
+    [Display(Name = "已发未收")]
+    [NotMapped]
+    public decimal ToBeReceivedQty => IssuedQty - ReceivedQty;
+
+    /// <summary>
+    /// 请求未收
+    /// </summary>
+    [Display(Name = "请求未收")]
+    [NotMapped]
+    public decimal NotFinishQty => Qty - ReceivedQty;
+
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/IAssembleRequestAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/IAssembleRequestAppService.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 IAssembleRequestAppService
+    : ISfsStoreRequestMasterAppServiceBase<AssembleRequestDTO, SfsStoreRequestInputBase, AssembleRequestEditInput, AssembleRequestDetailDTO, SfsStoreRequestInputBase>
+
+{
+    
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/Inputs/AssembleRequestDetailInput.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/Inputs/AssembleRequestDetailInput.cs
@ -0,0 +1,85 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public class AssembleRequestDetailInput : SfsStoreDetailWithQtyInputBase
+{
+    /// <summary>
+    /// 目标库位
+    /// </summary>
+    [Display(Name = "目标库位")]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string ToLocationCode { get; set; }
+
+    /// <summary>
+    /// 来源库区
+    /// </summary>
+    [Display(Name = "来源库区")]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string FromLocationArea { get; set; }
+
+    /// <summary>
+    /// 生产线
+    /// </summary>
+    [Display(Name = "生产线")]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string ProdLine { get; set; }
+
+    /// <summary>
+    /// 工作中心
+    /// </summary>
+    [Display(Name = "工作中心")]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string WorkStation { get; set; }
+
+    /// <summary>
+    /// 过期时间
+    /// </summary>
+    [Display(Name = "过期时间")]
+    public DateTime ExpiredTime { get; set; }
+
+    /// <summary>
+    /// 状态
+    /// </summary>
+    [Display(Name = "状态")]
+    public EnumRequestStatus RequestStatus { get; set; } = EnumRequestStatus.New;
+
+    /// <summary>
+    /// ERP储位
+    /// </summary>
+    [Display(Name = "ERP储位")]
+    public string ToLocationErpCode { get; set; }
+
+    /// <summary>
+    /// 已发数量
+    /// </summary>
+    [Display(Name = "已发数量")]
+    public decimal IssuedQty { get; set; }
+
+    /// <summary>
+    /// 已收数量
+    /// </summary>
+    [Display(Name = "已收数量")]
+    public decimal ReceivedQty { get; set; }
+
+    /// <summary>
+    /// 明细状态
+    /// </summary>
+    [Display(Name = "明细状态")]
+    public EnumStatus Status { get; set; }
+
+    /// <summary>
+    /// 位置码
+    /// </summary>
+    public string PositionCode { get; set; }
+
+    /// <summary>
+    /// 推荐类型
+    /// </summary>
+    public EnumRecommendType RecommendType { get; set; }
+
+
+}
--- 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
@ -0,0 +1,58 @@
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Shared.Domain;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public class AssembleRequestEditInput : SfsStoreRequestCreateOrUpdateInputBase
+{
+    #region Base
+    /// <summary>
+    /// 车间
+    /// </summary>
+    [Display(Name = "车间")]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string Workshop { get; set; }
+
+    /// <summary>
+    /// 生产线
+    /// </summary>
+    [Display(Name = "生产线")]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string ProdLine { get; set; }
+
+    /// <summary>
+    /// 使用在途库
+    /// </summary>
+    [Display(Name = "使用在途库")]
+    public bool UseOnTheWayLocation { get; set; }
+    #endregion
+
+    #region Create
+    /// <summary>
+    /// 要货单号
+    /// </summary>
+    [Display(Name = "要货单号")]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string Number { get; set; }
+
+    /// <summary>
+    /// 叫料类型
+    /// </summary>
+    [Display(Name = "叫料类型")]
+    public string Type { get; set; }
+
+    /// <summary>
+    /// 备料计划单号
+    /// </summary>
+    [Display(Name = "备料计划单号")]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string PreparationPlanNumber { get; set; }
+
+    /// <summary>
+    /// 明细列表
+    /// </summary>
+    [Display(Name = "明细列表")]
+    public List<AssembleRequestDetailInput> Details { get; set; } = new List<AssembleRequestDetailInput>();
+    #endregion
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/Inputs/AssembleRequestImportInput.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/Inputs/AssembleRequestImportInput.cs
@ -0,0 +1,53 @@
+using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Shared.Application.Contracts;
+using Win_in.Sfs.Shared.Domain.Shared;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+[Display(Name = "叫料申请")]
+public class AssembleRequestImportInput : SfsStoreImportInputBase
+{
+    /// <summary>
+    /// 叫料类型
+    /// </summary>
+    [Display(Name = "叫料类型")]
+    [Required(ErrorMessage = "{0}是必填项")]
+    [ImporterHeader(Name = "叫料类型")]
+    [ExporterHeader(DisplayName = "叫料类型")]
+    [ValueMapping("人工拉动", EnumMaterialRequestType.Issue_Manual)]
+    public string Type { get; set; }
+
+    /// <summary>
+    /// 物品代码
+    /// </summary>
+    [Display(Name = "物品代码")]
+    [Required]
+    public string ItemCode { get; set; }
+
+    /// <summary>
+    /// 目标库位
+    /// </summary>
+    [Display(Name = "目标库位")]
+    [Required]
+    public string ToLocationCode { get; set; }
+
+    /// <summary>
+    /// 来源库区
+    /// </summary>
+    [Display(Name = "调出库区")]
+    [Required]
+    public string FromLocationArea { get; set; }
+
+    /// <summary>
+    /// 数量
+    /// </summary>
+    [Display(Name = "数量")]
+    [Required(ErrorMessage = "{0}是必填项")]
+    public decimal Qty { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    [Display(Name = "备注")]
+    public string Remark { get; set; }
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleJobs/AssembleJobAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleJobs/AssembleJobAppService.cs
@ -0,0 +1,144 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Volo.Abp;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.ObjectMapping;
+using Win_in.Sfs.Basedata.Domain.Shared;
+using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared;
+using Win_in.Sfs.Wms.Store.Application.Contracts;
+using Win_in.Sfs.Wms.Store.Domain;
+using Win_in.Sfs.Wms.Store.Domain.Shared;
+
+namespace Win_in.Sfs.Wms.Store.Application;
+
+[Authorize]
+[Route($"{StoreConsts.RootPath}assemble-job")]
+public class AssembleJobAppService
+    : SfsJobAppServiceBase<AssembleJob, AssembleJobDetail, AssembleJobDTO, SfsJobRequestInputBase, AssembleJobCheckInput, AssembleJobEditInput>,
+    IAssembleJobAppService
+{
+    private readonly IAssembleJobManager _assembleJobManager;
+
+    public AssembleJobAppService(
+        IAssembleJobRepository repository, IAssembleJobManager assembleJobManager
+        ) : base(repository, assembleJobManager)
+    {
+        _assembleJobManager = assembleJobManager;
+    }
+
+    /// <summary>
+    /// 根据物品和库位 检查是否存在发料任务
+    /// </summary>
+    /// <param name="itemCode"></param>
+    /// <param name="locationCode"></param>
+    /// <returns></returns>
+    /// <exception cref="NotImplementedException"></exception>
+    [Authorize]
+    [HttpGet("check-job-exist")]
+    public virtual async Task<List<AssembleJobDTO>> CheckJobExistByItemCodeAndLocationCode(string itemCode,
+        string locationCode)
+    {
+        var entities = await _repository.GetListAsync(c =>
+            c.Details.Any(p =>
+                (p.ItemCode == itemCode && p.RecommendFromLocationCode == locationCode) ||
+                (p.ItemCode == itemCode && p.ToLocationCode == locationCode))
+            && (c.JobStatus == EnumJobStatus.Open || c.JobStatus == EnumJobStatus.Doing), true).ConfigureAwait(false);
+        var dtos = ObjectMapper.Map<List<AssembleJob>, List<AssembleJobDTO>>(entities);
+        return dtos;
+    }
+
+    [HttpPost("cancel-by-request/{assembleNumber}")]
+    public virtual async Task CancelByMaterialRequestAsync(string assembleNumber)
+    {
+        var entities = await _repository.GetListAsync(p => p.AssembleRequestNumber == assembleNumber).ConfigureAwait(false);
+        foreach (var entity in entities)
+        {
+            await _assembleJobManager.CancelAsync(entity).ConfigureAwait(false);
+        }
+    }
+   
+    [HttpPost("invalid")]
+    public override async Task CancelAsync(Guid id)
+    {
+        var assembleJob = await _repository.GetAsync(id).ConfigureAwait(false);
+        if (assembleJob == null)
+        {
+            throw new UserFriendlyException($"未找到ID为 {id} 的任务");
+        }      
+
+        await _assembleJobManager.CancelAsync(assembleJob).ConfigureAwait(false);
+
+    }
+
+    /// <summary>
+    /// 根据叫料请求类型获取发料任务
+    /// </summary>
+    /// <param name="requestInput"></param>
+    /// <param name="requestType">
+    ///     叫料请求类型:
+    ///     人工拉动:Issue_Manual;
+    ///     线边拉动:Issue_WIP;
+    /// </param>
+    /// <param name="includeDetails"></param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    [HttpPost("by-type/{requestType}")]
+    public virtual async Task<PagedResultDto<AssembleJobDTO>> GetListByTypeAsync(SfsJobRequestInputBase requestInput,
+        string requestType, bool includeDetails = false, CancellationToken cancellationToken = default)
+    {
+        Expression<Func<AssembleJob, bool>> expression = p => p.RequestType == requestType;
+        if (requestInput.Condition.Filters?.Count > 0)
+        {
+            expression = expression.And(requestInput.Condition.Filters.ToLambda<AssembleJob>());
+        }
+
+        return await GetPagedListAsync(expression, requestInput.SkipCount, requestInput.MaxResultCount,
+            requestInput.Sorting, includeDetails, cancellationToken).ConfigureAwait(false);
+
+    }
+
+    [HttpPost("by-request-number/{requestNumber}")]
+    public virtual async Task<List<AssembleJobDTO>> GetByRequestNumberAsync(string requestNumber)
+    {
+        var entitys = await _repository.GetListAsync(p => p.AssembleRequestNumber == requestNumber).ConfigureAwait(false);
+        return ObjectMapper.Map<List<AssembleJob>, List<AssembleJobDTO>>(entitys);
+    }
+
+    /// <summary>
+    /// 保存拆箱时涉及的明细修改
+    /// </summary>
+    /// <returns></returns>
+    [HttpPost("save-detail-split-packing")]
+    public virtual async Task<AssembleJobDTO> SaveDetail_SplitPackingAsync(SplitPacking_UpdateJobDetailInput input)
+    {
+        var job = await _repository.FindAsync(p => p.Number == input.Number).ConfigureAwait(false);
+        AssembleJobDetail detail = job.Details.FirstOrDefault(p => p.RecommendPackingCode == input.FromPackingCode ); /*&& p.HandledQty == input.FromQty*/
+        if (detail == null)
+        {
+            //throw new UserFriendlyException($"根据HandledPackingCode={input.FromPackingCode}取AssembleJobDetail表为空！");
+            throw new UserFriendlyException($"根据RecommendPackingCode={input.FromPackingCode}取AssembleJobDetail表为空！");
+        }
+        //插入目标箱
+        var newDetail = CommonHelper.CloneObj(detail);
+        newDetail.SetId(GuidGenerator.Create());
+        newDetail.RecommendPackingCode = input.ToPackingCode;
+        newDetail.RecommendQty = input.ToQty;
+        newDetail.HandledPackingCode = detail.HandledPackingCode.HasValue() ? input.ToPackingCode : null; //源实际实际箱码有值，则新记录实际箱码有值
+        newDetail.HandledQty = detail.HandledQty > 0 ? input.ToQty : 0;
+        //newDetail.CreationTime = CommonHelper.CurTime;
+        job.Details.Add(newDetail);
+        //修改源箱
+        detail.RecommendQty = input.FromQty - input.ToQty;
+        detail.HandledQty = detail.HandledQty > 0 ? input.FromQty - input.ToQty : 0;
+        var entity = await _repository.UpdateAsync(job).ConfigureAwait(false);
+        var ret = ObjectMapper.Map<AssembleJob, AssembleJobDTO>(entity);
+        return ret;
+    }
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleJobs/AssembleJobAutoMapperProfile.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleJobs/AssembleJobAutoMapperProfile.cs
@ -0,0 +1,29 @@
+using AutoMapper;
+using Volo.Abp.AutoMapper;
+using Win_in.Sfs.Wms.Store.Application.Contracts;
+using Win_in.Sfs.Wms.Store.Domain;
+
+namespace Win_in.Sfs.Wms.Store.Application;
+
+public partial class StoreApplicationAutoMapperProfile : Profile
+{
+    private void AssembleJobAutoMapperProfile()
+    {
+        CreateMap<AssembleJob, AssembleJobDTO>()
+             .ReverseMap();        
+
+        CreateMap<AssembleJobDetail, AssembleJobDetailDTO>()
+            ;
+
+        CreateMap<AssembleJobDetailDTO, AssembleJobDetail>()
+            ;
+
+        CreateMap<AssembleJobDetailInput, AssembleJobDetail>()
+            .IgnoreAuditedObjectProperties()
+            .Ignore(x => x.MasterID)
+            .Ignore(x => x.TenantId)
+            .Ignore(x => x.Number)
+            .Ignore(x => x.Id);
+
+    }
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/IssueNotes/AssembleNotes/AssembleNoteAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/IssueNotes/AssembleNotes/AssembleNoteAppService.cs
@ -0,0 +1,108 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Volo.Abp;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Domain.Entities;
+using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Event;
+using Win_in.Sfs.Wms.Store.Application.Contracts;
+using Win_in.Sfs.Wms.Store.Domain;
+using Win_in.Sfs.Wms.Store.Domain.Shared;
+
+namespace Win_in.Sfs.Wms.Store.Application;
+
+[Authorize]
+[Route($"{StoreConsts.RootPath}assemble-note")]
+public class AssembleNoteAppService :
+    SfsStoreWithDetailsAppServiceBase<AssembleNote, AssembleNoteDTO, SfsStoreRequestInputBase, AssembleNoteEditInput, AssembleNoteDetail,
+        AssembleNoteDetailDTO, SfsStoreRequestInputBase, AssembleNoteImportInput>,
+    IAssembleNoteAppService
+{
+    private readonly IAssembleNoteManager _assembleNoteManager;
+
+    public AssembleNoteAppService(
+        IAssembleNoteRepository repository,
+        IAssembleNoteManager assembleNoteManager
+    ) : base(repository)
+    {
+        _assembleNoteManager = assembleNoteManager;
+    }
+
+    [HttpPost("")]
+    //[Authorize(AssembleNotePermissions.Create)]
+    public override async Task<AssembleNoteDTO> CreateAsync(AssembleNoteEditInput input)
+    {
+        var entity = ObjectMapper.Map<AssembleNoteEditInput, AssembleNote>(input);
+        await _assembleNoteManager.CreateAsync(entity).ConfigureAwait(false);
+        var dto = ObjectMapper.Map<AssembleNote, AssembleNoteDTO>(entity);
+        return dto;
+    }
+
+    /// <summary>
+    /// 确认对应的记录单
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    [HttpPost("confirm/{id}")]
+    public virtual async Task<AssembleNoteDTO> ConfirmAsync(Guid id)
+    {
+        var assembleNote= await _repository.GetAsync(id).ConfigureAwait(false);
+        assembleNote.Confirmed = true;
+        assembleNote=await _repository.UpdateAsync(assembleNote).ConfigureAwait(false);
+        await LocalEventBus.PublishAsync(new SfsConfirmedEntityEventData<AssembleNote>(assembleNote), false).ConfigureAwait(false);
+        return ObjectMapper.Map<AssembleNote, AssembleNoteDTO>(assembleNote);
+    }
+
+    [HttpPost("confirm-by-number/{number}")]
+    public virtual async Task<AssembleNoteDTO> ConfirmAsync(string number)
+    {
+        var entity = await _repository.FindAsync(p => p.Number == number).ConfigureAwait(false);
+        Check.NotNull(entity, nameof(AssembleNote));
+        var result = await _assembleNoteManager.ConfirmAsync(entity.Id).ConfigureAwait(false);
+        var dto = ObjectMapper.Map<AssembleNote, AssembleNoteDTO>(result);
+        return dto;
+    }
+    /// <summary>
+    /// 根据叫料请求类型获取发料记录
+    /// </summary>
+    /// <param name="requestInput"></param>
+    /// <param name="requestType">
+    /// 叫料请求类型:
+    ///     人工拉动:Issue_Manual;
+    ///     线边拉动:Issue_WIP;
+    /// </param>
+    /// <param name="includeDetails"></param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    [HttpPost("by-type/{requestType}")]
+    public virtual async Task<PagedResultDto<AssembleNoteDTO>> GetListByTypeAsync(SfsStoreRequestInputBase requestInput,
+        string requestType, bool includeDetails = false, CancellationToken cancellationToken = default)
+    {
+        Expression<Func<AssembleNote, bool>> expression = p => p.RequestType == requestType;
+        if (requestInput.Condition.Filters?.Count > 0)
+        {
+            expression = expression.And(requestInput.Condition.Filters.ToLambda<AssembleNote>());
+        }
+
+        return await GetPagedListAsync(expression, requestInput.SkipCount, requestInput.MaxResultCount,
+            requestInput.Sorting, includeDetails, cancellationToken).ConfigureAwait(false);
+    }
+
+    [HttpGet("list/un-confirmed/{requestType}")]
+    public virtual async Task<List<AssembleNoteDTO>> GetListUnConfirmedByTypeAsync(string requestType)
+    {
+        var entities = await _repository.GetListAsync(c => !c.Confirmed && c.RequestType == requestType)
+            .ConfigureAwait(false);
+
+        var dtos = ObjectMapper.Map<List<AssembleNote>, List<AssembleNoteDTO>>(entities);
+
+        return dtos;
+    }
+   
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/IssueNotes/AssembleNotes/AssembleNoteAutoMapperProfile.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/IssueNotes/AssembleNotes/AssembleNoteAutoMapperProfile.cs
@ -0,0 +1,31 @@
+using AutoMapper;
+using Volo.Abp.AutoMapper;
+using Win_in.Sfs.Wms.Store.Application.Contracts;
+using Win_in.Sfs.Wms.Store.Domain;
+
+namespace Win_in.Sfs.Wms.Store.Application;
+
+public partial class StoreApplicationAutoMapperProfile : Profile
+{
+    private void AssembleNoteAutoMapperProfile()
+    {
+        CreateMap<AssembleNote, AssembleNoteDTO>()
+            .ReverseMap();
+
+        CreateMap<AssembleNoteDetail, AssembleNoteDetailDTO>();
+
+        CreateMap<AssembleNoteDetailInput, AssembleNoteDetail>()
+               .IgnoreAuditedObjectProperties()
+               .Ignore(x => x.MasterID)
+               .Ignore(x => x.TenantId)
+               .Ignore(x => x.Number)
+               .Ignore(x => x.Id);
+
+        CreateMap<AssembleNoteEditInput, AssembleNote>()
+            .IgnoreAuditedObjectProperties()
+            .Ignore(x => x.TenantId)
+            .Ignore(x => x.Number)
+            .Ignore(x => x.Id);
+        ;
+    }
+}
--- 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/AssembleRequests/AssembleRequestAppService.cs
@ -0,0 +1,302 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Threading;
+using System.Threading.Tasks;
+using DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main;
+using IdentityModel;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using Volo.Abp;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Domain.Entities;
+using Volo.Abp.Domain.Repositories;
+using Volo.Abp.ObjectMapping;
+using Win_in.Sfs.Basedata.Application.Contracts;
+using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared;
+using Win_in.Sfs.Shared.Event;
+using Win_in.Sfs.Wms.Store.Application.Contracts;
+using Win_in.Sfs.Wms.Store.Domain;
+using Win_in.Sfs.Wms.Store.Domain.Shared;
+
+namespace Win_in.Sfs.Wms.Store.Application;
+
+/// <summary>
+/// 装配叫料
+/// </summary>
+[Authorize]
+[Route($"{StoreConsts.RootPath}assemble-request")]
+public class AssembleRequestAppService : SfsStoreRequestAppServiceBase<AssembleRequest, AssembleRequestDTO,
+        SfsStoreRequestInputBase, AssembleRequestEditInput, AssembleRequestDetail, AssembleRequestDetailDTO,
+        SfsStoreRequestInputBase, AssembleRequestImportInput>,
+    IAssembleRequestAppService
+{
+    private readonly IAssembleRequestManager _assembleRequestManager;
+    private readonly IItemStoreRelationAppService _itemStoreRelationApp;
+    private readonly IAreaAppService _areaApp;
+    private readonly ILocationAppService _locationAppService;
+    private readonly IItemBasicAppService _itemBasicAppService;
+    private readonly IProductionLineAppService _productionLineAppService;
+    private readonly IInjectionJobAppService _issueJobAppService;
+    public AssembleRequestAppService(
+        IAssembleRequestRepository repository,
+        IAssembleRequestManager assembleRequestManager,
+        IPreparationPlanManager preparationPlanManager,
+        IItemStoreRelationAppService itemStoreRelationApp,
+        IAreaAppService areaApp,
+        ILocationAppService locationAppService,
+        IItemBasicAppService itemBasicAppService,
+        IProductionLineAppService productionLineAppService,
+        IInjectionJobAppService issueJobAppService)
+        : base(repository, assembleRequestManager)
+    {
+        _assembleRequestManager = assembleRequestManager;
+        _itemStoreRelationApp = itemStoreRelationApp;
+        _areaApp = areaApp;
+        _locationAppService = locationAppService;
+        _itemBasicAppService = itemBasicAppService;
+        _productionLineAppService = productionLineAppService;
+        _issueJobAppService = issueJobAppService;
+    }
+
+
+    #region 东阳V2
+
+    public override async Task<AssembleRequestDTO> HandleAsync(Guid id)
+    {
+        var entity = await _repository.GetAsync(id).ConfigureAwait(false);
+        await LocalEventBus.PublishAsync(new SfsHandledEntityEventData<AssembleRequest>(entity), false).ConfigureAwait(false);
+        return ObjectMapper.Map<AssembleRequest, AssembleRequestDTO>(entity);
+    }
+
+    [HttpPost("")]
+    //[Authorize(AssembleRequestPermissions.Create)]
+    public override async Task<AssembleRequestDTO> CreateAsync(AssembleRequestEditInput input)
+    {
+        foreach (var item in input.Details)
+        {
+            if (item.Qty <= 0)
+            {
+                throw new UserFriendlyException($"{item.ItemCode} 物料的需求量必须大于0");
+            }
+        }
+
+        foreach (var detailInput in input.Details) //赋值生产线
+        {
+            var toLocationDto = await _locationAppService.GetByCodeAsync(detailInput.ToLocationCode).ConfigureAwait(false);
+            CheckLocation(toLocationDto, detailInput.ToLocationCode);
+            var itemBasicDto = await _itemBasicAppService.GetByCodeAsync(detailInput.ItemCode).ConfigureAwait(false);
+            CheckItemBasic(itemBasicDto, detailInput.ItemCode);
+
+            detailInput.ProdLine = detailInput.ToLocationCode;
+            detailInput.ToLocationErpCode = toLocationDto.ErpLocationCode;
+        }
+
+        input.AutoSubmit = true;
+        input.AutoAgree = true;
+        input.AutoHandle = true;
+        input.AutoCompleteJob = false;
+        input.DirectCreateNote = false;
+
+        var entity = ObjectMapper.Map<AssembleRequestEditInput, AssembleRequest>(input);
+
+        var result = await _assembleRequestManager.CreateAsync(entity).ConfigureAwait(false);
+
+        var dto = ObjectMapper.Map<AssembleRequest, AssembleRequestDTO>(result);
+
+        return dto;
+    }
+
+    //[Authorize(AssembleRequestPermissions.Create)]
+    [HttpPost("create-and-handle")]
+    public async Task<AssembleRequestDTO> CreateAndHandleAsync(AssembleRequestEditInput input)
+    {
+        var assembleRequestDto = await CreateAsync(input).ConfigureAwait(false);
+
+        await HandleAsync(assembleRequestDto.Id).ConfigureAwait(false);
+
+        return assembleRequestDto;
+    }
+
+    #endregion
+
+    /// <summary>
+    /// 根据类型 获取叫料申请
+    /// </summary>
+    /// <param name="type"></param>
+    /// <returns></returns>
+    [HttpGet("list/by-type/{type}")]
+    public virtual async Task<List<AssembleRequestDTO>> GetListByTypeAsync(string type)
+    {
+        var entities = await _repository.GetListAsync(c => c.Type == type).ConfigureAwait(false);
+
+        var dtos = ObjectMapper.Map<List<AssembleRequest>, List<AssembleRequestDTO>>(entities);
+
+        return dtos;
+    }
+
+    #region 导入
+
+    /// <summary>
+    /// 用来重写 导入数据时可以加工数据
+    /// </summary>
+    /// <param name="dictionary"></param>
+    /// <returns></returns>
+    protected override async Task<Dictionary<AssembleRequest, EntityState>> ImportProcessingEntityAsync(
+        Dictionary<AssembleRequest, EntityState> dictionary)
+    {
+        var addList = dictionary.Where(p => p.Value == EntityState.Added).Select(p => p.Key);
+
+        foreach (var assembleRequest in addList)
+        {
+            assembleRequest.Worker = CurrentUser.GetUserName();
+            assembleRequest.CreatorId = CurrentUser.Id;
+            if (assembleRequest.Type == EnumTransSubType.Issue_Manual.GetDisplayName())
+            {
+                assembleRequest.Type = EnumTransSubType.Issue_Manual.ToString();
+            }
+
+            foreach (var detail in assembleRequest.Details)
+            {
+                var locationDto = await _locationAppService.GetByCodeAsync(detail.ToLocationCode).ConfigureAwait(false);
+                CheckLocation(locationDto, detail.ToLocationCode);
+
+                var itemBasicDto = await _itemBasicAppService.GetByCodeAsync(detail.ItemCode).ConfigureAwait(false);
+                CheckItemBasic(itemBasicDto, detail.ItemCode);
+
+                detail.ToLocationArea = locationDto.AreaCode;
+                detail.ToLocationErpCode = locationDto.ErpLocationCode;
+                detail.ToLocationGroup = locationDto.LocationGroupCode;
+                detail.ToWarehouseCode = locationDto.WarehouseCode;
+                detail.ItemDesc1 = itemBasicDto.Desc1;
+                detail.ItemDesc2 = itemBasicDto.Desc2;
+                detail.ItemName = itemBasicDto.Name;
+                detail.Uom = itemBasicDto.BasicUom;
+            }
+        }
+
+        return dictionary;
+    }
+
+    /// <summary>
+    /// 导入验证
+    /// </summary>
+    /// <param name="model"></param>
+    /// <param name="validationRresult"></param>
+    /// <returns></returns>
+    protected override async Task ValidateImportModelAsync(AssembleRequestImportInput model,
+        List<ValidationResult> validationRresult)
+    {
+        _ = new Dictionary<string, string>();
+        _ = await CheckItemBasicAsync(model, validationRresult).ConfigureAwait(false);
+        _ = await CheckLocationAsync(model, validationRresult).ConfigureAwait(false);
+        await CheckAreaAsync(model, validationRresult).ConfigureAwait(false);
+        await CheckStoreRelationAsync(model, validationRresult).ConfigureAwait(false);
+    }
+
+    #region 校验
+
+    protected override async Task<bool> ValidateImportEntities(Dictionary<AssembleRequest, EntityState> dict)
+    {
+        foreach (var entity in dict.Keys)
+        {
+            var tranType = await TransactionTypeAclService
+                .GetByTransTypeAsync(EnumTransType.Issue, EnumTransSubType.None).ConfigureAwait(false);
+
+            Check.NotNull(tranType, "事务类型", "事务类型不存在");
+
+            entity.AutoCompleteJob = tranType.AutoCompleteJob;
+            entity.AutoSubmit = tranType.AutoSubmitRequest;
+            entity.AutoAgree = tranType.AutoAgreeRequest;
+            entity.AutoHandle = tranType.AutoHandleRequest;
+            entity.DirectCreateNote = tranType.DirectCreateNote;
+        }
+
+        return await base.ValidateImportEntities(dict).ConfigureAwait(false);
+    }
+
+    protected async Task<ItemBasicDTO> CheckItemBasicAsync(AssembleRequestImportInput importInput,
+        List<ValidationResult> validationRresult)
+    {
+        var item = await _itemBasicAppService.GetByCodeAsync(importInput.ItemCode).ConfigureAwait(false);
+        if (item == null)
+        {
+            validationRresult.Add(new ValidationResult($"物品代码{importInput.ItemCode}不存在", new[] { "物品代码" }));
+        }
+        else if (item.StdPackQty == 0)
+        {
+            validationRresult.Add(
+                new ValidationResult($"物品代码{importInput.ItemCode}的物品信息中标准包装等于0或不存在", new[] { "标准包装" }));
+        }
+
+        return item;
+    }
+
+    protected async Task<LocationDTO> CheckLocationAsync(AssembleRequestImportInput importInput,
+        List<ValidationResult> validationRresult)
+    {
+        var location = await _locationAppService.GetByCodeAsync(importInput.ToLocationCode).ConfigureAwait(false);
+        if (location == null)
+        {
+            validationRresult.Add(new ValidationResult($"目标库位{importInput.ToLocationCode}不存在", new[] { "目标库位" }));
+        }
+
+        return location;
+    }
+
+    protected async Task CheckAreaAsync(AssembleRequestImportInput importInput,
+        List<ValidationResult> validationRresult)
+    {
+        var area = await _areaApp.GetByCodeAsync(importInput.FromLocationArea).ConfigureAwait(false);
+        if (area == null)
+        {
+            validationRresult.Add(new ValidationResult($"调出库区{importInput.FromLocationArea}不存在", new[] { "调出库区" }));
+        }
+    }
+
+    protected async Task CheckStoreRelationAsync(AssembleRequestImportInput importInput,
+        List<ValidationResult> validationRresult)
+    {
+        var itemStoreRelation = await _itemStoreRelationApp
+            .GetFirstAsync(importInput.ItemCode, importInput.ToLocationCode).ConfigureAwait(false);
+        if (itemStoreRelation == null)
+        {
+            validationRresult.Add(new ValidationResult(
+                $"物品代码{importInput.ItemCode}与目标库位{importInput.ToLocationCode}不存在对应关", new[] { "物品库位对应关系" }));
+        }
+    }
+
+    #endregion
+
+    #endregion
+
+    #region 校验
+
+    private void CheckItemBasic(ItemBasicDTO ItemBasicDto, string itemCode)
+    {
+        if (ItemBasicDto == null)
+        {
+            throw new UserFriendlyException($"物品代码为【{itemCode}】不存在");
+        }
+    }
+
+    private void CheckLocation(LocationDTO LocationDto, string LocationCode)
+    {
+        if (LocationDto == null)
+        {
+            throw new UserFriendlyException($"库位代码为【{LocationCode}】不存在");
+        }
+
+        if (LocationDto.Type != EnumLocationType.WIP)
+        {
+            throw new UserFriendlyException($"库位代码【{LocationCode}】不是【{EnumLocationType.WIP.GetDisplayName()}】类型");
+        }
+    }
+
+
+    #endregion
+}
--- 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/AssembleRequests/AssembleRequestAutoMapperProfile.cs
@ -0,0 +1,72 @@
+using AutoMapper;
+using Volo.Abp.AutoMapper;
+using Win_in.Sfs.Shared.Domain.Shared;
+using Win_in.Sfs.Wms.Store.Application.Contracts;
+using Win_in.Sfs.Wms.Store.Domain;
+
+namespace Win_in.Sfs.Wms.Store.Application;
+
+public partial class StoreApplicationAutoMapperProfile : Profile
+{
+    private void AssembleRequestAutoMapperProfile()
+    {
+        CreateMap<AssembleRequest, AssembleRequestDTO>()
+            .ReverseMap();
+
+        CreateMap<AssembleRequestDetail, AssembleRequestDetailDTO>()
+            .ReverseMap();
+
+        CreateMap<AssembleRequestDetailInput, AssembleRequestDetail>()
+              .IgnoreAuditedObjectProperties()
+              .Ignore(x => x.ToLocationArea)
+              .Ignore(x => x.ToLocationGroup)
+              .Ignore(x => x.ToWarehouseCode)
+              .Ignore(x => x.MasterID)
+              .Ignore(x => x.TenantId)
+              .Ignore(x => x.Number)
+              .Ignore(x => x.Id);
+
+        CreateMap<AssembleRequestImportInput, AssembleRequest>()
+            .IgnoreAuditedObjectProperties()
+            .ForMember(x => x.Type, y => y.MapFrom(t => t.Type.ToString()))           
+            .Ignore(x => x.ProdLine)           
+            .Ignore(x => x.UseOnTheWayLocation)
+            .Ignore(x => x.Details)
+            .Ignore(x => x.Remark)
+            .Ignore(x => x.TenantId)
+            .Ignore(x => x.Number)
+            .Ignore(x => x.RequestStatus)
+            .Ignore(x => x.ConcurrencyStamp)
+            .Ignore(x => x.ExtraProperties)
+            .Ignore(x => x.ActiveDate)
+            .Ignore(x => x.Remark);
+
+        CreateMap<AssembleRequestImportInput, AssembleRequestDetail>()
+            .IgnoreAuditedObjectProperties()
+            .ForMember(x => x.Status, y => y.MapFrom(t => EnumStatus.Open))
+            .Ignore(x => x.ToLocationErpCode)
+            .Ignore(x => x.ToWarehouseCode)
+            .Ignore(x => x.ToLocationArea)
+            .Ignore(x => x.ToLocationGroup)
+            .Ignore(x => x.ItemName).Ignore(x => x.ItemDesc1).Ignore(x => x.ItemDesc2)
+            .Ignore(x => x.ProdLine)
+            .Ignore(x => x.WorkStation)
+            .Ignore(x => x.ExpiredTime)
+            .Ignore(x => x.IssuedQty)
+            .Ignore(x => x.ReceivedQty)
+            .Ignore(x => x.ToBeIssuedQty)
+            .Ignore(x => x.ToBeReceivedQty)
+            .Ignore(x => x.NotFinishQty)
+            .Ignore(x => x.StdPackQty)
+            .Ignore(x => x.Uom)
+            .Ignore(x => x.TenantId)
+            .Ignore(x => x.MasterID)
+            .Ignore(x => x.Number)
+            .Ignore(x => x.Id)
+            .Ignore(x => x.Remark);
+        CreateMap<AssembleRequestEditInput, AssembleRequest>()
+            .IgnoreAuditedObjectProperties()
+            .Ignore(x => x.RequestStatus)
+            .Ignore(x => x.ConcurrencyStamp).Ignore(x => x.Id);
+    }
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/StoreApplicationAutoMapperProfile.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/StoreApplicationAutoMapperProfile.cs
@ -15,6 +15,7 @@ public partial class StoreApplicationAutoMapperProfile : Profile
        ItemTransformRequestAutoMapperProfile();
        MaterialRequestAutoMapperProfile();
        InjectionRequestAutoMapperProfile();
+        AssembleRequestAutoMapperProfile();
        ProductionReturnRequestAutoMapperProfile();
        ProductReceiptRequestAutoMapperProfile();
        UnplannedIssueRequestAutoMapperProfile();
@ -66,6 +67,7 @@ public partial class StoreApplicationAutoMapperProfile : Profile
        IsolationNoteAutoMapperProfile();
        IssueNoteAutoMapperProfile();
        InjectionNoteAutoMapperProfile();
+        AssembleNoteAutoMapperProfile();
        ContainerNoteAutoMapperProfile();
        ItemTransformNoteAutoMapperProfile();
        JisDeliverNoteAutoMapperProfile();
@ -100,6 +102,7 @@ public partial class StoreApplicationAutoMapperProfile : Profile
        InspectJobAutoMapperProfile();
        IssueJobAutoMapperProfile();
        InjectionJobAutoMapperProfile();
+        AssembleJobAutoMapperProfile();
        ContainerJobAutoMapperProfile();
        JisDeliverJobAutoMapperProfile();
        ProductReceiveJobAutoMapperProfile();
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/AssembleJobs/AssembleJob.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/AssembleJobs/AssembleJob.cs
@ -0,0 +1,84 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Threading.Tasks;
+using Win_in.Sfs.Shared.Domain.Entities;
+
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+/// <summary>
+/// 装配发料任务
+/// </summary>
+[Display(Name = "装配发料任务")]
+public class AssembleJob : SfsJobAggregateRootBase<AssembleJobDetail>
+{
+    /// <summary>
+    /// 叫料请求类型
+    /// </summary>
+    [IgnoreUpdate]
+    public string RequestType { get; set; }
+
+    /// <summary>
+    /// 生产线
+    /// </summary>
+    [IgnoreUpdate]
+    public string ProdLine { get; set; }
+
+    /// <summary>
+    /// 要货单号
+    /// </summary>
+    [IgnoreUpdate]
+    public string AssembleRequestNumber { get; set; }
+
+    /// <summary>
+    /// 车间
+    /// </summary>
+    [IgnoreUpdate]
+    public string Workshop { get; set; }
+
+    /// <summary>
+    /// 使用在途库
+    /// </summary>
+    [Display(Name = "使用在途库")]
+    [IgnoreUpdate]
+    public bool UseOnTheWayLocation { get; set; }
+
+    /// <summary>
+    /// 任务明细
+    /// </summary>
+    [IgnoreUpdate]
+    public override List<AssembleJobDetail> Details { get; set; } = new List<AssembleJobDetail>();
+
+    /// <summary>
+    /// 设置任务明细的实际库位和实际数量
+    /// </summary>
+    /// <param name="id"></param>
+    /// <param name="handledLocationCode"></param>
+    /// <param name="handledLocationErpCode"></param>
+    /// <param name="handledWarehouseCode"></param>
+    /// <param name="handledQty"></param>
+    /// <param name="handledBatch"></param>
+    /// <param name="handledContainerCode"></param>
+    /// <param name="handledLot"></param>
+    /// <param name="handledPackingCode"></param>
+    /// <returns></returns>
+    public virtual async Task BuildDetail(Guid id, string handledLocationCode, string handledLocationErpCode,
+        string handledWarehouseCode, decimal handledQty, string handledSupplierBatch, DateTime handledArriveDate, DateTime handledProduceDate, DateTime handledExpireDate,
+        string handledContainerCode, string handledLot, string handledPackingCode)
+    {
+        var detail = GetDetail(id);
+        detail.HandledFromLocationCode = handledLocationCode;
+        detail.HandledFromLocationErpCode = handledLocationErpCode;
+        detail.HandledFromWarehouseCode = handledWarehouseCode;
+        detail.HandledQty = handledQty;
+        detail.HandledSupplierBatch = handledSupplierBatch;
+        detail.HandledArriveDate = handledArriveDate;
+        detail.HandledProduceDate = handledProduceDate;
+        detail.HandledExpireDate = handledExpireDate;
+        detail.HandledContainerCode = handledContainerCode;
+        detail.HandledLot = handledLot;
+        detail.HandledPackingCode = handledPackingCode;
+        await Task.CompletedTask.ConfigureAwait(false);
+    }
+
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/AssembleJobs/AssembleJobDetail.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/AssembleJobs/AssembleJobDetail.cs
@ -0,0 +1,108 @@
+using System;
+using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared;
+
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+public class AssembleJobDetail : SfsJobRecommendFromDetailEntityBase, IHasToLocation
+{
+    /// <summary>
+    /// 请求库位
+    /// </summary>
+    public string RequestLocationCode { get; set; }
+
+    /// <summary>
+    /// 到库位
+    /// </summary>
+    public string ToLocationCode { get; set; }
+
+    /// <summary>
+    /// 到库区
+    /// </summary>
+    public string ToLocationArea { get; set; }
+
+    /// <summary>
+    /// 到库位组
+    /// </summary>
+    public string ToLocationGroup { get; set; }
+
+    /// <summary>
+    /// 到ERP库位
+    /// </summary>
+    public string ToLocationErpCode { get; set; }
+
+    /// <summary>
+    /// 到仓库
+    /// </summary>
+    public string ToWarehouseCode { get; set; }
+
+    /// <summary>
+    /// 在途库库位
+    /// </summary>
+    public string OnTheWayLocationCode { get; set; }
+
+    /// <summary>
+    /// 生产线
+    /// </summary>
+    public string ProdLine { get; set; }
+
+    /// <summary>
+    /// 工作中心
+    /// </summary>
+    public string WorkStation { get; set; }
+
+    /// <summary>
+    /// 过期时间
+    /// </summary>
+    public DateTime ExpiredTime { get; set; }
+
+    /// <summary>
+    /// 工序
+    /// </summary>
+    public string Operation { get; set; }
+
+    /// <summary>
+    /// 配送方式
+    /// </summary>
+    public EnumDistributionType DistributionType { get; set; }
+
+    /// <summary>
+    /// 取整方式
+    /// </summary>
+    public EnumTruncType TruncType { get; set; }
+
+    /// <summary>
+    /// 取整后数量
+    /// </summary>
+    public decimal RoundedQty { get; set; }
+
+    /// <summary>
+    /// 计划拆分规则
+    /// </summary>
+    public EnumPlannedSplitRule PlannedSplitRule { get; set; }
+
+    /// <summary>
+    /// 计划开始时间
+    /// </summary>
+    public DateTime PlanBeginTime { get; set; }
+
+    /// <summary>
+    /// 每次配送数量
+    /// </summary>
+    public decimal DeliveryQty { get; set; }
+
+    /// <summary>
+    /// 位置码
+    /// </summary>
+    public string PositionCode { get; set; }
+
+    /// <summary>
+    /// 推荐类型
+    /// </summary>
+    public EnumRecommendType RecommendType { get; set; }
+
+    public void SetId(Guid id)
+    {
+        this.Id = id;
+    }
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/AssembleJobs/AssembleJobManager.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/AssembleJobs/AssembleJobManager.cs
@ -0,0 +1,82 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
+using Volo.Abp.Users;
+using Volo.Abp.Validation;
+using Win_in.Sfs.Shared.Domain.Shared;
+
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+public class AssembleJobManager : SfsJobManagerBase<AssembleJob, AssembleJobDetail>, IAssembleJobManager
+{
+
+    public AssembleJobManager(
+        IAssembleJobRepository repository
+        ) : base(repository)
+    {
+    }
+
+    /// <summary>
+    /// 执行任务 发料任务
+    /// </summary>
+    /// <param name="id"></param>
+    /// <param name="input"></param>
+    /// <param name="user"></param>
+    /// <returns></returns>
+    public override async Task<AssembleJob> CompleteAsync(AssembleJob input, ICurrentUser user)
+    {
+        var entity = await Repository.FindAsync(input.Id).ConfigureAwait(false);
+
+        foreach (var detail in input.Details)
+        {
+            //发料子任务 赋值实际转移
+            await entity.BuildDetail(detail.Id,
+                detail.HandledFromLocationCode,
+                detail.HandledFromLocationErpCode,
+                detail.HandledFromWarehouseCode,
+                detail.HandledQty,
+                detail.HandledSupplierBatch,
+                detail.HandledArriveDate,
+                detail.HandledProduceDate,
+                detail.HandledExpireDate,
+                detail.HandledContainerCode,
+                detail.HandledLot,
+                detail.HandledPackingCode).ConfigureAwait(false);
+        }
+
+        return await base.CompleteAsync(entity, user).ConfigureAwait(false);
+    }
+
+    public override void CheckDetails(AssembleJob entity, AbpValidationResult result)
+    {
+        var details = entity.Details;
+        foreach (var detail in details)
+        {
+            if (detail.HandledFromLocationCode == null)
+            {
+                result.Errors.Add(new ValidationResult($"{detail.HandledFromLocationCode} 不能为空"));
+            }
+
+        }
+    }
+
+    public override async Task<List<AssembleJob>> GetWorkingListByPackingAsync(string packingCode)
+    {
+        return await Repository.GetListAsync(c => c.Details.Any(p => p.RecommendPackingCode == packingCode) && c.JobStatus != EnumJobStatus.Closed && c.JobStatus != EnumJobStatus.Cancelled, true).ConfigureAwait(false);
+
+    }
+
+    public override async Task<List<AssembleJob>> GetWorkingListByContainerAsync(string containerCode)
+    {
+        return await Repository.GetListAsync(c => c.Details.Any(p => p.RecommendContainerCode == containerCode) && c.JobStatus != EnumJobStatus.Closed && c.JobStatus != EnumJobStatus.Cancelled, true).ConfigureAwait(false);
+
+    }
+    
+    public async Task<AssembleJob> GetAsync(Expression<Func<AssembleJob, bool>> expression)
+    {
+        return await Repository.FindAsync(expression).ConfigureAwait(false);
+    }
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/AssembleJobs/IAssembleJobManager.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/AssembleJobs/IAssembleJobManager.cs
@ -0,0 +1,10 @@
+using System;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
+
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+public interface IAssembleJobManager : IJobManager<AssembleJob>
+{
+    Task<AssembleJob> GetAsync(Expression<Func<AssembleJob, bool>> expression);
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/AssembleJobs/IAssembleJobRepository.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/AssembleJobs/IAssembleJobRepository.cs
@ -0,0 +1,6 @@
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+public interface IAssembleJobRepository : ISfsJobRepositoryBase<AssembleJob>
+{
+
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/AssembleNotes/AssembleNote.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/AssembleNotes/AssembleNote.cs
@ -0,0 +1,77 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using Volo.Abp;
+using Win_in.Sfs.Shared.Domain.Entities;
+
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+/// <summary>
+/// 装配发料记录
+/// </summary>
+public class AssembleNote : SfsStoreAggregateRootBase<AssembleNoteDetail>, IHasJobNumber, IHasRequestNumber
+{
+    /// <summary>
+    /// 任务ID
+    /// </summary>
+    [IgnoreUpdate]
+    public string JobNumber { get; set; }
+
+    /// <summary>
+    /// 车间
+    /// </summary>
+    [IgnoreUpdate]
+    public string Workshop { get; set; }
+
+    /// <summary>
+    /// 明细列表 
+    /// </summary>
+    [IgnoreUpdate]
+    public override List<AssembleNoteDetail> Details { get; set; } = new List<AssembleNoteDetail>();
+
+    [IgnoreUpdate]
+    public string RequestNumber { get; set; }
+
+    /// <summary>
+    /// 叫料请求类型
+    /// </summary>
+    [IgnoreUpdate]
+    public string RequestType { get; set; }
+
+    /// <summary>
+    /// 使用在途库
+    /// </summary>
+    [IgnoreUpdate]
+    public bool UseOnTheWayLocation { get; set; }
+
+    /// <summary>
+    /// 确认时间
+    /// </summary>
+    [Display(Name = "确认时间")]
+    [IgnoreUpdate]
+    public DateTime? ConfirmTime { get; set; }
+
+    /// <summary>
+    /// 已确认
+    /// </summary>
+    [Display(Name = "已确认")]
+    public bool Confirmed { get; set; }
+
+    public void Confirm(DateTime confirmTime)
+    {
+
+        CheckStatus(Confirmed);
+        Confirmed = true;
+        ConfirmTime = confirmTime;
+    }
+
+    private static void CheckStatus(bool confirmed)
+    {
+        if (confirmed)
+        {
+            throw new UserFriendlyException($"当前状态为 【已确认】 ,无法再次确认！");
+        }
+
+    }
+
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/AssembleNotes/AssembleNoteDetail.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/AssembleNotes/AssembleNoteDetail.cs
@ -0,0 +1,43 @@
+using System;
+using Win_in.Sfs.Shared.Domain.Shared;
+
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+public class AssembleNoteDetail : SfsStoreRecommendFromDetailWithFromToEntityBase
+{
+
+    /// <summary>
+    /// 发料时间
+    /// </summary>
+    public DateTime IssueTime { get; set; }
+
+    /// <summary>
+    /// 过期时间
+    /// </summary>
+    public DateTime ExpiredTime { get; set; }
+
+    /// <summary>
+    /// 生产线
+    /// </summary>
+    public string ProdLine { get; set; }
+
+    /// <summary>
+    /// 工作中心
+    /// </summary>
+    public string WorkStation { get; set; }
+
+    /// <summary>
+    /// 在途库库位
+    /// </summary>
+    public string OnTheWayLocationCode { get; set; }
+
+    /// <summary>
+    /// 位置码
+    /// </summary>
+    public string PositionCode { get; set; }
+
+    /// <summary>
+    /// 推荐类型
+    /// </summary>
+    public EnumRecommendType RecommendType { get; set; }
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/AssembleNotes/AssembleNoteManager.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/AssembleNotes/AssembleNoteManager.cs
@ -0,0 +1,42 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using Volo.Abp;
+using Volo.Abp.Uow;
+using Win_in.Sfs.Shared.Event;
+
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+public class AssembleNoteManager : SfsStoreManagerBase<AssembleNote, AssembleNoteDetail>, IAssembleNoteManager
+{
+
+    public AssembleNoteManager(
+        IAssembleNoteRepository repository
+        ) : base(repository)
+    {
+    }
+
+    [UnitOfWork]
+    public virtual async Task<AssembleNote> ConfirmAsync(Guid id)
+    {
+        var entity = await Repository.FindAsync(id).ConfigureAwait(false);
+        Check.NotNull(entity, EntityClassName);
+        entity.Confirm(Clock.Now);
+        await PublishConfirmedAsync(entity).ConfigureAwait(false);
+        return await Repository.UpdateAsync(entity).ConfigureAwait(false);
+    }
+    private async Task PublishConfirmedAsync(AssembleNote entity)
+    {
+        try
+        {
+            await LocalEventBus.PublishAsync(new SfsConfirmedEntityEventData<AssembleNote>(entity), false).ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            Logger.LogDebug($"{nameof(AssembleNote)} Confirmed Event:{ex.Message}", null);
+            Console.WriteLine(ex.Source);
+            throw;
+        }
+    }
+
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/AssembleNotes/IAssembleNoteManager.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/AssembleNotes/IAssembleNoteManager.cs
@ -0,0 +1,10 @@
+using System;
+using System.Threading.Tasks;
+
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+public interface IAssembleNoteManager : ISfsStoreManager<AssembleNote, AssembleNoteDetail>
+{
+    Task<AssembleNote> ConfirmAsync(Guid id);
+
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/AssembleNotes/IAssembleNoteRepository.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/AssembleNotes/IAssembleNoteRepository.cs
@ -0,0 +1,6 @@
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+public interface IAssembleNoteRepository : ISfsStoreRepositoryBase<AssembleNote>
+{
+
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/AssembleRequest.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/AssembleRequest.cs
@ -0,0 +1,35 @@
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Shared.Domain.Entities;
+
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+/// <summary>
+/// 装配申请
+/// </summary>
+public class AssembleRequest : SfsStoreRequestAggregateRootBase<AssembleRequestDetail>
+{
+    /// <summary>
+    /// 叫料类型
+    /// </summary>
+    [Display(Name = "叫料类型")]
+    [IgnoreUpdate]
+    public string Type { get; set; }
+
+    /// <summary>
+    /// 生产线
+    /// </summary>
+    [IgnoreUpdate]
+    public string ProdLine { get; set; }
+
+    /// <summary>
+    /// 使用在途库
+    /// </summary>
+    public bool UseOnTheWayLocation { get; set; }
+
+    /// <summary>
+    /// 明细列表 
+    /// </summary>
+    [IgnoreUpdate]
+    public override List<AssembleRequestDetail> Details { get; set; } = new List<AssembleRequestDetail>();
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/AssembleRequestDetail.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/AssembleRequestDetail.cs
@ -0,0 +1,105 @@
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared;
+
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+/// <summary>
+/// 装配申请明细
+/// </summary>
+public class AssembleRequestDetail : SfsStoreDetailWithQtyEntityBase, IHasToLocation
+{
+    /// <summary>
+    /// 到库位
+    /// </summary>
+    public string ToLocationCode { get; set; }
+
+    /// <summary>
+    /// 到库区
+    /// </summary>
+    public string ToLocationArea { get; set; }
+
+    /// <summary>
+    /// 到库位组
+    /// </summary>
+    public string ToLocationGroup { get; set; }
+
+    /// <summary>
+    /// 到ERP库位
+    /// </summary>
+    public string ToLocationErpCode { get; set; }
+
+    /// <summary>
+    /// 到仓库
+    /// </summary>
+    public string ToWarehouseCode { get; set; }
+
+    /// <summary>
+    /// 来源库区
+    /// </summary>
+    public string FromLocationArea { get; set; }
+
+    // /// <summary>
+    // /// 在途库库位
+    // /// </summary>
+    // public string OnTheWayLocationCode { get; set; }
+
+    /// <summary>
+    /// 生产线
+    /// </summary>
+    public string ProdLine { get; set; }
+
+    /// <summary>
+    /// 工作中心
+    /// </summary>
+    public string WorkStation { get; set; }
+
+    /// <summary>
+    /// 过期时间
+    /// </summary>
+    public DateTime ExpiredTime { get; set; }
+
+    /// <summary>
+    /// 已发数量
+    /// </summary>
+    public decimal IssuedQty { get; set; }
+
+    /// <summary>
+    /// 已收数量
+    /// </summary>
+    public decimal ReceivedQty { get; set; }
+
+    /// <summary>
+    /// 明细状态
+    /// </summary>
+    public EnumStatus Status { get; set; }
+
+    /// <summary>
+    /// 请求未发 还未发送的数量
+    /// </summary>
+    [NotMapped]
+    public decimal ToBeIssuedQty => Qty - IssuedQty;
+
+    /// <summary>
+    /// 已发未收
+    /// </summary>
+    [NotMapped]
+    public decimal ToBeReceivedQty => IssuedQty - ReceivedQty;
+
+    /// <summary>
+    /// 请求未收
+    /// </summary>
+    [NotMapped]
+    public decimal NotFinishQty => Qty - ReceivedQty;
+
+    /// <summary>
+    /// 位置码
+    /// </summary>
+    public string PositionCode { get; set; }
+
+    /// <summary>
+    /// 推荐类型
+    /// </summary>
+    public EnumRecommendType RecommendType { get; set; }
+}
--- 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
@ -0,0 +1,147 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using DocumentFormat.OpenXml.Math;
+using Win_in.Sfs.Shared.Domain.Shared;
+using Win_in.Sfs.Shared.Event;
+using static Win_in.Sfs.Wms.Store.Domain.Shared.StoreSettings;
+
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+public class AssembleRequestManager
+    : SfsStoreRequestManagerBase<AssembleRequest, AssembleRequestDetail>
+        , IAssembleRequestManager
+{
+    private readonly IAssembleRequestRepository _repository;
+    private readonly IIssueJobRepository _issueJobRepository;
+
+    public AssembleRequestManager(
+        IAssembleRequestRepository repository
+        , IIssueJobRepository issueJobRepository
+        ) : base(repository)
+    {
+        _repository = repository;
+        _issueJobRepository = issueJobRepository;
+    }
+
+
+    #region 东阳V2
+
+    #endregion
+
+
+    /// <summary>
+    /// 创建
+    /// </summary>
+    /// <param name="entity"></param>
+    /// <returns></returns>
+    public virtual async Task<AssembleRequest> CreateBynNumberAsync(AssembleRequest entity)
+    {
+        var number = string.IsNullOrEmpty(entity.Number) ? await GenerateNumberAsync(nameof(AssembleRequest), entity.ActiveDate).ConfigureAwait(false) : entity.Number;
+        entity.SetIdAndNumberWithDetails(GuidGenerator, number);
+        entity.Submit();
+        entity.Agree();
+        entity.RequestStatus = EnumRequestStatus.Partial;
+        await LocalEventBus.PublishAsync(new SfsHandledEntityEventData<AssembleRequest>(entity), false)
+            .ConfigureAwait(false);
+        await _repository.InsertAsync(entity).ConfigureAwait(false);
+        return entity;
+    }
+
+    public virtual async Task UpdateDetailsAsync(AssembleRequest newEntity)
+    {
+        var oldEntity = await Repository.FindAsync(newEntity.Id, true).ConfigureAwait(false);
+        if(oldEntity!=null)
+        {
+            foreach (var newDetail in newEntity.Details)
+            {
+                oldEntity.ReplaceDetail(newDetail.Id, newDetail);
+            }
+
+            foreach (var detail in oldEntity.Details)
+            {
+                SetMaterialRequestDetailStatus(detail);
+            }
+
+            await SetMaterialRequestStatusAsync(oldEntity).ConfigureAwait(false);
+
+            await Repository.UpdateAsync(oldEntity).ConfigureAwait(false);
+        }
+       
+    }
+
+    private void SetMaterialRequestDetailStatus(AssembleRequestDetail detail)
+    {
+        if (detail.ReceivedQty >= detail.Qty)//执行的时候  实际收料 多余 要料数
+        {
+            detail.Status = EnumStatus.Close;
+        }
+        else
+        {
+            detail.Status = EnumStatus.Open;
+        }
+    }
+
+    private async Task SetMaterialRequestStatusAsync(AssembleRequest materialRequest)
+    {
+        if (materialRequest.Details.All(p => p.Status == EnumStatus.Close))
+        {
+            materialRequest.RequestStatus = EnumRequestStatus.Completed;
+        }
+        else
+        {
+            var issueJobs = await _issueJobRepository.GetListAsync(t => t.MaterialRequestNumber == materialRequest.Number).ConfigureAwait(false);
+            if (issueJobs.Count > 0)
+            {
+                if (issueJobs.All(t => t.JobStatus is EnumJobStatus.Done or EnumJobStatus.Closed or EnumJobStatus.Cancelled))
+                {
+                    if (materialRequest.Details.All(p => p.ReceivedQty >= p.Qty))
+                    {
+                        materialRequest.RequestStatus = EnumRequestStatus.Completed;
+                    }
+                    else
+                    {
+                        materialRequest.RequestStatus = EnumRequestStatus.Partial;
+                    }
+                }
+                else
+                {
+                    materialRequest.RequestStatus = EnumRequestStatus.Partial;
+                }
+            }
+            else
+            {
+                materialRequest.RequestStatus = EnumRequestStatus.Partial;
+            }
+        }
+    }
+
+    public virtual async Task CompleteAsync(string number)
+    {
+        var entity = await GetByNumberAsync(number).ConfigureAwait(false);
+        if (entity != null && !entity.Details.Any(p => p.ToBeIssuedQty > 0))
+        {
+            await CompleteAsync(entity).ConfigureAwait(false);
+        }
+    }
+   
+
+    #region 导入
+
+    /// <summary>
+    /// 执行导入
+    /// </summary>
+    public virtual async Task ImportDataAsync(List<AssembleRequest> mergeEntities, List<AssembleRequest> deleteEntities = null)
+    {
+        if (deleteEntities != null && deleteEntities.Count > 0)
+        {
+            await _repository.BulkDeleteAsync(deleteEntities).ConfigureAwait(false);
+        }
+
+        await CreateManyAsync(mergeEntities).ConfigureAwait(false);
+    }
+
+    #endregion
+     
+}
--- 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
@ -0,0 +1,16 @@
+using System.Threading.Tasks;
+
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+using Win_in.Sfs.Shared.Domain;
+
+public interface IAssembleRequestManager : ISfsStoreRequestManager<AssembleRequest, AssembleRequestDetail>,
+                                            IBulkImportService<AssembleRequest>
+{
+    
+    Task UpdateDetailsAsync(AssembleRequest entity);
+
+    Task CompleteAsync(string number);
+
+    Task<AssembleRequest> CreateBynNumberAsync(AssembleRequest entity);
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/IAssembleRequestRepository.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/IAssembleRequestRepository.cs
@ -0,0 +1,9 @@
+using Win_in.Sfs.Shared.Domain;
+
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+public interface IAssembleRequestRepository : ISfsStoreRepositoryBase<AssembleRequest>,
+                                              ISfsBulkRepositoryBase<AssembleRequest>
+{
+
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/IStoreDbContext.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/IStoreDbContext.cs
@ -22,6 +22,7 @@ public interface IStoreDbContext : IEfCoreDbContext
    public DbSet<ProductReceiptRequest> ProductReceiptRequests { get; }
    public DbSet<MaterialRequest> MaterialRequests { get; }
    public DbSet<InjectionRequest> InjectionRequests { get; }
+    public DbSet<AssembleRequest> AssembleRequests { get; }
    public DbSet<ContainerRequest> ContainerRequests { get; }
    public DbSet<DeliverRequest> DeliverRequests { get; }
    public DbSet<InspectRequest> InspectRequests { get; }
@ -77,6 +78,7 @@ public interface IStoreDbContext : IEfCoreDbContext
    public DbSet<WarehouseTransferNote> WarehouseTransferNotes { get; }
    public DbSet<IssueNote> IssueNotes { get; }
    public DbSet<InjectionNote> InjectionNotes { get; }
+    public DbSet<AssembleNote> AssembleNotes { get; }
    public DbSet<ContainerNote> ContainerNotes { get; }
    public DbSet<UnplannedReceiptNote> UnplannedReceiptNotes { get; }
    public DbSet<UnplannedIssueNote> UnplannedIssueNotes { get; }
@ -103,6 +105,7 @@ public interface IStoreDbContext : IEfCoreDbContext
    public DbSet<PutawayJob> PutawayJobs { get; }
    public DbSet<IssueJob> IssueJobs { get; }
    public DbSet<InjectionJob> InjectionJobs { get; }
+    public DbSet<AssembleJob> AssembleJobs { get; }
    public DbSet<ContainerJob> ContainerJobs { get; }
    public DbSet<DeliverJob> DeliverJobs { get; }
    public DbSet<JisDeliverJob> JisDeliverJobs { get; }
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/AssembleJobs/AssembleJobDbContextModelCreatingExtensions.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/AssembleJobs/AssembleJobDbContextModelCreatingExtensions.cs
@ -0,0 +1,69 @@
+using Microsoft.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore.Modeling;
+using Win_in.Sfs.Shared.Domain.Shared;
+using Win_in.Sfs.Shared.EntityFrameworkCore;
+using Win_in.Sfs.Wms.Store.Domain;
+
+namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore;
+
+public static class AssembleJobDbContextModelCreatingExtensions
+{
+    public static void ConfigureAssembleJob(this ModelBuilder builder, StoreModelBuilderConfigurationOptions options)
+    {
+        builder.Entity<AssembleJob>(b =>
+        {
+            //Configure table & schema name
+            b.ToTable(StoreDbProperties.JobDbTablePrefix + nameof(AssembleJob), options.Schema);
+            //Configure ABP properties
+            b.ConfigureByConvention();
+            //Configure Sfs base properties
+            b.ConfigureSfsBase();
+            //Configure Job base properties
+            b.ConfigureJob<AssembleJob, AssembleJobDetail>();
+            //Properties
+            b.Property(q => q.RequestType).HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.AssembleRequestNumber).HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.Workshop).HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.ProdLine).HasMaxLength(SfsPropertyConst.CodeLength);
+            //Relations
+            b.HasMany(q => q.Details).WithOne().HasForeignKey(d => d.MasterID).IsRequired();
+            //Indexes
+            b.HasIndex(q => new { q.Number }).IsUnique();
+        });
+
+        builder.Entity<AssembleJobDetail>(b =>
+        {
+            //Configure table & schema name
+            b.ToTable(StoreDbProperties.JobDbTablePrefix + nameof(AssembleJobDetail), options.Schema);
+            //Configure ABP properties
+            b.ConfigureByConvention();
+            //Configure Sfs base properties
+            b.ConfigureSfsBase();
+            //Configure Job base properties
+            b.ConfigureJobRecommendFromDetail();
+            //Properties
+            b.Property(q => q.ExpiredTime).IsRequired();
+            b.Property(q => q.ToLocationCode).HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.ToLocationErpCode).HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.ToWarehouseCode).HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.ToLocationArea).HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.ToLocationGroup).HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.RequestLocationCode).HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.ProdLine).HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.WorkStation).HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.Operation).HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.DistributionType).HasMaxLength(SfsPropertyConst.NameLength).HasConversion<string>();
+            b.Property(q => q.TruncType).HasMaxLength(SfsPropertyConst.NameLength).HasConversion<string>();
+            b.Property(q => q.PlannedSplitRule).HasMaxLength(SfsPropertyConst.NameLength).HasConversion<string>();
+            b.Property(q => q.OnTheWayLocationCode).HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.PositionCode).HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.RecommendType).HasMaxLength(SfsPropertyConst.CodeLength).HasConversion<string>();
+
+            //Relations
+            //None
+
+            //Indexes
+            //b.HasIndex(q => new { q.PackingCode }).IsUnique();
+        });
+    }
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/AssembleJobs/AssembleJobEfCoreRepository.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/AssembleJobs/AssembleJobEfCoreRepository.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 AssembleJobEfCoreRepository : SfsJobEfCoreRepositoryBase<StoreDbContext, AssembleJob>, IAssembleJobRepository
+{
+    public AssembleJobEfCoreRepository(IDbContextProvider<StoreDbContext> dbContextProvider) : base(dbContextProvider)
+    {
+    }
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/AssembleNotes/AssembleNoteDbContextModelCreatingExtensions.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/AssembleNotes/AssembleNoteDbContextModelCreatingExtensions.cs
@ -0,0 +1,63 @@
+using Microsoft.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore.Modeling;
+using Win_in.Sfs.Shared.Domain.Shared;
+using Win_in.Sfs.Wms.Store.Domain;
+
+namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore;
+
+public static class AssembleNoteDbContextModelCreatingExtensions
+{
+    public static void ConfigureAssembleNote(this ModelBuilder builder, StoreModelBuilderConfigurationOptions options)
+    {
+        builder.Entity<AssembleNote>(b =>
+        {
+            //Configure table & schema name
+            b.ToTable(options.TablePrefix + nameof(AssembleNote), options.Schema);
+            //Configure ABP properties
+            b.ConfigureByConvention();
+            //Configure Sfs base properties
+            b.ConfigureSfsStoreBase();
+
+            //Properties
+            b.Property(q => q.RequestNumber).HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.RequestType).HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.Workshop).HasMaxLength(SfsPropertyConst.NameLength);
+            b.Property(q => q.Remark).HasMaxLength(SfsPropertyConst.RemarkLength);
+
+            //Relations
+            b.HasMany(q => q.Details).WithOne().HasForeignKey(d => d.MasterID).IsRequired();
+
+            //Indexes
+            b.HasIndex(q => new { q.Number }).IsUnique();
+        });
+
+        builder.Entity<AssembleNoteDetail>(b =>
+       {
+           //Configure table & schema name
+           b.ToTable(options.TablePrefix + nameof(AssembleNoteDetail), options.Schema);
+           //Configure ABP properties
+           b.ConfigureByConvention();
+           //Configure Sfs base properties
+           b.ConfigureSfsStoreBase();
+           //Configure Sfs store detail properties
+           b.ConfigureSfsStoreDetailBase();
+
+           //Properties
+           b.Property(q => q.IssueTime).IsRequired();
+           b.Property(q => q.ExpiredTime).IsRequired();
+           b.Property(q => q.ProdLine).HasMaxLength(SfsPropertyConst.NameLength);
+           b.Property(q => q.WorkStation).HasMaxLength(SfsPropertyConst.NameLength);
+           b.Property(q => q.OnTheWayLocationCode).HasMaxLength(SfsPropertyConst.CodeLength);
+           b.Property(q => q.FromStatus).HasMaxLength(SfsPropertyConst.NameLength).HasConversion<string>();
+           b.Property(q => q.ToStatus).HasMaxLength(SfsPropertyConst.NameLength).HasConversion<string>();
+           b.Property(q => q.PositionCode).HasMaxLength(SfsPropertyConst.CodeLength);
+           b.Property(q => q.RecommendType).HasMaxLength(SfsPropertyConst.NameLength).HasConversion<string>();
+
+           //Relations
+
+           //Indexes
+           b.HasIndex(q => new { q.Number, q.FromPackingCode, q.FromLocationCode, q.ToLocationCode }).IsUnique();
+           b.HasIndex(q => new { q.FromPackingCode });
+       });
+    }
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/AssembleNotes/AssembleNoteEfCoreRepository.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/AssembleNotes/AssembleNoteEfCoreRepository.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 AssembleNoteEfCoreRepository : SfsStoreEfCoreRepositoryBase<StoreDbContext, AssembleNote>, IAssembleNoteRepository
+{
+    public AssembleNoteEfCoreRepository(IDbContextProvider<StoreDbContext> dbContextProvider) : base(dbContextProvider)
+    {
+    }
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/MaterialRequests/AssembleRequests/AssembleRequestDbContextModelCreatingExtensions.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/MaterialRequests/AssembleRequests/AssembleRequestDbContextModelCreatingExtensions.cs
@ -0,0 +1,65 @@
+using Microsoft.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore.Modeling;
+using Win_in.Sfs.Shared.Domain.Shared;
+using Win_in.Sfs.Wms.Store.Domain;
+
+namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore;
+
+public static class AssembleRequestDbContextModelCreatingExtensions
+{
+    public static void ConfigureAssembleRequest(this ModelBuilder builder, StoreModelBuilderConfigurationOptions options)
+    {
+        builder.Entity<AssembleRequest>(b =>
+        {
+            //Configure table & schema name
+            b.ToTable(options.TablePrefix + nameof(AssembleRequest), options.Schema);
+            //Configure ABP properties
+            b.ConfigureByConvention();
+            //Configure Sfs base properties
+            b.ConfigureSfsStoreBase();
+
+            //Properties
+            b.Property(q => q.Type).HasMaxLength(SfsPropertyConst.CodeLength);            
+            b.Property(q => q.ProdLine).HasMaxLength(SfsPropertyConst.CodeLength);           
+            b.Property(q => q.RequestStatus).HasMaxLength(SfsPropertyConst.NameLength).HasConversion<string>();
+
+            //Relations
+            b.HasMany(q => q.Details).WithOne().HasForeignKey(d => d.MasterID).IsRequired();
+
+            //Indexes
+            b.HasIndex(q => new { q.Number }).IsUnique();
+        });
+
+        builder.Entity<AssembleRequestDetail>(b =>
+        {
+            //Configure table & schema name
+            b.ToTable(options.TablePrefix + nameof(AssembleRequestDetail), options.Schema);
+            //Configure ABP properties
+            b.ConfigureByConvention();
+            //Configure Sfs base properties
+            b.ConfigureSfsStoreBase();
+            //Configure Sfs store detail properties
+            b.ConfigureSfsStoreDetailBase();
+            //Properties
+            b.Property(q => q.ToLocationCode).IsRequired().HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.ToLocationErpCode).IsRequired().HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.ToWarehouseCode).IsRequired().HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.ToLocationArea).IsRequired().HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.ToLocationGroup).IsRequired().HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.ExpiredTime).IsRequired();
+            b.Property(q => q.ProdLine).HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.WorkStation).HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.IssuedQty).HasPrecision(18, 6);
+            b.Property(q => q.ReceivedQty).HasPrecision(18, 6);
+            b.Property(q => q.Status).HasMaxLength(SfsPropertyConst.NameLength).HasConversion<string>();
+            b.Property(q => q.PositionCode).HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.RecommendType).HasMaxLength(SfsPropertyConst.NameLength).HasConversion<string>();
+
+            //Relations
+
+            //Indexes
+            b.HasIndex(q => new { q.Number, q.ItemCode, q.ToLocationCode }).IsUnique();
+            b.HasIndex(q => new { q.ItemCode });
+        });
+    }
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/MaterialRequests/AssembleRequests/AssembleRequestEfCoreRepository.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/MaterialRequests/AssembleRequests/AssembleRequestEfCoreRepository.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 AssembleRequestEfCoreRepository : SfsStoreEfCoreRepositoryBase<StoreDbContext, AssembleRequest>, IAssembleRequestRepository
+{
+    public AssembleRequestEfCoreRepository(IDbContextProvider<StoreDbContext> dbContextProvider) : base(dbContextProvider)
+    {
+    }
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreDbContext.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreDbContext.cs
@ -22,6 +22,7 @@ public class StoreDbContext : AbpDbContext<StoreDbContext>, IStoreDbContext
    public DbSet<ProductReceiptRequest> ProductReceiptRequests { get; set; }
    public DbSet<MaterialRequest> MaterialRequests { get; set; }
    public DbSet<InjectionRequest> InjectionRequests { get; set; }
+    public DbSet<AssembleRequest> AssembleRequests { get; set; }
    public DbSet<ContainerRequest> ContainerRequests { get; set; }
    public DbSet<DeliverRequest> DeliverRequests { get; set; }
    public DbSet<InspectRequest> InspectRequests { get; set; }
@ -77,6 +78,7 @@ public class StoreDbContext : AbpDbContext<StoreDbContext>, IStoreDbContext
    public DbSet<WarehouseTransferNote> WarehouseTransferNotes { get; set; }
    public DbSet<IssueNote> IssueNotes { get; set; }
    public DbSet<InjectionNote> InjectionNotes { get; set; }
+    public DbSet<AssembleNote> AssembleNotes { get; set; }
    public DbSet<ContainerNote> ContainerNotes { get; set; }
    public DbSet<UnplannedReceiptNote> UnplannedReceiptNotes { get; set; }
    public DbSet<UnplannedIssueNote> UnplannedIssueNotes { get; set; }
@ -103,6 +105,7 @@ public class StoreDbContext : AbpDbContext<StoreDbContext>, IStoreDbContext
    public DbSet<PutawayJob> PutawayJobs { get; set; }
    public DbSet<IssueJob> IssueJobs { get; set; }
    public DbSet<InjectionJob> InjectionJobs { get; set; }
+    public DbSet<AssembleJob> AssembleJobs { get; set; }
    public DbSet<ContainerJob> ContainerJobs { get; set; }
    public DbSet<DeliverJob> DeliverJobs { get; set; }
    public DbSet<JisDeliverJob> JisDeliverJobs { get; set; }
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreDbContextModelCreatingExtensions.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreDbContextModelCreatingExtensions.cs
@ -48,6 +48,7 @@ public static class StoreDbContextModelCreatingExtensions
        builder.ConfigurePurchaseReceiptRequest(options);
        builder.ConfigureMaterialRequest(options);
        builder.ConfigureInjectionRequest(options);
+        builder.ConfigureAssembleRequest(options);
        builder.ConfigureDeliverRequest(options);
        builder.ConfigureContainerRequest(options);       
        builder.ConfigureInspectRequest(options);
@ -84,6 +85,7 @@ public static class StoreDbContextModelCreatingExtensions
        builder.ConfigureWarehouseTransferNote(options);
        builder.ConfigureIssueNote(options);
        builder.ConfigureInjectionNote(options);
+        builder.ConfigureAssembleNote(options);
        builder.ConfigureContainerNote(options);
        builder.ConfigureUnplannedReceiptNote(options);
        builder.ConfigureUnplannedIssueNote(options);
@ -110,6 +112,7 @@ public static class StoreDbContextModelCreatingExtensions
        builder.ConfigurePutawayJob(options);
        builder.ConfigureIssueJob(options);
        builder.ConfigureInjectionJob(options);
+        builder.ConfigureAssembleJob(options);
        builder.ConfigureContainerJob(options);
        builder.ConfigureDeliverJob(options);
        builder.ConfigureJisDeliverJob(options);
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreEntityFrameworkCoreModule.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreEntityFrameworkCoreModule.cs
@ -59,6 +59,7 @@ public class StoreEntityFrameworkCoreModule : AbpModule
        context.Services.AddTransient<IPurchaseReceiptRequestRepository, PurchaseReceiptRequestEfCoreRepository>();
        context.Services.AddTransient<IMaterialRequestRepository, MaterialRequestEfCoreRepository>();
        context.Services.AddTransient<IInjectionRequestRepository, InjectionRequestEfCoreRepository>();
+        context.Services.AddTransient<IAssembleRequestRepository, AssembleRequestEfCoreRepository>();
        context.Services.AddTransient<IDeliverRequestRepository, DeliverRequestEfCoreRepository>();        
        context.Services.AddTransient<IContainerRequestRepository, ContainerRequestEfCoreRepository>();
        context.Services.AddTransient<IInspectRequestRepository, InspectRequestEfCoreRepository>();
@ -100,6 +101,7 @@ public class StoreEntityFrameworkCoreModule : AbpModule
        context.Services.AddTransient<IWarehouseTransferNoteRepository, WarehouseTransferNoteEfCoreRepository>();
        context.Services.AddTransient<IIssueNoteRepository, IssueNoteEfCoreRepository>();
        context.Services.AddTransient<IInjectionNoteRepository, InjectionNoteEfCoreRepository>();
+        context.Services.AddTransient<IAssembleNoteRepository, AssembleNoteEfCoreRepository>();
        context.Services.AddTransient<IContainerNoteRepository, ContainerNoteEfCoreRepository>();
        context.Services.AddTransient<IUnplannedReceiptNoteRepository, UnplannedReceiptNoteEfCoreRepository>();
        context.Services.AddTransient<IUnplannedIssueNoteRepository, UnplannedIssueNoteEfCoreRepository>();
@ -128,6 +130,7 @@ public class StoreEntityFrameworkCoreModule : AbpModule
        context.Services.AddTransient<IPutawayJobRepository, PutawayJobEfCoreRepository>();
        context.Services.AddTransient<IIssueJobRepository, IssueJobEfCoreRepository>();
        context.Services.AddTransient<IInjectionJobRepository, InjectionJobEfCoreRepository>();
+        context.Services.AddTransient<IAssembleJobRepository, AssembleJobEfCoreRepository>();
        context.Services.AddTransient<IContainerJobRepository, ContainerJobEfCoreRepository>();
        context.Services.AddTransient<IDeliverJobRepository, DeliverJobEfCoreRepository>();
        context.Services.AddTransient<IJisDeliverJobRepository, JisDeliverJobEfCoreRepository>();
@ -193,6 +196,8 @@ public class StoreEntityFrameworkCoreModule : AbpModule
                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
            options.Entity<InjectionRequest>(orderOptions =>
               orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
+            options.Entity<AssembleRequest>(orderOptions =>
+              orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
            options.Entity<ContainerRequest>(orderOptions =>
                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
            options.Entity<PurchaseReceiptRequest>(orderOptions =>
@ -246,6 +251,8 @@ public class StoreEntityFrameworkCoreModule : AbpModule
                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
            options.Entity<InjectionNote>(orderOptions =>
               orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
+            options.Entity<AssembleNote>(orderOptions =>
+              orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
            options.Entity<ContainerNote>(orderOptions =>
               orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
            options.Entity<ScrapNote>(orderOptions =>
@ -319,6 +326,8 @@ public class StoreEntityFrameworkCoreModule : AbpModule
                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
            options.Entity<InjectionJob>(orderOptions =>
               orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
+            options.Entity<AssembleJob>(orderOptions =>
+              orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
            options.Entity<ContainerJob>(orderOptions =>
               orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
            options.Entity<PutawayJob>(orderOptions =>
--- 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
@ -0,0 +1,92 @@
+using System;
+using AutoMapper;
+using Volo.Abp.AutoMapper;
+using Win_in.Sfs.Shared.Application;
+using Win_in.Sfs.Wms.Inventory.Application.Contracts;
+using Win_in.Sfs.Wms.Store.Application.Contracts;
+using Win_in.Sfs.Wms.Store.Domain;
+
+namespace Win_in.Sfs.Wms.Store.Event;
+
+public partial class StoreEventAutoMapperProfile : Profile
+{
+    private void AssembleJobAutoMapperProfile()
+    {
+
+        CreateMap<AssembleJob, AssembleNote>()
+            .ForMember(x => x.JobNumber, y => y.MapFrom(d => d.Number))
+            .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)
+            .Ignore(x => x.Number)
+            .Ignore(x => x.ConfirmTime);
+
+        CreateMap<AssembleJobDetail, AssembleNoteDetail>()
+            .ForMember(x => x.FromPackingCode, y => y.MapFrom(d => d.HandledPackingCode))
+            .ForMember(x => x.ToPackingCode, y => y.MapFrom(d => d.HandledPackingCode))
+            .ForMember(x => x.SupplierBatch, y => y.MapFrom(d => d.HandledSupplierBatch))
+            .ForMember(x => x.ArriveDate, y => y.MapFrom(d => d.HandledArriveDate))
+            .ForMember(x => x.ProduceDate, y => y.MapFrom(d => d.HandledProduceDate))
+            .ForMember(x => x.ExpireDate, y => y.MapFrom(d => d.HandledExpireDate))
+            .ForMember(x => x.FromLot, y => y.MapFrom(d => d.HandledLot))
+            .ForMember(x => x.ToLot, y => y.MapFrom(d => d.HandledLot))
+            .ForMember(x => x.ToContainerCode, y => y.MapFrom(d => d.HandledContainerCode))
+            .ForMember(x => x.FromContainerCode, y => y.MapFrom(d => d.HandledContainerCode))
+            .ForMember(x => x.FromStatus, y => y.MapFrom(d => d.Status))
+            .ForMember(x => x.ToStatus, y => y.MapFrom(d => d.Status))
+            .ForMember(x => x.Qty, y => y.MapFrom(d => d.HandledQty))
+            .ForMember(x => x.IssueTime, y => y.MapFrom(d => DateTime.Now))
+            .ForMember(x => x.FromLocationCode, y => y.MapFrom(d => d.HandledFromLocationCode))
+            .ForMember(x => x.FromLocationArea, y => y.MapFrom(d => d.HandledFromLocationArea))
+            .ForMember(x => x.FromLocationGroup, y => y.MapFrom(d => d.HandledFromLocationGroup))
+            .ForMember(x => x.FromLocationErpCode, y => y.MapFrom(d => d.HandledFromLocationErpCode))
+            .ForMember(x => x.FromWarehouseCode, y => y.MapFrom(d => d.HandledFromWarehouseCode))
+            .ForMember(x => x.ToLocationCode, y => y.MapFrom(d => d.ToLocationCode))
+            .Ignore(x => x.ToLocationArea)
+            .Ignore(x => x.ToLocationGroup)
+            .Ignore(x => x.ToLocationErpCode)
+            ;
+
+        CreateMap<AssembleJobDetail, ExpectInEditInput>()
+            .MapExpectInOutFrom()
+            .Ignore(x => x.Worker)
+            .Ignore(x => x.SerialNumber)
+            .Ignore(x => x.ExtraProperties)
+            ;
+
+        CreateMap<AssembleJobDetail, ExpectOutEditInput>()
+            .MapExpectInOutFrom()
+            .Ignore(x => x.Worker)
+            .Ignore(x => x.SerialNumber)
+            .Ignore(x => x.ExtraProperties);
+
+        CreateMap<AssembleJob, AssembleNoteEditInput>()
+            .ForMember(x => x.RequestNumber, y => y.MapFrom(d => d.AssembleRequestNumber))
+            .Ignore(x => x.Confirmed)
+            .Ignore(x => x.JobNumber)
+            .Ignore(x => x.ActiveDate)
+            ;
+        CreateMap<AssembleJobDetail, AssembleNoteDetailInput>()
+            .ForMember(x => x.Qty, y => y.MapFrom(d => d.HandledQty))
+            .ForMember(x => x.IssueTime, y => y.MapFrom(d => DateTime.Now))
+            .ForMember(x => x.FromPackingCode, y => y.MapFrom(d => d.HandledPackingCode))
+            .ForMember(x => x.ToPackingCode, y => y.MapFrom(d => d.HandledPackingCode))
+            .ForMember(x => x.FromContainerCode, y => y.MapFrom(d => d.HandledContainerCode))
+            .ForMember(x => x.ToContainerCode, y => y.MapFrom(d => d.HandledContainerCode))
+            .ForMember(x => x.FromLot, y => y.MapFrom(d => d.HandledLot))
+            .ForMember(x => x.ToLot, y => y.MapFrom(d => d.HandledLot))
+            .ForMember(x => x.SupplierBatch, y => y.MapFrom(d => d.HandledSupplierBatch))
+            .ForMember(x => x.ArriveDate, y => y.MapFrom(d => d.HandledArriveDate))
+            .ForMember(x => x.ProduceDate, y => y.MapFrom(d => d.HandledProduceDate))
+            .ForMember(x => x.ExpireDate, y => y.MapFrom(d => d.ExpiredTime))
+            .ForMember(x => x.FromLocationCode, y => y.MapFrom(d => d.HandledFromLocationCode))
+            .ForMember(x => x.FromLocationArea, y => y.MapFrom(d => d.HandledFromLocationArea))
+            .ForMember(x => x.FromLocationGroup, y => y.MapFrom(d => d.HandledFromLocationGroup))
+            .ForMember(x => x.FromLocationErpCode, y => y.MapFrom(d => d.HandledFromLocationErpCode))
+            .ForMember(x => x.FromWarehouseCode, y => y.MapFrom(d => d.HandledFromWarehouseCode))
+            .ForMember(x => x.FromStatus, y => y.MapFrom(d => d.Status))
+            .ForMember(x => x.ToStatus, y => y.MapFrom(d => d.Status))
+            ;
+    }
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Notes/AssembleNoteAutoMapperProfile.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Notes/AssembleNoteAutoMapperProfile.cs
@ -0,0 +1,22 @@
+using AutoMapper;
+using Volo.Abp.AutoMapper;
+using Win_in.Sfs.Wms.Inventory.Application.Contracts;
+using Win_in.Sfs.Wms.Store.Domain;
+
+namespace Win_in.Sfs.Wms.Store.Event;
+
+public partial class StoreEventAutoMapperProfile : Profile
+{
+    private void AssembleNoteAutoMapperProfile()
+    {
+        CreateMap<AssembleNoteDetail, TransferLogEditInput>()
+            .Ignore(x => x.DocNumber)
+            .Ignore(x => x.JobNumber)
+            .Ignore(x => x.Worker)
+            .Ignore(x => x.TransType)
+            .Ignore(x => x.ExtraProperties)
+            .Ignore(x => x.TransSubType)
+            ;
+    }
+
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Notes/InjectionNoteAutoMapperProfile.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Notes/InjectionNoteAutoMapperProfile.cs
@ -0,0 +1,22 @@
+using AutoMapper;
+using Volo.Abp.AutoMapper;
+using Win_in.Sfs.Wms.Inventory.Application.Contracts;
+using Win_in.Sfs.Wms.Store.Domain;
+
+namespace Win_in.Sfs.Wms.Store.Event;
+
+public partial class StoreEventAutoMapperProfile : Profile
+{
+    private void InjectionNoteAutoMapperProfile()
+    {
+        CreateMap<InjectionNoteDetail, TransferLogEditInput>()
+            .Ignore(x => x.DocNumber)
+            .Ignore(x => x.JobNumber)
+            .Ignore(x => x.Worker)
+            .Ignore(x => x.TransType)
+            .Ignore(x => x.ExtraProperties)
+            .Ignore(x => x.TransSubType)
+            ;
+    }
+
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/AssembleRequestAutoMapperProfile.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/AssembleRequestAutoMapperProfile.cs
@ -0,0 +1,135 @@
+using AutoMapper;
+using Volo.Abp.AutoMapper;
+using Win_in.Sfs.Shared.Application;
+using Win_in.Sfs.Wms.Inventory.Application.Contracts;
+using Win_in.Sfs.Wms.Store.Application.Contracts;
+using Win_in.Sfs.Wms.Store.Domain;
+
+namespace Win_in.Sfs.Wms.Store.Event;
+
+public partial class StoreEventAutoMapperProfile : Profile
+{
+    private void AssembleRequestAutoMapperProfile()
+    {
+        CreateMap<AssembleRequest, AssembleJobEditInput>()
+            .ForMember(x => x.AssembleRequestNumber, y => y.MapFrom(d => d.Number))
+            .ForMember(x => x.RequestType, y => y.MapFrom(d => d.Type))
+            .Ignore(x => x.WarehouseCode)
+            .Ignore(x => x.Workshop)
+            .Ignore(x => x.UpStreamJobNumber)
+            .Ignore(x => x.JobType)
+            .Ignore(x => x.IsAutoComplete)
+            .Ignore(x => x.ExpiredTime)
+            .Ignore(x => x.JobDescription)
+            .Ignore(x => x.JobStatus)
+            .Ignore(x => x.WorkGroupCode)
+            .Ignore(x => x.Priority)
+            .Ignore(x => x.PriorityIncrement)
+            .Ignore(x => x.AcceptUserId)
+            .Ignore(x => x.AcceptTime)
+            .Ignore(x => x.AcceptUserName)
+            .Ignore(x => x.CompleteUserId)
+            .Ignore(x => x.CompleteUserName)
+            .Ignore(x => x.CompleteTime)
+            .Ignore(x => x.Details)
+            ;
+
+        CreateMap<AssembleRequestDetail, AssembleJobDetailInput>()
+            .ForMember(x => x.RequestLocationCode, y => y.MapFrom(d => d.ToLocationCode))
+            .Ignore(x => x.RecommendFromLocationArea)
+            .Ignore(x => x.RecommendFromLocationGroup)
+            .Ignore(x => x.HandledFromLocationArea)
+            .Ignore(x => x.HandledFromLocationGroup)
+            .Ignore(x => x.RecommendFromWarehouseCode)
+            .Ignore(x => x.HandledFromWarehouseCode)
+            .Ignore(x => x.OnTheWayLocationCode)
+            .Ignore(x => x.DistributionType)
+            .Ignore(x => x.RoundedQty)
+            .Ignore(x => x.Operation)
+            .Ignore(x => x.ExpiredTime)
+            .Ignore(x => x.TruncType)
+            .Ignore(x => x.PlanBeginTime)
+            .Ignore(x => x.PlannedSplitRule)
+            .Ignore(x => x.DeliveryQty)
+            .Ignore(x => x.Status)
+            .Ignore(x => x.RecommendContainerCode)
+            .Ignore(x => x.StdPackQty)
+            .Ignore(x => x.RecommendPackingCode)
+            .Ignore(x => x.HandledContainerCode)
+            .Ignore(x => x.HandledPackingCode)
+            .Ignore(x => x.RecommendSupplierBatch)
+            .Ignore(x => x.RecommendProduceDate)
+            .Ignore(x => x.RecommendArriveDate)
+            .Ignore(x => x.RecommendExpireDate)
+            .Ignore(x => x.HandledFromLocationCode)
+            .Ignore(x => x.HandledFromLocationErpCode)
+            .Ignore(x => x.HandledUom)
+            .Ignore(x => x.RecommendFromLocationErpCode)
+            .Ignore(x => x.HandledExpireDate)
+            .Ignore(x => x.HandledLot)
+            .Ignore(x => x.HandledArriveDate)
+            .Ignore(x => x.HandledProduceDate)
+            .Ignore(x => x.HandledQty)
+            .Ignore(x => x.RecommendQty)
+            .Ignore(x => x.Uom)
+            .Ignore(x => x.HandledSupplierBatch)
+            .Ignore(x => x.RecommendFromLocationCode)
+            .Ignore(x => x.RecommendLot)
+            .IgnoreIHasRecommendAndHandledFrom();
+
+        CreateMap<BalanceDTO, AssembleJobDetailInput>()
+            .ForMember(x => x.RecommendArriveDate, y => y.MapFrom(d => d.ArriveDate))
+            .ForMember(x => x.RecommendContainerCode, y => y.MapFrom(d => d.ContainerCode))
+            .ForMember(x => x.RecommendExpireDate, y => y.MapFrom(d => d.ExpireDate))
+            .ForMember(x => x.RecommendFromLocationCode, y => y.MapFrom(d => d.LocationCode))
+            .ForMember(x => x.RecommendFromLocationErpCode, y => y.MapFrom(d => d.LocationErpCode))
+            .ForMember(x => x.RecommendFromWarehouseCode, y => y.MapFrom(d => d.WarehouseCode))
+            .ForMember(x => x.RecommendFromLocationArea, y => y.MapFrom(d => d.LocationArea))
+            .ForMember(x => x.RecommendFromLocationGroup, y => y.MapFrom(d => d.LocationGroup))
+            .ForMember(x => x.RecommendLot, y => y.MapFrom(d => d.Lot))
+            .ForMember(x => x.RecommendPackingCode, y => y.MapFrom(d => d.PackingCode))
+            .ForMember(x => x.RecommendProduceDate, y => y.MapFrom(d => d.ProduceDate))
+            .ForMember(x => x.RecommendQty, y => y.MapFrom(d => d.Qty))
+            .ForMember(x => x.RecommendSupplierBatch, y => y.MapFrom(d => d.SupplierBatch))
+            .ForMember(x => x.Uom, y => y.MapFrom(d => d.Uom)).Ignore(x => x.HandledArriveDate)
+            .Ignore(x => x.HandledFromLocationArea)
+            .Ignore(x => x.HandledFromLocationGroup)
+            .Ignore(x => x.ToLocationErpCode)
+            .Ignore(x => x.ToWarehouseCode)
+            .Ignore(x => x.ToLocationArea)
+            .Ignore(x => x.ToLocationGroup)
+            .Ignore(x => x.HandledFromWarehouseCode)
+            .Ignore(x => x.RequestLocationCode)
+            .Ignore(x => x.ToLocationCode)
+            .Ignore(x => x.ProdLine)
+            .Ignore(x => x.WorkStation)
+            .Ignore(x => x.HandledContainerCode)
+            .Ignore(x => x.HandledExpireDate)
+            .Ignore(x => x.HandledFromLocationCode)
+            .Ignore(x => x.HandledFromLocationErpCode)
+            .Ignore(x => x.HandledLot)
+            .Ignore(x => x.HandledPackingCode)
+            .Ignore(x => x.HandledProduceDate)
+            .Ignore(x => x.HandledQty)
+            .Ignore(x => x.HandledSupplierBatch)
+            .Ignore(x => x.HandledUom)
+            .Ignore(x => x.Remark)
+            .Ignore(x => x.OnTheWayLocationCode)
+            .Ignore(x => x.DistributionType)
+            .Ignore(x => x.RoundedQty)
+            .Ignore(x => x.Operation)
+            .Ignore(x => x.ExpiredTime)
+            .Ignore(x => x.TruncType)
+            .Ignore(x => x.PlanBeginTime)
+            .Ignore(x => x.PlannedSplitRule)
+            .Ignore(x => x.DeliveryQty)
+            .Ignore(x => x.RequestLocationCode)
+            .Ignore(x => x.ToLocationCode)
+            .Ignore(x => x.ProdLine)
+            .Ignore(x => x.WorkStation)
+            .Ignore(x => x.PositionCode)
+            .Ignore(x => x.RecommendType)
+            .IgnoreIHasRecommendAndHandledFrom();
+
+    }
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/InjectionRequestAutoMapperProfile.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/InjectionRequestAutoMapperProfile.cs
@ -15,6 +15,7 @@ public partial class StoreEventAutoMapperProfile : Profile
            .ForMember(x => x.InjectionRequestNumber, y => y.MapFrom(d => d.Number))
            .ForMember(x => x.RequestType, y => y.MapFrom(d => d.Type))
            .Ignore(x => x.WarehouseCode)
+            .Ignore(x => x.Workshop)
            .Ignore(x => x.UpStreamJobNumber)
            .Ignore(x => x.JobType)
            .Ignore(x => x.IsAutoComplete)
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/AssembleJobEventHandler.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/AssembleJobEventHandler.cs
@ -0,0 +1,130 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Volo.Abp.EventBus;
+using Volo.Abp.Uow;
+using Win_in.Sfs.Basedata.Application.Contracts;
+using Win_in.Sfs.Shared.Domain.Shared;
+using Win_in.Sfs.Shared.Event;
+using Win_in.Sfs.Wms.Store.Application.Contracts;
+using Win_in.Sfs.Wms.Store.Domain;
+using Win_in.Sfs.Wms.Store.Domain.Shared;
+
+namespace Win_in.Sfs.Wms.Store.Event.BusinessJob;
+
+public class AssembleJobEventHandler :
+    StoreEventHandlerBase
+    , ILocalEventHandler<SfsCompletedEntityEventData<AssembleJob>>
+{
+    private const EnumTransType TransType = EnumTransType.Issue;
+
+    private readonly IAssembleNoteAppService _assembleNoteAppService;
+    private readonly ILocationAppService _locationAppService;
+
+    public AssembleJobEventHandler(IAssembleNoteAppService assembleNoteAppService, ILocationAppService locationAppService)
+    {
+        _assembleNoteAppService = assembleNoteAppService;
+        _locationAppService = locationAppService;
+    }
+
+    /// <summary>
+    ///     执行后
+    /// </summary>
+    /// <param name="eventData"></param>
+    /// <returns></returns>
+    [UnitOfWork]
+    public virtual async Task HandleEventAsync(SfsCompletedEntityEventData<AssembleJob> eventData)
+    {
+        var entity = eventData.Entity;
+        var assembleNote = await BuildAssembleNoteAsync(entity).ConfigureAwait(false);
+        await _assembleNoteAppService.CreateAsync(assembleNote).ConfigureAwait(false);
+    }
+
+    #region 私有
+
+    /// <summary>
+    ///     创建补料记录实体
+    /// </summary>
+    /// <param name="entity"></param>
+    /// <returns></returns>
+    private async Task<AssembleNoteEditInput> BuildAssembleNoteAsync(AssembleJob entity)
+    {
+        var assembleNoteCreateInput = ObjectMapper.Map<AssembleJob, AssembleNoteEditInput>(entity);
+        assembleNoteCreateInput.JobNumber = entity.Number;
+        var locationCodes = assembleNoteCreateInput.Details.Select(p => p.ToLocationCode).Distinct().ToList();
+        var locations = await _locationAppService.GetByCodesAsync(locationCodes).ConfigureAwait(false);
+
+        assembleNoteCreateInput.Details.RemoveAll(p => p.Qty == 0);
+
+        foreach (var detail in assembleNoteCreateInput.Details)
+        {
+            var location = locations.First(p => p.Code == detail.ToLocationCode);
+            await RemovePackingCodeAndContainerCodeAndLotAsync(detail, location.Type).ConfigureAwait(false); //去箱 去托 去批
+
+            detail.ToLocationArea = location.AreaCode;
+            detail.ToLocationGroup = location.LocationGroupCode;
+            detail.ToLocationErpCode = location.ErpLocationCode;
+            detail.ToWarehouseCode = location.WarehouseCode;
+        }
+
+        return assembleNoteCreateInput;
+    }
+
+    /// <summary>
+    ///     去除箱码 托码 批次
+    /// </summary>
+    private async Task RemovePackingCodeAndContainerCodeAndLotAsync(AssembleNoteDetailInput assembleNoteDetail,
+        EnumLocationType locationType)
+    {
+        switch (locationType)
+        {
+            case EnumLocationType.WIP:
+                {
+                    //用开关控制 发料到线边后去除箱码和托码   ???
+                    if (await SettingManager.IsTrueAsync(StoreSettings.Issue.ToWip.IsRemovePackingCode)
+                            .ConfigureAwait(false))
+                    {
+                        assembleNoteDetail.ToPackingCode = "";
+                    }
+
+                    if (await SettingManager.IsTrueAsync(StoreSettings.Issue.ToWip.IsRemoveContainerCode)
+                            .ConfigureAwait(false))
+                    {
+                        assembleNoteDetail.ToContainerCode = "";
+                    }
+
+                    if (await SettingManager.IsTrueAsync(StoreSettings.Issue.ToWip.IsRemoveLot).ConfigureAwait(false))
+                    {
+                        assembleNoteDetail.ToLot = "";
+                    }
+
+                    break;
+                }
+            case EnumLocationType.SEMI:
+                {
+                    //用开关控制 发料到后去除箱码和托码   ???
+                    if (await SettingManager.IsTrueAsync(StoreSettings.Issue.ToSemi.IsRemovePackingCode)
+                            .ConfigureAwait(false))
+                    {
+                        assembleNoteDetail.ToPackingCode = "";
+                    }
+
+                    if (await SettingManager.IsTrueAsync(StoreSettings.Issue.ToSemi.IsRemoveContainerCode)
+                            .ConfigureAwait(false))
+                    {
+                        assembleNoteDetail.ToContainerCode = "";
+                    }
+
+                    if (await SettingManager.IsTrueAsync(StoreSettings.Issue.ToSemi.IsRemoveLot).ConfigureAwait(false))
+                    {
+                        assembleNoteDetail.ToLot = "";
+                    }
+
+                    break;
+                }
+        }
+    }
+
+    #endregion
+}
--- 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
@ -0,0 +1,283 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using FluentValidation.Validators;
+using Volo.Abp;
+using Volo.Abp.EventBus;
+using Volo.Abp.SettingManagement;
+using Win_in.Sfs.Basedata.Application.Contracts;
+using Win_in.Sfs.Shared.Domain.Shared;
+using Win_in.Sfs.Shared.Event;
+using Win_in.Sfs.Wms.Inventory.Application.Contracts;
+using Win_in.Sfs.Wms.Store.Application.Contracts;
+using Win_in.Sfs.Wms.Store.Domain;
+using Win_in.Sfs.Wms.Store.Domain.Shared;
+
+namespace Win_in.Sfs.Wms.Store.Event.BusinessRequest;
+
+public class AssembleRequestEventHandler
+    : StoreEventHandlerBase
+    , ILocalEventHandler<SfsHandledEntityEventData<AssembleRequest>>
+    , ILocalEventHandler<SfsAbortedEntityEventData<AssembleRequest>>
+    , ILocalEventHandler<SfsCompletedEntityEventData<AssembleRequest>>
+    , ILocalEventHandler<SfsCreatedEntityEventData<AssembleRequest>>
+    , ILocalEventHandler<SfsCreatedEntityEventData<List<AssembleRequest>>>
+{
+    private readonly IAssembleJobAppService _assembleJobAppService;
+    private readonly IProductionLineAppService _productionLineAppService;
+    private readonly IAssembleRequestManager _assembleRequestManager;
+    private readonly ILocationAppService _locationAppService;
+    private readonly IBalanceAppService _balanceAppService;
+
+    public AssembleRequestEventHandler(
+        IAssembleJobAppService assembleJobAppService
+        , IProductionLineAppService productionLineAppService
+        , IAssembleRequestManager assembleRequestManager
+        , ILocationAppService locationAppService
+        , IBalanceAppService balanceAppService)
+    {
+        _assembleJobAppService = assembleJobAppService;
+        _productionLineAppService = productionLineAppService;
+        _assembleRequestManager = assembleRequestManager;
+        _locationAppService = locationAppService;
+        _balanceAppService = balanceAppService;
+    }
+
+    /// <summary>
+    /// 创建后
+    /// </summary>
+    /// <param name="eventData">Event data</param>
+    public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<AssembleRequest> eventData)
+    {
+        var entity = eventData.Entity;
+
+        //if (entity.AutoSubmit)
+        //{
+        //    await _assembleRequestManager.SubmitAsync(entity).ConfigureAwait(false);
+        //}
+    }
+
+    /// <summary>
+    /// 批量创建后
+    /// </summary>
+    /// <param name="eventData">Event data</param>
+    public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<List<AssembleRequest>> eventData)
+    {
+        var entitys = eventData.Entity;
+        foreach (var entity in entitys)
+        {
+            if (entity.AutoSubmit)
+            {
+                await _assembleRequestManager.SubmitAsync(entity).ConfigureAwait(false);
+            }
+
+        }
+    }
+
+    /// <summary>
+    /// 执行后
+    /// </summary>
+    /// <param name="eventData"></param>
+    /// <returns></returns>
+    public virtual async Task HandleEventAsync(SfsHandledEntityEventData<AssembleRequest> eventData)
+    {
+        var entity = eventData.Entity;
+        var assembleJobs = await BuildAssembleJobAsync(entity).ConfigureAwait(false);
+        if (assembleJobs.Any())
+        {
+            await _assembleJobAppService.CreateManyAsync(assembleJobs).ConfigureAwait(false);
+        }
+    }
+
+    /// <summary>
+    /// 驳回后
+    /// </summary>
+    /// <param name="eventData"></param>
+    /// <returns></returns>
+    public virtual async Task HandleEventAsync(SfsAbortedEntityEventData<AssembleRequest> eventData)
+    {
+
+    }
+
+    /// <summary>
+    /// 完成后
+    /// </summary>
+    /// <param name="eventData"></param>
+    /// <returns></returns>
+    public virtual async Task HandleEventAsync(SfsCompletedEntityEventData<AssembleRequest> eventData)
+    {
+        _ = eventData.Entity;
+        // await _assembleJobAppService.CompleteByAssembleRequestAsync(entity.Number);
+
+        await Task.CompletedTask.ConfigureAwait(false);
+    }
+
+    #region 私有
+
+    private async Task<List<AssembleJobEditInput>> BuildAssembleJobAsync
+        (AssembleRequest assembleRequest)
+    {
+        var jobs = new List<AssembleJobEditInput>();
+
+        var transactionType = await TransactionTypeAclService.GetByTransTypeAsync(EnumTransType.Issue, EnumTransSubType.None).ConfigureAwait(false);//库存事务
+
+        var toLocationCodes = assembleRequest.Details.Select(p => p.ToLocationCode).Distinct().ToList();//所有发送库位的集合
+        var toLocations = await _locationAppService.GetByCodesAsync(toLocationCodes).ConfigureAwait(false);//所有库位的集合
+
+        var assembleRequestDetails = assembleRequest.Details.Where(p => p.ToBeIssuedQty > 0);//所有还没发送物品的集合
+        foreach (var assembleRequestDetail in assembleRequestDetails)//如果有还有剩余未叫料的数量 则创建新的任务
+        {
+            var toLocation = toLocations.FirstOrDefault(p => p.Code == assembleRequestDetail.ToLocationCode);//判断目标库位是否存在
+            Check.NotNull(toLocation, "库位代码", $"库位 {assembleRequestDetail.ToLocationCode} 不存在");
+
+            //创建详情
+            var jobDetails = await BuildAssembleJobDetailInputsAsync(assembleRequest, assembleRequestDetail, transactionType, toLocation.LocationGroupCode).ConfigureAwait(false);
+            if (!jobDetails.Any())
+            {
+                continue;
+            }
+
+            var fromLocationCode = jobDetails[0].RecommendFromLocationCode;
+            var fromLocation = await _locationAppService.GetByCodeAsync(fromLocationCode).ConfigureAwait(false);
+            var job = jobs.FirstOrDefault(p => p.WorkGroupCode == fromLocation?.WorkGroupCode);
+            if (job == null || job.Details.Any(p => p.ToLocationCode != assembleRequestDetail.ToLocationCode))
+            {
+                job = BuildAssembleJobCreateInput(assembleRequest, fromLocation);
+                jobs.Add(job);
+            }
+            job.Details.AddRange(jobDetails);
+            if (assembleRequestDetail.ToBeIssuedQty < 0)
+            {
+                assembleRequestDetail.Status = EnumStatus.Close;
+            }
+        }
+
+        jobs = jobs.Where(p => p.Details.Any()).ToList();
+
+        var openRequestDetails =
+            assembleRequest.Details.Where(p => p.Status != EnumStatus.Close).ToList();
+
+        if (!openRequestDetails.Any())
+        {
+            return jobs;
+        }
+
+
+        var enableMultipleCreateAssembleJob = await SettingManager.IsTrueAsync(StoreSettings.MaterialRequest.EnableMultipleCreateIssueJob).ConfigureAwait(false);
+        if (enableMultipleCreateAssembleJob)
+        {
+
+            //assembleRequest.Partial();
+        }
+        else
+        {
+            var sb = new StringBuilder();
+            foreach (var openRequestDetail in openRequestDetails)
+            {
+                sb.AppendLine($"{openRequestDetail.ItemCode}请求数量 {openRequestDetail.Qty},可用库存数量 {openRequestDetail.IssuedQty}");
+            }
+            throw new UserFriendlyException($"{sb} 可用库存数量不足, 无法生成发料任务");
+        }
+        return jobs;
+    }
+
+    private AssembleJobEditInput BuildAssembleJobCreateInput(AssembleRequest assembleRequest, LocationDTO fromLocation)
+    {
+        AssembleJobEditInput job;
+        job = ObjectMapper.Map<AssembleRequest, AssembleJobEditInput>(assembleRequest);
+        job.JobType = EnumJobType.IssueJob;
+        job.JobStatus = EnumJobStatus.Open;
+        job.WorkGroupCode = fromLocation.WorkGroupCode;
+        job.WarehouseCode = fromLocation.WarehouseCode;
+        job.ProdLine = fromLocation.LocationGroupCode;
+        job.Worker = assembleRequest.Worker;
+        if (string.IsNullOrEmpty(job.Worker))
+        {
+            job.Worker = "admin";
+        }
+        job.AssembleRequestNumber = assembleRequest.Number;
+        return job;
+    }
+
+    private async Task<List<AssembleJobDetailInput>> BuildAssembleJobDetailInputsAsync(AssembleRequest assembleRequest,
+        AssembleRequestDetail assembleRequestDetail, TransactionTypeDTO transactionType, string toLocationGroupCode)
+    {
+        var jobDetails = new List<AssembleJobDetailInput>();
+        var input = new RecommendBalanceRequestInput()
+        {
+            ItemCode = assembleRequestDetail.ItemCode,
+            Qty = assembleRequestDetail.ToBeIssuedQty,
+            LocationTypes = transactionType.OutLocationTypes,
+            LocationAreas = new List<string> { assembleRequestDetail.FromLocationArea },
+            Statuses = transactionType.OutInventoryStatuses,
+        };
+        //获取推荐库存
+        var recommendList = await _balanceAppService.GetRecommendBalancesAsync(input).ConfigureAwait(false);
+        //没有推荐库存时 跳过此明细 不生成任务
+        if (recommendList.Count != 0)
+        {
+            foreach (var recommend in recommendList)
+            {
+                //拿走需求量
+                var detail = await BuildAssembleJobDetailAsync(assembleRequestDetail, recommend, toLocationGroupCode).ConfigureAwait(false);
+                if (assembleRequest.UseOnTheWayLocation)
+                {
+                    //获取在途库
+                    var locationDto = await _locationAppService.GetFirstByTypeAsync(EnumLocationType.TRANSPORT).ConfigureAwait(false);
+
+                    detail.OnTheWayLocationCode = locationDto.Code;
+                }
+
+                jobDetails.Add(detail);
+                assembleRequestDetail.IssuedQty += recommend.Qty;
+
+                //await _assembleRequestManager.UpdateDetailsAsync(assembleRequest).ConfigureAwait(false);
+
+            }
+        }
+        return jobDetails;
+    }
+
+    private async Task<AssembleJobDetailInput> BuildAssembleJobDetailAsync(AssembleRequestDetail assembleRequestDetail, BalanceDTO balance, string toLocationGroupCode)
+    {
+
+        //ProductionLineDTO prodLine = await _productionLineAppService.GetByLocationGroupCodeAsync(toLocationGroupCode).ConfigureAwait(false);
+
+        var detail = ObjectMapper.Map<BalanceDTO, AssembleJobDetailInput>(balance);
+        detail.RequestLocationCode = assembleRequestDetail.ToLocationCode;
+        detail.WorkStation = assembleRequestDetail.WorkStation;
+        detail.ExpiredTime = assembleRequestDetail.ExpiredTime;
+        detail.PositionCode = assembleRequestDetail.PositionCode;
+        detail.RecommendType = assembleRequestDetail.RecommendType;
+
+        detail.RecommendPackingCode = balance.PackingCode;
+        detail.RecommendContainerCode = balance.ContainerCode;
+        detail.RecommendSupplierBatch = balance.SupplierBatch;
+        detail.RecommendProduceDate = balance.ProduceDate;
+        detail.RecommendExpireDate = balance.ExpireDate;
+        detail.RecommendLot = balance.Lot;
+        detail.RecommendProduceDate = balance.ProduceDate;
+        detail.RecommendArriveDate = balance.ArriveDate;
+        detail.RecommendFromLocationArea = balance.LocationArea;
+        detail.RecommendFromLocationCode = balance.LocationCode;
+        detail.RecommendFromLocationErpCode = balance.LocationErpCode;
+        detail.RecommendFromLocationGroup = balance.LocationGroup;
+        detail.RecommendFromWarehouseCode = balance.WarehouseCode;
+        detail.RecommendQty = balance.Qty;
+        detail.Uom = balance.Uom;
+
+        detail.ToLocationCode = assembleRequestDetail.ToLocationCode;
+        detail.ToLocationErpCode = assembleRequestDetail.ToLocationErpCode;
+        detail.ToLocationArea = assembleRequestDetail.ToLocationArea;
+        detail.ToWarehouseCode = assembleRequestDetail.ToWarehouseCode;
+
+        //detail.ProdLine = prodLine == null ? toLocationGroupCode : prodLine.Code;
+        detail.ProdLine = toLocationGroupCode;
+        await Task.CompletedTask.ConfigureAwait(false);
+        return detail;
+
+    }
+
+    #endregion
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/StoreEventAutoMapperProfile.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/StoreEventAutoMapperProfile.cs
@ -36,6 +36,7 @@ public partial class StoreEventAutoMapperProfile : Profile
        InspectJobAutoMapperProfile();
        IssueJobAutoMapperProfile();
        InjectionJobAutoMapperProfile();
+        AssembleJobAutoMapperProfile();
        JisDeliverJobAutoMapperProfile();
        ProductionReturnJobAutoMapperProfile();
        ProductReceiveJobAutoMapperProfile();
@ -66,11 +67,14 @@ public partial class StoreEventAutoMapperProfile : Profile
        InventoryTransferNoteAutoMapperProfile();
        IsolationNoteAutoMapperProfile();
        IssueNoteAutoMapperProfile();
+        InjectionNoteAutoMapperProfile();
+        AssembleNoteAutoMapperProfile();
        ItemTransformNoteAutoMapperProfile();
        JisDeliverNoteAutoMapperProfile();
        JisProductReceiptNoteAutoMapperProfile();
        MaterialRequestAutoMapperProfile();
        InjectionRequestAutoMapperProfile();
+        AssembleRequestAutoMapperProfile();
        ProductionReturnRequestAutoMapperProfile();
        ProductionReturnNoteAutoMapperProfile();
        ProductReceiptNoteAutoMapperProfile();