注塑功能更新

be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/InjectionJobController.cs → be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/InjectionPlanJobController.cs

@@ -18,13 +18,13 @@ using Win_in.Sfs.Wms.Store.Application.Contracts;
 namespace Win_in.Sfs.Wms.Pda.Controllers.Jobs;
 
 /// <summary>
-/// 注塑叫料任务
+/// 注塑计划任务
 /// </summary>
 [ApiController]
-[Route($"{PdaHostConst.ROOT_ROUTE}job/injection")]
+[Route($"{PdaHostConst.ROOT_ROUTE}job/injection-plan")]
-public class InjectionIssueJobController : AbpController
+public class InjectionPlanJobController : AbpController
 {
-    private readonly IInjectionIssueJobAppService _injectionJobAppService;
+    private readonly IInjectionPlanJobAppService _injectionJobAppService;
 
     private readonly IUserWorkGroupAppService _userWorkGroupAppService;
 
@@ -35,8 +35,8 @@ public class InjectionIssueJobController : AbpController
     /// </summary>
     /// <param name="injectionJobAppService"></param>
     /// <param name="userWorkGroupAppService"></param>
-    public InjectionIssueJobController(
+    public InjectionPlanJobController(
-        IInjectionIssueJobAppService injectionJobAppService,
+        IInjectionPlanJobAppService injectionJobAppService,
         IDictAppService dictApp
         , IUserWorkGroupAppService userWorkGroupAppService)
     {
@@ -52,7 +52,7 @@ public class InjectionIssueJobController : AbpController
     /// <returns></returns>
     [HttpGet("{id}")]
 
-    public virtual async Task<ActionResult<InjectionIssueJobDTO>> GetAsync(Guid id)
+    public virtual async Task<ActionResult<InjectionPlanJobDTO>> GetAsync(Guid id)
     {
         var result = await _injectionJobAppService.GetAsync(id).ConfigureAwait(false);
         return Ok(result);
@@ -64,7 +64,7 @@ public class InjectionIssueJobController : AbpController
     /// <param name="sfsRequestDTO"></param>
     /// <returns></returns>
     [HttpPost("list")]
-    public virtual async Task<PagedResultDto<InjectionIssueJobDTO>> GetListAsync(SfsJobRequestInputBase sfsRequestDTO)
+    public virtual async Task<PagedResultDto<InjectionPlanJobDTO>> GetListAsync(SfsJobRequestInputBase sfsRequestDTO)
     {
         var list = await _injectionJobAppService.GetPagedListByFilterAsync(sfsRequestDTO, true).ConfigureAwait(false);
         return list;
@@ -77,7 +77,7 @@ public class InjectionIssueJobController : AbpController
     /// <param name="pageIndex"></param>
     /// <returns></returns>
     [HttpGet("list")]
-    public virtual async Task<PagedResultDto<InjectionIssueJobDTO>> GetListAsync(int pageSize, int pageIndex)
+    public virtual async Task<PagedResultDto<InjectionPlanJobDTO>> GetListAsync(int pageSize, int pageIndex)
     {
         var status = new List<int>() { (int)EnumJobStatus.Open, (int)EnumJobStatus.Doing };
         var jsonStatus = JsonSerializer.Serialize(status);
@@ -86,7 +86,7 @@ public class InjectionIssueJobController : AbpController
         {
             MaxResultCount = pageSize,
             SkipCount = (pageIndex - 1) * pageSize,
-            Sorting = $"{nameof(InjectionIssueJobDTO.CreationTime)} ASC",
+            Sorting = $"{nameof(InjectionPlanJobDTO.CreationTime)} ASC",
             Condition = new Condition
             {
                 Filters = new List<Filter>
@@ -109,7 +109,7 @@ public class InjectionIssueJobController : AbpController
     /// <param name="jobNumber"></param>
     /// <returns></returns>
     [HttpGet("by-number/{jobNumber}")]
-    public virtual async Task<ActionResult<InjectionIssueJobDTO>> GetByNumberAsync(string jobNumber)
+    public virtual async Task<ActionResult<InjectionPlanJobDTO>> GetByNumberAsync(string jobNumber)
     {
         var jobDto = await _injectionJobAppService.GetByNumberAsync(jobNumber).ConfigureAwait(false);
         if (jobDto == null)
@@ -143,13 +143,13 @@ public class InjectionIssueJobController : AbpController
 
         var request = new SfsJobRequestInputBase
         {
-            Sorting = $"{nameof(InjectionIssueJobDTO.Priority)} ASC",
+            Sorting = $"{nameof(InjectionPlanJobDTO.Priority)} ASC",
             Condition = new Condition
             {
                 Filters = new List<Filter>
                 {
-                    new(nameof(InjectionIssueJobDTO.WorkGroupCode),jsonCodes,"In"),
+                    new(nameof(InjectionPlanJobDTO.WorkGroupCode),jsonCodes,"In"),
-                    new(nameof(InjectionIssueJobDTO.JobStatus),jsonStatus,"In")
+                    new(nameof(InjectionPlanJobDTO.JobStatus),jsonStatus,"In")
                 }
             }
         };
@@ -188,7 +188,7 @@ public class InjectionIssueJobController : AbpController
     /// <param name="dto"></param>
     /// <returns></returns>
     [HttpPost("finish/{id}")]
-    public virtual async Task FinishAsync(Guid id, [FromBody] InjectionIssueJobDTO dto)
+    public virtual async Task FinishAsync(Guid id, [FromBody] InjectionPlanJobDTO dto)
     {
         await _injectionJobAppService.CompleteAsync(id, dto).ConfigureAwait(false);
     }

be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/InjectionNoteController.cs → be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/InjectionPlanNoteController.cs

@@ -6,12 +6,12 @@ using Win_in.Sfs.Wms.Store.Application.Contracts;
 namespace Win_in.Sfs.Wms.Pda.Controllers.Stores;
 
 /// <summary>
-/// 注塑叫料记录
+/// 注塑计划记录
 /// </summary>
 [ApiController]
-[Route($"{PdaHostConst.ROOT_ROUTE}store/injection-note")]
+[Route($"{PdaHostConst.ROOT_ROUTE}store/injection-plan-note")]
 
-public class InjectionIssueNoteController : AbpController
+public class InjectionPlanNoteController : AbpController
 {
     private readonly IInjectionIssueNoteAppService _injectionNoteAppService;
 
@@ -19,13 +19,13 @@ public class InjectionIssueNoteController : AbpController
     /// 
     /// </summary>
     /// <param name="injectionNoteAppService"></param>
-    public InjectionIssueNoteController(IInjectionIssueNoteAppService injectionNoteAppService)
+    public InjectionPlanNoteController(IInjectionIssueNoteAppService injectionNoteAppService)
     {
         _injectionNoteAppService = injectionNoteAppService;
     }
 
     /// <summary>
-    /// 创建注塑叫料记录
+    /// 创建注塑计划记录
     /// </summary>
     /// <param name="input">CreateInput</param>
     /// <returns></returns>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/InjectionPlanJobs/DTOs/InjectionPlanJobDTO.cs

@@ -0,0 +1,38 @@
+using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+/// <summary>
+/// 注塑计划任务
+/// </summary>
+[Display(Name = "注塑计划任务")]
+public class InjectionPlanJobDTO : SfsJobDTOBase<InjectionPlanJobDetailDTO>
+{
+    /// <summary>
+    /// 叫料类型
+    /// </summary>
+    [Display(Name = "叫料类型")]
+    public EnumIssueRequestType IssueRequestType { 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 InjectionPlanRequestNumber { get; set; }
+
+    /// <summary>
+    ///     使用在途库
+    /// </summary>
+    [Display(Name = "使用在途库")]
+    public bool UseOnTheWayLocation { get; set; }
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/InjectionPlanJobs/DTOs/InjectionPlanJobDetailDTO.cs

@@ -0,0 +1,520 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using Win_in.Sfs.Shared.Application.Contracts;
+using Win_in.Sfs.Shared.Domain.Shared;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public class InjectionPlanJobDetailDTO : SfsDetailDTOBase
+{
+    #region 库存基础信息
+
+    /// <summary>
+    ///     物品代码
+    /// </summary>
+    public string ItemCode { get; set; }
+
+    /// <summary>
+    ///     物品名称
+    /// </summary>
+    public string ItemName { get; set; }
+
+    /// <summary>
+    ///     物品描述1
+    /// </summary>
+    public string ItemDesc1 { get; set; }
+
+    /// <summary>
+    ///     物品描述2
+    /// </summary>
+    public string ItemDesc2 { get; set; }
+
+    /// <summary>
+    ///     标包数量
+    /// </summary>
+    [Display(Name = "标包数量")]
+    [Column(TypeName = "decimal(18,6)")]
+    public decimal StdPackQty { get; set; }
+
+    /// <summary>
+    ///     库存状态
+    /// </summary>
+    public EnumInventoryStatus Status { get; set; }
+
+    /// <summary>
+    ///     计量单位
+    /// </summary>
+    public string Uom { get; set; }
+
+    #endregion
+
+    #region 请求信息
+
+    /// <summary>
+    ///     请求库位
+    /// </summary>
+    public string RequestLocationCode { get; set; }
+
+    /// <summary>
+    ///     到库区
+    /// </summary>
+    public string RequestLocationArea { get; set; }
+
+    /// <summary>
+    ///     到库位组
+    /// </summary>
+    public string RequestLocationGroup { get; set; }
+
+    /// <summary>
+    ///     到ERP库位
+    /// </summary>
+    public string RequestLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     到仓库
+    /// </summary>
+    public string RequestWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     在途库库位
+    /// </summary>
+    public string OnTheWayLocationCode { get; set; }
+
+    /// <summary>
+    ///     生产线
+    /// </summary>
+    public string ProdLine { get; set; }
+
+    /// <summary>
+    ///     位置码
+    /// </summary>
+    public string PositionCode { get; set; }
+
+    /// <summary>
+    ///     推荐的类型
+    /// </summary>
+    public EnumRecommendType RecommendType { get; set; }
+
+    /// <summary>
+    ///     需求数量
+    /// </summary>
+    public decimal RequestQty { get; set; }
+
+    #endregion
+
+    #region 推荐来源
+
+    /// <summary>
+    ///     推荐来源托标签
+    /// </summary>
+    public string RecommendFromContainerCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源箱标签
+    /// </summary>
+    public string RecommendFromPackingCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次供应商批次
+    /// </summary>
+    public string RecommendFromSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次到货时间
+    /// </summary>
+    public DateTime RecommendFromArriveDate { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次生产时间
+    /// </summary>
+    public DateTime RecommendFromProduceDate { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次过期时间
+    /// </summary>
+    public DateTime RecommendFromExpireDate { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次排序
+    /// </summary>
+    public string RecommendFromLot { get; set; }
+
+    /// <summary>
+    ///     推荐来源库位
+    /// </summary>
+    public string RecommendFromLocationCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源库区
+    /// </summary>
+    public string RecommendFromLocationArea { get; set; }
+
+    /// <summary>
+    ///     推荐来源库位组
+    /// </summary>
+    public string RecommendFromLocationGroup { get; set; }
+
+    /// <summary>
+    ///     推荐来源ERP库位
+    /// </summary>
+    public string RecommendFromLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源仓库
+    /// </summary>
+    public string RecommendFromWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源数量
+    /// </summary>
+    public decimal RecommendFromQty { get; set; }
+
+    #endregion
+
+    #region 推荐目标
+
+    /// <summary>
+    ///     推荐目标托标签
+    /// </summary>
+    public string RecommendToContainerCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标箱标签
+    /// </summary>
+    public string RecommendToPackingCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次供应商批次
+    /// </summary>
+    public string RecommendToSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次到货时间
+    /// </summary>
+    public DateTime RecommendToArriveDate { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次生产时间
+    /// </summary>
+    public DateTime RecommendToProduceDate { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次过期时间
+    /// </summary>
+    public DateTime RecommendToExpireDate { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次排序
+    /// </summary>
+    public string RecommendToLot { get; set; }
+
+    /// <summary>
+    ///     推荐目标库位
+    /// </summary>
+    public string RecommendToLocationCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标库区
+    /// </summary>
+    public string RecommendToLocationArea { get; set; }
+
+    /// <summary>
+    ///     推荐目标库位组
+    /// </summary>
+    public string RecommendToLocationGroup { get; set; }
+
+    /// <summary>
+    ///     推荐目标ERP库位
+    /// </summary>
+    public string RecommendToLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标仓库
+    /// </summary>
+    public string RecommendToWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标数量
+    /// </summary>
+    public decimal RecommendToQty { get; set; }
+
+    #endregion
+
+    #region 库移来源
+
+    /// <summary>
+    ///     库移来源托标签
+    /// </summary>
+    public string TransferLibFromContainerCode { get; set; }
+
+    /// <summary>
+    ///     库移来源箱标签
+    /// </summary>
+    public string TransferLibFromPackingCode { get; set; }
+
+    /// <summary>
+    ///     库移来源批次供应商批次
+    /// </summary>
+    public string TransferLibFromSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     库移来源批次到货时间
+    /// </summary>
+    public DateTime TransferLibFromArriveDate { get; set; }
+
+    /// <summary>
+    ///     库移来源批次生产时间
+    /// </summary>
+    public DateTime TransferLibFromProduceDate { get; set; }
+
+    /// <summary>
+    ///     库移来源批次过期时间
+    /// </summary>
+    public DateTime TransferLibFromExpireDate { get; set; }
+
+    /// <summary>
+    ///     库移来源批次排序
+    /// </summary>
+    public string TransferLibFromLot { get; set; }
+
+    /// <summary>
+    ///     库移来源库位
+    /// </summary>
+    public string TransferLibFromLocationCode { get; set; }
+
+    /// <summary>
+    ///     库移来源库区
+    /// </summary>
+    public string TransferLibFromLocationArea { get; set; }
+
+    /// <summary>
+    ///     库移来源库位组
+    /// </summary>
+    public string TransferLibFromLocationGroup { get; set; }
+
+    /// <summary>
+    ///     库移来源ERP库位
+    /// </summary>
+    public string TransferLibFromLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     库移来源仓库
+    /// </summary>
+    public string TransferLibFromWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     库移来源数量
+    /// </summary>
+    public decimal TransferLibFromQty { get; set; }
+
+    #endregion
+
+    #region 库移目标
+
+    /// <summary>
+    ///     库移目标托标签
+    /// </summary>
+    public string TransferLibToContainerCode { get; set; }
+
+    /// <summary>
+    ///     库移目标箱标签
+    /// </summary>
+    public string TransferLibToPackingCode { get; set; }
+
+    /// <summary>
+    ///     库移目标批次供应商批次
+    /// </summary>
+    public string TransferLibToSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     库移目标批次到货时间
+    /// </summary>
+    public DateTime TransferLibToArriveDate { get; set; }
+
+    /// <summary>
+    ///     库移目标批次生产时间
+    /// </summary>
+    public DateTime TransferLibToProduceDate { get; set; }
+
+    /// <summary>
+    ///     库移目标批次过期时间
+    /// </summary>
+    public DateTime TransferLibToExpireDate { get; set; }
+
+    /// <summary>
+    ///     库移目标批次排序
+    /// </summary>
+    public string TransferLibToLot { get; set; }
+
+    /// <summary>
+    ///     库移目标库位
+    /// </summary>
+    public string TransferLibToLocationCode { get; set; }
+
+    /// <summary>
+    ///     库移目标库区
+    /// </summary>
+    public string TransferLibToLocationArea { get; set; }
+
+    /// <summary>
+    ///     库移目标库位组
+    /// </summary>
+    public string TransferLibToLocationGroup { get; set; }
+
+    /// <summary>
+    ///     库移目标ERP库位
+    /// </summary>
+    public string TransferLibToLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     库移目标仓库
+    /// </summary>
+    public string TransferLibToWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     库移目标数量
+    /// </summary>
+    public decimal TransferLibToQty { get; set; }
+
+    #endregion
+
+    #region 实际来源
+
+    /// <summary>
+    ///     实际目标托标签
+    /// </summary>
+    public string HandledFromContainerCode { get; set; }
+
+    /// <summary>
+    ///     实际箱标签
+    /// </summary>
+    public string HandledFromPackingCode { get; set; }
+
+    /// <summary>
+    ///     实际批次供应商批次
+    /// </summary>
+    public string HandledFromSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     实际批次到货时间
+    /// </summary>
+    public DateTime HandledFromArriveDate { get; set; }
+
+    /// <summary>
+    ///     实际批次生产时间
+    /// </summary>
+    public DateTime HandledFromProduceDate { get; set; }
+
+    /// <summary>
+    ///     实际批次过期时间
+    /// </summary>
+    public DateTime HandledFromExpireDate { get; set; }
+
+    /// <summary>
+    ///     实际批次排序
+    /// </summary>
+    public string HandledFromLot { get; set; }
+
+    /// <summary>
+    ///     实际库位
+    /// </summary>
+    public string HandledFromLocationCode { get; set; }
+
+    /// <summary>
+    ///     实际库区
+    /// </summary>
+    public string HandledFromLocationArea { get; set; }
+
+    /// <summary>
+    ///     实际库位组
+    /// </summary>
+    public string HandledFromLocationGroup { get; set; }
+
+    /// <summary>
+    ///     实际ERP库位
+    /// </summary>
+    public string HandledFromLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     实际仓库
+    /// </summary>
+    public string HandledFromWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     实际数量
+    /// </summary>
+    public decimal HandledFromQty { get; set; }
+
+    #endregion
+
+    #region 实际目标
+
+    /// <summary>
+    ///     实际目标托标签
+    /// </summary>
+    public string HandledToContainerCode { get; set; }
+
+    /// <summary>
+    ///     实际箱标签
+    /// </summary>
+    public string HandledToPackingCode { get; set; }
+
+    /// <summary>
+    ///     实际批次供应商批次
+    /// </summary>
+    public string HandledToSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     实际批次到货时间
+    /// </summary>
+    public DateTime HandledToArriveDate { get; set; }
+
+    /// <summary>
+    ///     实际批次生产时间
+    /// </summary>
+    public DateTime HandledToProduceDate { get; set; }
+
+    /// <summary>
+    ///     实际批次过期时间
+    /// </summary>
+    public DateTime HandledToExpireDate { get; set; }
+
+    /// <summary>
+    ///     实际批次排序
+    /// </summary>
+    public string HandledToLot { get; set; }
+
+    /// <summary>
+    ///     实际库位
+    /// </summary>
+    public string HandledToLocationCode { get; set; }
+
+    /// <summary>
+    ///     实际库区
+    /// </summary>
+    public string HandledToLocationArea { get; set; }
+
+    /// <summary>
+    ///     实际库位组
+    /// </summary>
+    public string HandledToLocationGroup { get; set; }
+
+    /// <summary>
+    ///     实际ERP库位
+    /// </summary>
+    public string HandledToLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     实际仓库
+    /// </summary>
+    public string HandledToWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     实际数量
+    /// </summary>
+    public decimal HandledToQty { get; set; }
+
+    #endregion
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/InjectionPlanJobs/IInjectionPlanJobAppService.cs

@@ -0,0 +1,14 @@
+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 IInjectionPlanJobAppService
+    : ISfsJobAppServiceBase<InjectionPlanJobDTO, SfsJobRequestInputBase, InjectionPlanJobCheckInput, InjectionPlanJobEditInput>
+{
+    Task CancelByMaterialRequestAsync(string injectionNumber);
+
+    Task<List<InjectionPlanJobDTO>> GetByRequestNumberAsync(string requestNumber);
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/InjectionPlanJobs/InjectionPlanJobPermissions.cs

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

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/InjectionPlanJobs/Inputs/InjectionPlanJobCheckInput.cs

@@ -0,0 +1,6 @@
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public class InjectionPlanJobCheckInput : SfsJobCheckInputBase
+{
+
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/InjectionPlanJobs/Inputs/InjectionPlanJobDetailInput.cs

@@ -0,0 +1,520 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using Win_in.Sfs.Shared.Application.Contracts;
+using Win_in.Sfs.Shared.Domain.Shared;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public class InjectionPlanJobDetailInput : SfsDetailInputBase
+{
+    #region 库存基础信息
+
+    /// <summary>
+    ///     物品代码
+    /// </summary>
+    public string ItemCode { get; set; }
+
+    /// <summary>
+    ///     物品名称
+    /// </summary>
+    public string ItemName { get; set; }
+
+    /// <summary>
+    ///     物品描述1
+    /// </summary>
+    public string ItemDesc1 { get; set; }
+
+    /// <summary>
+    ///     物品描述2
+    /// </summary>
+    public string ItemDesc2 { get; set; }
+
+    /// <summary>
+    ///     标包数量
+    /// </summary>
+    [Display(Name = "标包数量")]
+    [Column(TypeName = "decimal(18,6)")]
+    public decimal StdPackQty { get; set; }
+
+    /// <summary>
+    ///     库存状态
+    /// </summary>
+    public EnumInventoryStatus Status { get; set; }
+
+    /// <summary>
+    ///     计量单位
+    /// </summary>
+    public string Uom { get; set; }
+
+    #endregion
+
+    #region 请求信息
+
+    /// <summary>
+    ///     请求库位
+    /// </summary>
+    public string RequestLocationCode { get; set; }
+
+    /// <summary>
+    ///     到库区
+    /// </summary>
+    public string RequestLocationArea { get; set; }
+
+    /// <summary>
+    ///     到库位组
+    /// </summary>
+    public string RequestLocationGroup { get; set; }
+
+    /// <summary>
+    ///     到ERP库位
+    /// </summary>
+    public string RequestLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     到仓库
+    /// </summary>
+    public string RequestWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     在途库库位
+    /// </summary>
+    public string OnTheWayLocationCode { get; set; }
+
+    /// <summary>
+    ///     生产线
+    /// </summary>
+    public string ProdLine { get; set; }
+
+    /// <summary>
+    ///     位置码
+    /// </summary>
+    public string PositionCode { get; set; }
+
+    /// <summary>
+    ///     推荐的类型
+    /// </summary>
+    public EnumRecommendType RecommendType { get; set; }
+
+    /// <summary>
+    ///     需求数量
+    /// </summary>
+    public decimal RequestQty { get; set; }
+
+    #endregion
+
+    #region 推荐来源
+
+    /// <summary>
+    ///     推荐来源托标签
+    /// </summary>
+    public string RecommendFromContainerCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源箱标签
+    /// </summary>
+    public string RecommendFromPackingCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次供应商批次
+    /// </summary>
+    public string RecommendFromSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次到货时间
+    /// </summary>
+    public DateTime RecommendFromArriveDate { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次生产时间
+    /// </summary>
+    public DateTime RecommendFromProduceDate { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次过期时间
+    /// </summary>
+    public DateTime RecommendFromExpireDate { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次排序
+    /// </summary>
+    public string RecommendFromLot { get; set; }
+
+    /// <summary>
+    ///     推荐来源库位
+    /// </summary>
+    public string RecommendFromLocationCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源库区
+    /// </summary>
+    public string RecommendFromLocationArea { get; set; }
+
+    /// <summary>
+    ///     推荐来源库位组
+    /// </summary>
+    public string RecommendFromLocationGroup { get; set; }
+
+    /// <summary>
+    ///     推荐来源ERP库位
+    /// </summary>
+    public string RecommendFromLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源仓库
+    /// </summary>
+    public string RecommendFromWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源数量
+    /// </summary>
+    public decimal RecommendFromQty { get; set; }
+
+    #endregion
+
+    #region 推荐目标
+
+    /// <summary>
+    ///     推荐目标托标签
+    /// </summary>
+    public string RecommendToContainerCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标箱标签
+    /// </summary>
+    public string RecommendToPackingCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次供应商批次
+    /// </summary>
+    public string RecommendToSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次到货时间
+    /// </summary>
+    public DateTime RecommendToArriveDate { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次生产时间
+    /// </summary>
+    public DateTime RecommendToProduceDate { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次过期时间
+    /// </summary>
+    public DateTime RecommendToExpireDate { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次排序
+    /// </summary>
+    public string RecommendToLot { get; set; }
+
+    /// <summary>
+    ///     推荐目标库位
+    /// </summary>
+    public string RecommendToLocationCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标库区
+    /// </summary>
+    public string RecommendToLocationArea { get; set; }
+
+    /// <summary>
+    ///     推荐目标库位组
+    /// </summary>
+    public string RecommendToLocationGroup { get; set; }
+
+    /// <summary>
+    ///     推荐目标ERP库位
+    /// </summary>
+    public string RecommendToLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标仓库
+    /// </summary>
+    public string RecommendToWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标数量
+    /// </summary>
+    public decimal RecommendToQty { get; set; }
+
+    #endregion
+
+    #region 库移来源
+
+    /// <summary>
+    ///     库移来源托标签
+    /// </summary>
+    public string TransferLibFromContainerCode { get; set; }
+
+    /// <summary>
+    ///     库移来源箱标签
+    /// </summary>
+    public string TransferLibFromPackingCode { get; set; }
+
+    /// <summary>
+    ///     库移来源批次供应商批次
+    /// </summary>
+    public string TransferLibFromSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     库移来源批次到货时间
+    /// </summary>
+    public DateTime TransferLibFromArriveDate { get; set; }
+
+    /// <summary>
+    ///     库移来源批次生产时间
+    /// </summary>
+    public DateTime TransferLibFromProduceDate { get; set; }
+
+    /// <summary>
+    ///     库移来源批次过期时间
+    /// </summary>
+    public DateTime TransferLibFromExpireDate { get; set; }
+
+    /// <summary>
+    ///     库移来源批次排序
+    /// </summary>
+    public string TransferLibFromLot { get; set; }
+
+    /// <summary>
+    ///     库移来源库位
+    /// </summary>
+    public string TransferLibFromLocationCode { get; set; }
+
+    /// <summary>
+    ///     库移来源库区
+    /// </summary>
+    public string TransferLibFromLocationArea { get; set; }
+
+    /// <summary>
+    ///     库移来源库位组
+    /// </summary>
+    public string TransferLibFromLocationGroup { get; set; }
+
+    /// <summary>
+    ///     库移来源ERP库位
+    /// </summary>
+    public string TransferLibFromLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     库移来源仓库
+    /// </summary>
+    public string TransferLibFromWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     库移来源数量
+    /// </summary>
+    public decimal TransferLibFromQty { get; set; }
+
+    #endregion
+
+    #region 库移目标
+
+    /// <summary>
+    ///     库移目标托标签
+    /// </summary>
+    public string TransferLibToContainerCode { get; set; }
+
+    /// <summary>
+    ///     库移目标箱标签
+    /// </summary>
+    public string TransferLibToPackingCode { get; set; }
+
+    /// <summary>
+    ///     库移目标批次供应商批次
+    /// </summary>
+    public string TransferLibToSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     库移目标批次到货时间
+    /// </summary>
+    public DateTime TransferLibToArriveDate { get; set; }
+
+    /// <summary>
+    ///     库移目标批次生产时间
+    /// </summary>
+    public DateTime TransferLibToProduceDate { get; set; }
+
+    /// <summary>
+    ///     库移目标批次过期时间
+    /// </summary>
+    public DateTime TransferLibToExpireDate { get; set; }
+
+    /// <summary>
+    ///     库移目标批次排序
+    /// </summary>
+    public string TransferLibToLot { get; set; }
+
+    /// <summary>
+    ///     库移目标库位
+    /// </summary>
+    public string TransferLibToLocationCode { get; set; }
+
+    /// <summary>
+    ///     库移目标库区
+    /// </summary>
+    public string TransferLibToLocationArea { get; set; }
+
+    /// <summary>
+    ///     库移目标库位组
+    /// </summary>
+    public string TransferLibToLocationGroup { get; set; }
+
+    /// <summary>
+    ///     库移目标ERP库位
+    /// </summary>
+    public string TransferLibToLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     库移目标仓库
+    /// </summary>
+    public string TransferLibToWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     库移目标数量
+    /// </summary>
+    public decimal TransferLibToQty { get; set; }
+
+    #endregion
+
+    #region 实际来源
+
+    /// <summary>
+    ///     实际目标托标签
+    /// </summary>
+    public string HandledFromContainerCode { get; set; }
+
+    /// <summary>
+    ///     实际箱标签
+    /// </summary>
+    public string HandledFromPackingCode { get; set; }
+
+    /// <summary>
+    ///     实际批次供应商批次
+    /// </summary>
+    public string HandledFromSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     实际批次到货时间
+    /// </summary>
+    public DateTime HandledFromArriveDate { get; set; }
+
+    /// <summary>
+    ///     实际批次生产时间
+    /// </summary>
+    public DateTime HandledFromProduceDate { get; set; }
+
+    /// <summary>
+    ///     实际批次过期时间
+    /// </summary>
+    public DateTime HandledFromExpireDate { get; set; }
+
+    /// <summary>
+    ///     实际批次排序
+    /// </summary>
+    public string HandledFromLot { get; set; }
+
+    /// <summary>
+    ///     实际库位
+    /// </summary>
+    public string HandledFromLocationCode { get; set; }
+
+    /// <summary>
+    ///     实际库区
+    /// </summary>
+    public string HandledFromLocationArea { get; set; }
+
+    /// <summary>
+    ///     实际库位组
+    /// </summary>
+    public string HandledFromLocationGroup { get; set; }
+
+    /// <summary>
+    ///     实际ERP库位
+    /// </summary>
+    public string HandledFromLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     实际仓库
+    /// </summary>
+    public string HandledFromWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     实际数量
+    /// </summary>
+    public decimal HandledFromQty { get; set; }
+
+    #endregion
+
+    #region 实际目标
+
+    /// <summary>
+    ///     实际目标托标签
+    /// </summary>
+    public string HandledToContainerCode { get; set; }
+
+    /// <summary>
+    ///     实际箱标签
+    /// </summary>
+    public string HandledToPackingCode { get; set; }
+
+    /// <summary>
+    ///     实际批次供应商批次
+    /// </summary>
+    public string HandledToSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     实际批次到货时间
+    /// </summary>
+    public DateTime HandledToArriveDate { get; set; }
+
+    /// <summary>
+    ///     实际批次生产时间
+    /// </summary>
+    public DateTime HandledToProduceDate { get; set; }
+
+    /// <summary>
+    ///     实际批次过期时间
+    /// </summary>
+    public DateTime HandledToExpireDate { get; set; }
+
+    /// <summary>
+    ///     实际批次排序
+    /// </summary>
+    public string HandledToLot { get; set; }
+
+    /// <summary>
+    ///     实际库位
+    /// </summary>
+    public string HandledToLocationCode { get; set; }
+
+    /// <summary>
+    ///     实际库区
+    /// </summary>
+    public string HandledToLocationArea { get; set; }
+
+    /// <summary>
+    ///     实际库位组
+    /// </summary>
+    public string HandledToLocationGroup { get; set; }
+
+    /// <summary>
+    ///     实际ERP库位
+    /// </summary>
+    public string HandledToLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     实际仓库
+    /// </summary>
+    public string HandledToWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     实际数量
+    /// </summary>
+    public decimal HandledToQty { get; set; }
+
+    #endregion
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/InjectionPlanJobs/Inputs/InjectionPlanJobEditInput.cs

@@ -0,0 +1,66 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public class InjectionPlanJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobCreateInput<InjectionPlanJobDetailInput>
+{
+    /// <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 InjectionPlanRequestNumber { 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<InjectionPlanJobDetailInput> Details { get; set; } = new();
+
+    /// <summary>
+    ///     使用在途库
+    /// </summary>
+    [Display(Name = "使用在途库")]
+    public bool UseOnTheWayLocation { get; set; }
+
+    /// <summary>
+    /// 叫料类型
+    /// </summary>
+    [Display(Name = "叫料类型")]
+    public EnumIssueRequestType IssueRequestType { get; set; }
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/DTOs/InjectionIssueJobDTO.cs

@@ -1,13 +1,14 @@
 using System.ComponentModel.DataAnnotations;
+using Microsoft.EntityFrameworkCore;
 using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
 /// <summary>
-///     注塑发料任务
+/// 注塑叫料任务
 /// </summary>
-[Display(Name = "注塑发料任务")]
+[Display(Name = "注塑叫料任务")]
 public class InjectionIssueJobDTO : SfsJobDTOBase<InjectionIssueJobDetailDTO>
 {
     /// <summary>
@@ -15,7 +16,6 @@ public class InjectionIssueJobDTO : SfsJobDTOBase<InjectionIssueJobDetailDTO>
     /// </summary>
     [Display(Name = "叫料类型")]
     public EnumIssueRequestType IssueRequestType { get; set; }
-
     /// <summary>
     ///     生产线
     /// </summary>
@@ -28,11 +28,13 @@ public class InjectionIssueJobDTO : SfsJobDTOBase<InjectionIssueJobDetailDTO>
     /// </summary>
     [Display(Name = "要货单号")]
     [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
-    public string InjectionIssueRequestNumber { get; set; }
+    public string InjectionRequestNumber { get; set; }
 
     /// <summary>
     ///     使用在途库
     /// </summary>
     [Display(Name = "使用在途库")]
     public bool UseOnTheWayLocation { get; set; }
+
+    public EnumIssueSendType EnumIssueSendType { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/DTOs/InjectionIssueJobDetailDTO.cs

@@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using Win_in.Sfs.Shared.Application.Contracts;
 using Win_in.Sfs.Shared.Domain.Shared;
-using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/IInjectionIssueJobAppService.cs

@@ -1,14 +1,27 @@
+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 IInjectionIssueJobAppService
-    : ISfsJobAppServiceBase<InjectionIssueJobDTO, SfsJobRequestInputBase, InjectionIssueJobCheckInput, InjectionIssueJobEditInput>
+    : ISfsJobAppServiceBase<InjectionIssueJobDTO, SfsJobRequestInputBase, InjectionIssueJobCheckInput,
+        InjectionIssueJobEditInput>
 {
-    Task CancelByMaterialRequestAsync(string injectionNumber);
-
     Task<List<InjectionIssueJobDTO>> GetByRequestNumberAsync(string requestNumber);
+
+    /// <summary>
+    ///     执行任务明细
+    /// </summary>
+    /// <returns></returns>
+    Task ExecuteDetailAsync(Guid masterId, Guid detailId, InjectionIssueJobDetailDTO issueJobDetailDto);
+
+    Task CompleteAsync(Guid id);
+
+    /// <summary>
+    ///     请求点了完成，任务全部都完成
+    /// </summary>
+    /// <param name="requestNumber"></param>
+    /// <returns></returns>
+    Task CompleteByRequestNumberAsync(string requestNumber);
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/InjectionIssueJobPermissions.cs

@@ -11,17 +11,12 @@ public static class InjectionIssueJobPermissions
     public const string Update = Default + "." + StorePermissions.UpdateStr;
     public const string Delete = Default + "." + StorePermissions.DeleteStr;
 
-    //自动发料任务
-    public const string AutoInjectionIssueJob = StorePermissions.GroupName + "." + nameof(AutoInjectionIssueJob);
-
     public static void AddInjectionIssueJobPermission(this PermissionGroupDefinition permissionGroup)
     {
-        var InjectionIssueJobPermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(InjectionIssueJob)));
+        var injectionIssueJobPermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(InjectionIssueJob)));
-        InjectionIssueJobPermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr));
+        injectionIssueJobPermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr));
-        InjectionIssueJobPermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr));
+        injectionIssueJobPermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr));
-        InjectionIssueJobPermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr));
+        injectionIssueJobPermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr));
-
-        permissionGroup.AddPermission(AutoInjectionIssueJob, StorePermissionDefinitionProvider.L(nameof(AutoInjectionIssueJob)));
 
     }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/Inputs/InjectionIssueJobDetailInput.cs

@@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using Win_in.Sfs.Shared.Application.Contracts;
 using Win_in.Sfs.Shared.Domain.Shared;
-using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/Inputs/InjectionIssueJobEditInput.cs

@@ -9,6 +9,7 @@ namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
 public class InjectionIssueJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobCreateInput<InjectionIssueJobDetailInput>
 {
+    #region Create
     /// <summary>
     /// 上游任务编号
     /// </summary>
@@ -22,7 +23,13 @@ public class InjectionIssueJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobCr
     [Display(Name = "要货单号")]
     [Required(ErrorMessage = "{0}是必填项")]
     [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
-    public string InjectionIssueRequestNumber { get; set; }
+    public string InjectionRequestNumber { get; set; }
+
+    /// <summary>
+    ///     叫料类型
+    /// </summary>
+    [Display(Name = "叫料类型")]
+    public EnumIssueRequestType IssueRequestType { get; set; }
 
     /// <summary>
     /// 任务类型
@@ -58,9 +65,6 @@ public class InjectionIssueJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobCr
     [Display(Name = "使用在途库")]
     public bool UseOnTheWayLocation { get; set; }
 
-    /// <summary>
+    public EnumIssueSendType EnumIssueSendType { get; set; }
-    /// 叫料类型
+    #endregion
-    /// </summary>
-    [Display(Name = "叫料类型")]
-    public EnumIssueRequestType IssueRequestType { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/InjectionPlanNotes/DTOs/InjectionPlanNoteDTO.cs

@@ -0,0 +1,47 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public class InjectionPlanNoteDTO : SfsStoreDTOBase<InjectionPlanNoteDetailDTO>, IHasJobNumber, IHasRequestNumber
+{
+
+    /// <summary>
+    /// 任务ID
+    /// </summary>
+    [Display(Name = "任务ID")]
+    public string JobNumber { get; set; }
+
+    /// <summary>
+    /// 请求代码
+    /// </summary>
+    [Display(Name = "请求代码")]
+    public string RequestNumber { get; set; }
+
+    /// <summary>
+    ///     叫料类型
+    /// </summary>
+    [Display(Name = "叫料类型")]
+    public EnumIssueRequestType IssueRequestType { 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; }
+
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/InjectionPlanNotes/DTOs/InjectionPlanNoteDetailDTO.cs

@@ -0,0 +1,520 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using Win_in.Sfs.Shared.Application.Contracts;
+using Win_in.Sfs.Shared.Domain.Shared;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public class InjectionPlanNoteDetailDTO : SfsDetailDTOBase
+{
+    #region 库存基础信息
+
+    /// <summary>
+    ///     物品代码
+    /// </summary>
+    public string ItemCode { get; set; }
+
+    /// <summary>
+    ///     物品名称
+    /// </summary>
+    public string ItemName { get; set; }
+
+    /// <summary>
+    ///     物品描述1
+    /// </summary>
+    public string ItemDesc1 { get; set; }
+
+    /// <summary>
+    ///     物品描述2
+    /// </summary>
+    public string ItemDesc2 { get; set; }
+
+    /// <summary>
+    ///     标包数量
+    /// </summary>
+    [Display(Name = "标包数量")]
+    [Column(TypeName = "decimal(18,6)")]
+    public decimal StdPackQty { get; set; }
+
+    /// <summary>
+    ///     库存状态
+    /// </summary>
+    public EnumInventoryStatus Status { get; set; }
+
+    /// <summary>
+    ///     计量单位
+    /// </summary>
+    public string Uom { get; set; }
+
+    #endregion
+
+    #region 请求信息
+
+    /// <summary>
+    ///     请求库位
+    /// </summary>
+    public string RequestLocationCode { get; set; }
+
+    /// <summary>
+    ///     到库区
+    /// </summary>
+    public string RequestLocationArea { get; set; }
+
+    /// <summary>
+    ///     到库位组
+    /// </summary>
+    public string RequestLocationGroup { get; set; }
+
+    /// <summary>
+    ///     到ERP库位
+    /// </summary>
+    public string RequestLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     到仓库
+    /// </summary>
+    public string RequestWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     在途库库位
+    /// </summary>
+    public string OnTheWayLocationCode { get; set; }
+
+    /// <summary>
+    ///     生产线
+    /// </summary>
+    public string ProdLine { get; set; }
+
+    /// <summary>
+    ///     位置码
+    /// </summary>
+    public string PositionCode { get; set; }
+
+    /// <summary>
+    ///     推荐的类型
+    /// </summary>
+    public EnumRecommendType RecommendType { get; set; }
+
+    /// <summary>
+    ///     需求数量
+    /// </summary>
+    public decimal RequestQty { get; set; }
+
+    #endregion
+
+    #region 推荐来源
+
+    /// <summary>
+    ///     推荐来源托标签
+    /// </summary>
+    public string RecommendFromContainerCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源箱标签
+    /// </summary>
+    public string RecommendFromPackingCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次供应商批次
+    /// </summary>
+    public string RecommendFromSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次到货时间
+    /// </summary>
+    public DateTime RecommendFromArriveDate { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次生产时间
+    /// </summary>
+    public DateTime RecommendFromProduceDate { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次过期时间
+    /// </summary>
+    public DateTime RecommendFromExpireDate { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次排序
+    /// </summary>
+    public string RecommendFromLot { get; set; }
+
+    /// <summary>
+    ///     推荐来源库位
+    /// </summary>
+    public string RecommendFromLocationCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源库区
+    /// </summary>
+    public string RecommendFromLocationArea { get; set; }
+
+    /// <summary>
+    ///     推荐来源库位组
+    /// </summary>
+    public string RecommendFromLocationGroup { get; set; }
+
+    /// <summary>
+    ///     推荐来源ERP库位
+    /// </summary>
+    public string RecommendFromLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源仓库
+    /// </summary>
+    public string RecommendFromWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源数量
+    /// </summary>
+    public decimal RecommendFromQty { get; set; }
+
+    #endregion
+
+    #region 推荐目标
+
+    /// <summary>
+    ///     推荐目标托标签
+    /// </summary>
+    public string RecommendToContainerCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标箱标签
+    /// </summary>
+    public string RecommendToPackingCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次供应商批次
+    /// </summary>
+    public string RecommendToSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次到货时间
+    /// </summary>
+    public DateTime RecommendToArriveDate { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次生产时间
+    /// </summary>
+    public DateTime RecommendToProduceDate { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次过期时间
+    /// </summary>
+    public DateTime RecommendToExpireDate { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次排序
+    /// </summary>
+    public string RecommendToLot { get; set; }
+
+    /// <summary>
+    ///     推荐目标库位
+    /// </summary>
+    public string RecommendToLocationCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标库区
+    /// </summary>
+    public string RecommendToLocationArea { get; set; }
+
+    /// <summary>
+    ///     推荐目标库位组
+    /// </summary>
+    public string RecommendToLocationGroup { get; set; }
+
+    /// <summary>
+    ///     推荐目标ERP库位
+    /// </summary>
+    public string RecommendToLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标仓库
+    /// </summary>
+    public string RecommendToWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标数量
+    /// </summary>
+    public decimal RecommendToQty { get; set; }
+
+    #endregion
+
+    #region 库移来源
+
+    /// <summary>
+    ///     库移来源托标签
+    /// </summary>
+    public string TransferLibFromContainerCode { get; set; }
+
+    /// <summary>
+    ///     库移来源箱标签
+    /// </summary>
+    public string TransferLibFromPackingCode { get; set; }
+
+    /// <summary>
+    ///     库移来源批次供应商批次
+    /// </summary>
+    public string TransferLibFromSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     库移来源批次到货时间
+    /// </summary>
+    public DateTime TransferLibFromArriveDate { get; set; }
+
+    /// <summary>
+    ///     库移来源批次生产时间
+    /// </summary>
+    public DateTime TransferLibFromProduceDate { get; set; }
+
+    /// <summary>
+    ///     库移来源批次过期时间
+    /// </summary>
+    public DateTime TransferLibFromExpireDate { get; set; }
+
+    /// <summary>
+    ///     库移来源批次排序
+    /// </summary>
+    public string TransferLibFromLot { get; set; }
+
+    /// <summary>
+    ///     库移来源库位
+    /// </summary>
+    public string TransferLibFromLocationCode { get; set; }
+
+    /// <summary>
+    ///     库移来源库区
+    /// </summary>
+    public string TransferLibFromLocationArea { get; set; }
+
+    /// <summary>
+    ///     库移来源库位组
+    /// </summary>
+    public string TransferLibFromLocationGroup { get; set; }
+
+    /// <summary>
+    ///     库移来源ERP库位
+    /// </summary>
+    public string TransferLibFromLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     库移来源仓库
+    /// </summary>
+    public string TransferLibFromWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     库移来源数量
+    /// </summary>
+    public decimal TransferLibFromQty { get; set; }
+
+    #endregion
+
+    #region 库移目标
+
+    /// <summary>
+    ///     库移目标托标签
+    /// </summary>
+    public string TransferLibToContainerCode { get; set; }
+
+    /// <summary>
+    ///     库移目标箱标签
+    /// </summary>
+    public string TransferLibToPackingCode { get; set; }
+
+    /// <summary>
+    ///     库移目标批次供应商批次
+    /// </summary>
+    public string TransferLibToSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     库移目标批次到货时间
+    /// </summary>
+    public DateTime TransferLibToArriveDate { get; set; }
+
+    /// <summary>
+    ///     库移目标批次生产时间
+    /// </summary>
+    public DateTime TransferLibToProduceDate { get; set; }
+
+    /// <summary>
+    ///     库移目标批次过期时间
+    /// </summary>
+    public DateTime TransferLibToExpireDate { get; set; }
+
+    /// <summary>
+    ///     库移目标批次排序
+    /// </summary>
+    public string TransferLibToLot { get; set; }
+
+    /// <summary>
+    ///     库移目标库位
+    /// </summary>
+    public string TransferLibToLocationCode { get; set; }
+
+    /// <summary>
+    ///     库移目标库区
+    /// </summary>
+    public string TransferLibToLocationArea { get; set; }
+
+    /// <summary>
+    ///     库移目标库位组
+    /// </summary>
+    public string TransferLibToLocationGroup { get; set; }
+
+    /// <summary>
+    ///     库移目标ERP库位
+    /// </summary>
+    public string TransferLibToLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     库移目标仓库
+    /// </summary>
+    public string TransferLibToWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     库移目标数量
+    /// </summary>
+    public decimal TransferLibToQty { get; set; }
+
+    #endregion
+
+    #region 实际来源
+
+    /// <summary>
+    ///     实际目标托标签
+    /// </summary>
+    public string HandledFromContainerCode { get; set; }
+
+    /// <summary>
+    ///     实际箱标签
+    /// </summary>
+    public string HandledFromPackingCode { get; set; }
+
+    /// <summary>
+    ///     实际批次供应商批次
+    /// </summary>
+    public string HandledFromSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     实际批次到货时间
+    /// </summary>
+    public DateTime HandledFromArriveDate { get; set; }
+
+    /// <summary>
+    ///     实际批次生产时间
+    /// </summary>
+    public DateTime HandledFromProduceDate { get; set; }
+
+    /// <summary>
+    ///     实际批次过期时间
+    /// </summary>
+    public DateTime HandledFromExpireDate { get; set; }
+
+    /// <summary>
+    ///     实际批次排序
+    /// </summary>
+    public string HandledFromLot { get; set; }
+
+    /// <summary>
+    ///     实际库位
+    /// </summary>
+    public string HandledFromLocationCode { get; set; }
+
+    /// <summary>
+    ///     实际库区
+    /// </summary>
+    public string HandledFromLocationArea { get; set; }
+
+    /// <summary>
+    ///     实际库位组
+    /// </summary>
+    public string HandledFromLocationGroup { get; set; }
+
+    /// <summary>
+    ///     实际ERP库位
+    /// </summary>
+    public string HandledFromLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     实际仓库
+    /// </summary>
+    public string HandledFromWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     实际数量
+    /// </summary>
+    public decimal HandledFromQty { get; set; }
+
+    #endregion
+
+    #region 实际目标
+
+    /// <summary>
+    ///     实际目标托标签
+    /// </summary>
+    public string HandledToContainerCode { get; set; }
+
+    /// <summary>
+    ///     实际箱标签
+    /// </summary>
+    public string HandledToPackingCode { get; set; }
+
+    /// <summary>
+    ///     实际批次供应商批次
+    /// </summary>
+    public string HandledToSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     实际批次到货时间
+    /// </summary>
+    public DateTime HandledToArriveDate { get; set; }
+
+    /// <summary>
+    ///     实际批次生产时间
+    /// </summary>
+    public DateTime HandledToProduceDate { get; set; }
+
+    /// <summary>
+    ///     实际批次过期时间
+    /// </summary>
+    public DateTime HandledToExpireDate { get; set; }
+
+    /// <summary>
+    ///     实际批次排序
+    /// </summary>
+    public string HandledToLot { get; set; }
+
+    /// <summary>
+    ///     实际库位
+    /// </summary>
+    public string HandledToLocationCode { get; set; }
+
+    /// <summary>
+    ///     实际库区
+    /// </summary>
+    public string HandledToLocationArea { get; set; }
+
+    /// <summary>
+    ///     实际库位组
+    /// </summary>
+    public string HandledToLocationGroup { get; set; }
+
+    /// <summary>
+    ///     实际ERP库位
+    /// </summary>
+    public string HandledToLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     实际仓库
+    /// </summary>
+    public string HandledToWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     实际数量
+    /// </summary>
+    public decimal HandledToQty { get; set; }
+
+    #endregion
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/InjectionPlanNotes/IInjectionPlanNoteAppService.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public interface IInjectionPlanNoteAppService : ISfsStoreMasterReadOnlyAppServiceBase<InjectionPlanNoteDTO,
+    SfsStoreRequestInputBase, InjectionPlanNoteDetailDTO, SfsStoreRequestInputBase>
+{
+    Task<InjectionPlanNoteDTO> CreateAsync(InjectionPlanNoteEditInput input);
+
+    Task<InjectionPlanNoteDTO> ConfirmAsync(Guid id);
+
+    Task<InjectionPlanNoteDTO> ConfirmAsync(string number);
+
+    Task<List<InjectionPlanNoteDTO>> GetListUnConfirmedByTypeAsync(EnumIssueRequestType issueRequestType);
+
+    Task<PagedResultDto<InjectionPlanNoteDTO>> GetListByTypeAsync(SfsStoreRequestInputBase requestInput,
+        EnumIssueRequestType issueRequestType, bool includeDetails = false,
+        CancellationToken cancellationToken = default);
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/InjectionPlanNotes/InjectionPlanNotePermissions.cs

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

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/InjectionPlanNotes/Inputs/InjectionPlanNoteDetailInput.cs

@@ -0,0 +1,520 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using Win_in.Sfs.Shared.Application.Contracts;
+using Win_in.Sfs.Shared.Domain.Shared;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public class InjectionPlanNoteDetailInput : SfsDetailInputBase
+{
+    #region 库存基础信息
+
+    /// <summary>
+    ///     物品代码
+    /// </summary>
+    public string ItemCode { get; set; }
+
+    /// <summary>
+    ///     物品名称
+    /// </summary>
+    public string ItemName { get; set; }
+
+    /// <summary>
+    ///     物品描述1
+    /// </summary>
+    public string ItemDesc1 { get; set; }
+
+    /// <summary>
+    ///     物品描述2
+    /// </summary>
+    public string ItemDesc2 { get; set; }
+
+    /// <summary>
+    ///     标包数量
+    /// </summary>
+    [Display(Name = "标包数量")]
+    [Column(TypeName = "decimal(18,6)")]
+    public decimal StdPackQty { get; set; }
+
+    /// <summary>
+    ///     库存状态
+    /// </summary>
+    public EnumInventoryStatus Status { get; set; }
+
+    /// <summary>
+    ///     计量单位
+    /// </summary>
+    public string Uom { get; set; }
+
+    #endregion
+
+    #region 请求信息
+
+    /// <summary>
+    ///     请求库位
+    /// </summary>
+    public string RequestLocationCode { get; set; }
+
+    /// <summary>
+    ///     到库区
+    /// </summary>
+    public string RequestLocationArea { get; set; }
+
+    /// <summary>
+    ///     到库位组
+    /// </summary>
+    public string RequestLocationGroup { get; set; }
+
+    /// <summary>
+    ///     到ERP库位
+    /// </summary>
+    public string RequestLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     到仓库
+    /// </summary>
+    public string RequestWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     在途库库位
+    /// </summary>
+    public string OnTheWayLocationCode { get; set; }
+
+    /// <summary>
+    ///     生产线
+    /// </summary>
+    public string ProdLine { get; set; }
+
+    /// <summary>
+    ///     位置码
+    /// </summary>
+    public string PositionCode { get; set; }
+
+    /// <summary>
+    ///     推荐的类型
+    /// </summary>
+    public EnumRecommendType RecommendType { get; set; }
+
+    /// <summary>
+    ///     需求数量
+    /// </summary>
+    public decimal RequestQty { get; set; }
+
+    #endregion
+
+    #region 推荐来源
+
+    /// <summary>
+    ///     推荐来源托标签
+    /// </summary>
+    public string RecommendFromContainerCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源箱标签
+    /// </summary>
+    public string RecommendFromPackingCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次供应商批次
+    /// </summary>
+    public string RecommendFromSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次到货时间
+    /// </summary>
+    public DateTime RecommendFromArriveDate { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次生产时间
+    /// </summary>
+    public DateTime RecommendFromProduceDate { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次过期时间
+    /// </summary>
+    public DateTime RecommendFromExpireDate { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次排序
+    /// </summary>
+    public string RecommendFromLot { get; set; }
+
+    /// <summary>
+    ///     推荐来源库位
+    /// </summary>
+    public string RecommendFromLocationCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源库区
+    /// </summary>
+    public string RecommendFromLocationArea { get; set; }
+
+    /// <summary>
+    ///     推荐来源库位组
+    /// </summary>
+    public string RecommendFromLocationGroup { get; set; }
+
+    /// <summary>
+    ///     推荐来源ERP库位
+    /// </summary>
+    public string RecommendFromLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源仓库
+    /// </summary>
+    public string RecommendFromWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源数量
+    /// </summary>
+    public decimal RecommendFromQty { get; set; }
+
+    #endregion
+
+    #region 推荐目标
+
+    /// <summary>
+    ///     推荐目标托标签
+    /// </summary>
+    public string RecommendToContainerCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标箱标签
+    /// </summary>
+    public string RecommendToPackingCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次供应商批次
+    /// </summary>
+    public string RecommendToSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次到货时间
+    /// </summary>
+    public DateTime RecommendToArriveDate { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次生产时间
+    /// </summary>
+    public DateTime RecommendToProduceDate { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次过期时间
+    /// </summary>
+    public DateTime RecommendToExpireDate { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次排序
+    /// </summary>
+    public string RecommendToLot { get; set; }
+
+    /// <summary>
+    ///     推荐目标库位
+    /// </summary>
+    public string RecommendToLocationCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标库区
+    /// </summary>
+    public string RecommendToLocationArea { get; set; }
+
+    /// <summary>
+    ///     推荐目标库位组
+    /// </summary>
+    public string RecommendToLocationGroup { get; set; }
+
+    /// <summary>
+    ///     推荐目标ERP库位
+    /// </summary>
+    public string RecommendToLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标仓库
+    /// </summary>
+    public string RecommendToWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标数量
+    /// </summary>
+    public decimal RecommendToQty { get; set; }
+
+    #endregion
+
+    #region 库移来源
+
+    /// <summary>
+    ///     库移来源托标签
+    /// </summary>
+    public string TransferLibFromContainerCode { get; set; }
+
+    /// <summary>
+    ///     库移来源箱标签
+    /// </summary>
+    public string TransferLibFromPackingCode { get; set; }
+
+    /// <summary>
+    ///     库移来源批次供应商批次
+    /// </summary>
+    public string TransferLibFromSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     库移来源批次到货时间
+    /// </summary>
+    public DateTime TransferLibFromArriveDate { get; set; }
+
+    /// <summary>
+    ///     库移来源批次生产时间
+    /// </summary>
+    public DateTime TransferLibFromProduceDate { get; set; }
+
+    /// <summary>
+    ///     库移来源批次过期时间
+    /// </summary>
+    public DateTime TransferLibFromExpireDate { get; set; }
+
+    /// <summary>
+    ///     库移来源批次排序
+    /// </summary>
+    public string TransferLibFromLot { get; set; }
+
+    /// <summary>
+    ///     库移来源库位
+    /// </summary>
+    public string TransferLibFromLocationCode { get; set; }
+
+    /// <summary>
+    ///     库移来源库区
+    /// </summary>
+    public string TransferLibFromLocationArea { get; set; }
+
+    /// <summary>
+    ///     库移来源库位组
+    /// </summary>
+    public string TransferLibFromLocationGroup { get; set; }
+
+    /// <summary>
+    ///     库移来源ERP库位
+    /// </summary>
+    public string TransferLibFromLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     库移来源仓库
+    /// </summary>
+    public string TransferLibFromWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     库移来源数量
+    /// </summary>
+    public decimal TransferLibFromQty { get; set; }
+
+    #endregion
+
+    #region 库移目标
+
+    /// <summary>
+    ///     库移目标托标签
+    /// </summary>
+    public string TransferLibToContainerCode { get; set; }
+
+    /// <summary>
+    ///     库移目标箱标签
+    /// </summary>
+    public string TransferLibToPackingCode { get; set; }
+
+    /// <summary>
+    ///     库移目标批次供应商批次
+    /// </summary>
+    public string TransferLibToSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     库移目标批次到货时间
+    /// </summary>
+    public DateTime TransferLibToArriveDate { get; set; }
+
+    /// <summary>
+    ///     库移目标批次生产时间
+    /// </summary>
+    public DateTime TransferLibToProduceDate { get; set; }
+
+    /// <summary>
+    ///     库移目标批次过期时间
+    /// </summary>
+    public DateTime TransferLibToExpireDate { get; set; }
+
+    /// <summary>
+    ///     库移目标批次排序
+    /// </summary>
+    public string TransferLibToLot { get; set; }
+
+    /// <summary>
+    ///     库移目标库位
+    /// </summary>
+    public string TransferLibToLocationCode { get; set; }
+
+    /// <summary>
+    ///     库移目标库区
+    /// </summary>
+    public string TransferLibToLocationArea { get; set; }
+
+    /// <summary>
+    ///     库移目标库位组
+    /// </summary>
+    public string TransferLibToLocationGroup { get; set; }
+
+    /// <summary>
+    ///     库移目标ERP库位
+    /// </summary>
+    public string TransferLibToLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     库移目标仓库
+    /// </summary>
+    public string TransferLibToWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     库移目标数量
+    /// </summary>
+    public decimal TransferLibToQty { get; set; }
+
+    #endregion
+
+    #region 实际来源
+
+    /// <summary>
+    ///     实际目标托标签
+    /// </summary>
+    public string HandledFromContainerCode { get; set; }
+
+    /// <summary>
+    ///     实际箱标签
+    /// </summary>
+    public string HandledFromPackingCode { get; set; }
+
+    /// <summary>
+    ///     实际批次供应商批次
+    /// </summary>
+    public string HandledFromSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     实际批次到货时间
+    /// </summary>
+    public DateTime HandledFromArriveDate { get; set; }
+
+    /// <summary>
+    ///     实际批次生产时间
+    /// </summary>
+    public DateTime HandledFromProduceDate { get; set; }
+
+    /// <summary>
+    ///     实际批次过期时间
+    /// </summary>
+    public DateTime HandledFromExpireDate { get; set; }
+
+    /// <summary>
+    ///     实际批次排序
+    /// </summary>
+    public string HandledFromLot { get; set; }
+
+    /// <summary>
+    ///     实际库位
+    /// </summary>
+    public string HandledFromLocationCode { get; set; }
+
+    /// <summary>
+    ///     实际库区
+    /// </summary>
+    public string HandledFromLocationArea { get; set; }
+
+    /// <summary>
+    ///     实际库位组
+    /// </summary>
+    public string HandledFromLocationGroup { get; set; }
+
+    /// <summary>
+    ///     实际ERP库位
+    /// </summary>
+    public string HandledFromLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     实际仓库
+    /// </summary>
+    public string HandledFromWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     实际数量
+    /// </summary>
+    public decimal HandledFromQty { get; set; }
+
+    #endregion
+
+    #region 实际目标
+
+    /// <summary>
+    ///     实际目标托标签
+    /// </summary>
+    public string HandledToContainerCode { get; set; }
+
+    /// <summary>
+    ///     实际箱标签
+    /// </summary>
+    public string HandledToPackingCode { get; set; }
+
+    /// <summary>
+    ///     实际批次供应商批次
+    /// </summary>
+    public string HandledToSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     实际批次到货时间
+    /// </summary>
+    public DateTime HandledToArriveDate { get; set; }
+
+    /// <summary>
+    ///     实际批次生产时间
+    /// </summary>
+    public DateTime HandledToProduceDate { get; set; }
+
+    /// <summary>
+    ///     实际批次过期时间
+    /// </summary>
+    public DateTime HandledToExpireDate { get; set; }
+
+    /// <summary>
+    ///     实际批次排序
+    /// </summary>
+    public string HandledToLot { get; set; }
+
+    /// <summary>
+    ///     实际库位
+    /// </summary>
+    public string HandledToLocationCode { get; set; }
+
+    /// <summary>
+    ///     实际库区
+    /// </summary>
+    public string HandledToLocationArea { get; set; }
+
+    /// <summary>
+    ///     实际库位组
+    /// </summary>
+    public string HandledToLocationGroup { get; set; }
+
+    /// <summary>
+    ///     实际ERP库位
+    /// </summary>
+    public string HandledToLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     实际仓库
+    /// </summary>
+    public string HandledToWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     实际数量
+    /// </summary>
+    public decimal HandledToQty { get; set; }
+
+    #endregion
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/InjectionPlanNotes/Inputs/InjectionPlanNoteEditInput.cs

@@ -0,0 +1,56 @@
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public class InjectionPlanNoteEditInput : 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 = "明细列表")]
+    public List<InjectionPlanNoteDetailInput> Details { get; set; }
+
+    /// <summary>
+    /// 请求号码
+    /// </summary>
+    [Display(Name = "请求号码")]
+    public string RequestNumber { get; set; }
+
+    /// <summary>
+    ///     叫料类型
+    /// </summary>
+    [Display(Name = "叫料类型")]
+    public EnumIssueRequestType IssueRequestType { get; set; }
+
+    /// <summary>
+    /// 使用在途库
+    /// </summary>
+    [Display(Name = "使用在途库")]
+    public bool UseOnTheWayLocation { get; set; }
+    #endregion
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/InjectionPlanNotes/Inputs/InjectionPlanNoteImportInput.cs

@@ -0,0 +1,34 @@
+using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public class InjectionPlanNoteImportInput : 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 EnumIssueRequestType IssueRequestType { get; set; }
+
+    /// <summary>
+    ///     使用在途库
+    /// </summary>
+    [Display(Name = "使用在途库")]
+    [Required(ErrorMessage = "{0}是必填项")]
+    public bool UseOnTheWayLocation { get; set; }
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionIssueNotes/DTOs/InjectionIssueNoteDTO.cs

@@ -44,4 +44,5 @@ public class InjectionIssueNoteDTO : SfsStoreDTOBase<InjectionIssueNoteDetailDTO
     [Display(Name = "确认时间")]
     public DateTime? ConfirmTime { get; set; }
 
+    public EnumIssueSendType EnumIssueSendType { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionIssueNotes/DTOs/InjectionIssueNoteDetailDTO.cs

@@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using Win_in.Sfs.Shared.Application.Contracts;
 using Win_in.Sfs.Shared.Domain.Shared;
-using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionIssueNotes/IInjectionIssueNoteAppService.cs

@@ -3,22 +3,12 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Volo.Abp.Application.Dtos;
-using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
-public interface IInjectionIssueNoteAppService : ISfsStoreMasterReadOnlyAppServiceBase<InjectionIssueNoteDTO,
+public interface IInjectionIssueNoteAppService : ISfsStoreMasterReadOnlyAppServiceBase<InjectionIssueNoteDTO, SfsStoreRequestInputBase, InjectionIssueNoteDetailDTO, SfsStoreRequestInputBase>
-    SfsStoreRequestInputBase, InjectionIssueNoteDetailDTO, SfsStoreRequestInputBase>
 {
     Task<InjectionIssueNoteDTO> CreateAsync(InjectionIssueNoteEditInput input);
 
     Task<InjectionIssueNoteDTO> ConfirmAsync(Guid id);
-
-    Task<InjectionIssueNoteDTO> ConfirmAsync(string number);
-
-    Task<List<InjectionIssueNoteDTO>> GetListUnConfirmedByTypeAsync(EnumIssueRequestType issueRequestType);
-
-    Task<PagedResultDto<InjectionIssueNoteDTO>> GetListByTypeAsync(SfsStoreRequestInputBase requestInput,
-        EnumIssueRequestType issueRequestType, bool includeDetails = false,
-        CancellationToken cancellationToken = default);
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionIssueNotes/InjectionIssueNotePermissions.cs

@@ -5,26 +5,16 @@ namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
 public static class InjectionIssueNotePermissions
 {
-
     public const string Default = StorePermissions.GroupName + "." + nameof(InjectionIssueNote);
     public const string Create = Default + "." + StorePermissions.CreateStr;
     public const string Update = Default + "." + StorePermissions.UpdateStr;
     public const string Delete = Default + "." + StorePermissions.DeleteStr;
 
-    //自动发料记录
-    public const string AutoInjectionIssueNote = StorePermissions.GroupName + "." + nameof(AutoInjectionIssueNote);
-
-    //直接发料
-    public const string DirectInjectionIssueNote = StorePermissions.GroupName + "." + nameof(DirectInjectionIssueNote);
-
     public static void AddInjectionIssueNotePermission(this PermissionGroupDefinition permissionGroup)
     {
-        var injectionNotePermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(InjectionIssueNote)));
+        var injectionIssueNotePermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(InjectionIssueNote)));
-        injectionNotePermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr));
+        injectionIssueNotePermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr));
-        injectionNotePermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr));
+        injectionIssueNotePermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr));
-        injectionNotePermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr));
+        injectionIssueNotePermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr));
-
-        permissionGroup.AddPermission(AutoInjectionIssueNote, StorePermissionDefinitionProvider.L(nameof(AutoInjectionIssueNote)));
-        permissionGroup.AddPermission(DirectInjectionIssueNote, StorePermissionDefinitionProvider.L(nameof(DirectInjectionIssueNote)));
     }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionIssueNotes/Inputs/InjectionIssueNoteDetailInput.cs

@@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using Win_in.Sfs.Shared.Application.Contracts;
 using Win_in.Sfs.Shared.Domain.Shared;
-using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionIssueNotes/Inputs/InjectionIssueNoteEditInput.cs

@@ -52,5 +52,7 @@ public class InjectionIssueNoteEditInput : SfsStoreCreateOrUpdateInputBase
     /// </summary>
     [Display(Name = "使用在途库")]
     public bool UseOnTheWayLocation { get; set; }
+
+    public EnumIssueSendType EnumIssueSendType { get; set; }
     #endregion
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionIssueNotes/Inputs/InjectionIssueNoteImportInput.cs

@@ -31,4 +31,6 @@ public class InjectionIssueNoteImportInput : SfsStoreImportInputBase, IHasJobNum
     [Display(Name = "使用在途库")]
     [Required(ErrorMessage = "{0}是必填项")]
     public bool UseOnTheWayLocation { get; set; }
+
+    public EnumIssueSendType EnumIssueSendType { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/InjectionPlanRequests/DTOs/InjectionPlanRequestDTO.cs

@@ -0,0 +1,36 @@
+using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Shared.Domain.Entities;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public class InjectionPlanRequestDTO : SfsStoreRequestDTOBase<InjectionPlanRequestDetailDTO>, IHasNumber
+{
+    /// <summary>
+    /// 叫料类型
+    /// </summary>
+    [Display(Name = "叫料类型")]
+    public EnumIssueRequestType IssueRequestType { 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; }
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/InjectionPlanRequests/DTOs/InjectionPlanRequestDetailDTO.cs

@@ -0,0 +1,99 @@
+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 InjectionPlanRequestDetailDTO : SfsStoreDetailWithQtyDTOBase
+{
+    #region 目标库位信息
+
+    /// <summary>
+    ///     目标库位
+    /// </summary>
+    [Display(Name = "目标库位")]
+    [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储位")]
+    public string ToLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     目标仓库
+    /// </summary>
+    [Display(Name = "目标仓库")]
+    public string ToWarehouseCode { get; set; }
+
+    #endregion
+
+    /// <summary>
+    ///     生产线
+    /// </summary>
+    public string ProdLine { 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; }
+
+    /// <summary>
+    ///     需求箱数量
+    /// </summary>
+    [Display(Name = "需求箱数量")]
+    public decimal BoxQty { get; set; }
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/InjectionPlanRequests/IInjectionPlanRequestAppService.cs

@@ -0,0 +1,21 @@
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
+using Win_in.Sfs.Basedata.Application.Contracts;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public interface IInjectionPlanRequestAppService
+    : ISfsStoreRequestMasterAppServiceBase<InjectionPlanRequestDTO, SfsStoreRequestInputBase, InjectionPlanRequestEditInput, InjectionPlanRequestDetailDTO, SfsStoreRequestInputBase>
+
+{
+    /// <summary>
+    /// 获取物品类别列表
+    /// </summary>
+    /// <returns></returns>
+    Task<List<ItemBasicDTO>> GetItemCategoryListAsync();
+
+
+    Task<List<UnCompletedRequestDto>> GetUnCompletedRequestAsync(List<UnCompletedRequestDto> p_list);
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/InjectionPlanRequests/InjectionPlanRequestPermissions.cs

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

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/InjectionPlanRequests/Inputs/InjectionPlanRequestDetailInput.cs

@@ -0,0 +1,91 @@
+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 InjectionPlanRequestDetailInput : SfsStoreDetailWithQtyInputBase
+{
+    #region 目标库位信息
+
+    /// <summary>
+    /// 目标库位
+    /// </summary>
+    [Display(Name = "目标库位")]
+    [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储位")]
+    public string ToLocationErpCode { get; set; }
+
+    /// <summary>
+    /// 目标仓库
+    /// </summary>
+    [Display(Name = "目标仓库")]
+    public string ToWarehouseCode { get; set; }
+
+    #endregion
+
+    /// <summary>
+    /// 生产线
+    /// </summary>
+    [Display(Name = "生产线")]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string ProdLine { get; set; }
+
+    /// <summary>
+    /// 状态
+    /// </summary>
+    [Display(Name = "状态")]
+    public EnumRequestStatus RequestStatus { get; set; } = EnumRequestStatus.New;
+
+    /// <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; }
+
+    /// <summary>
+    /// 需求箱数量
+    /// </summary>
+    [Display(Name = "需求箱数量")]
+    public decimal BoxQty { get; set; }
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/InjectionPlanRequests/Inputs/InjectionPlanRequestEditInput.cs

@@ -0,0 +1,26 @@
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public class InjectionPlanRequestEditInput : SfsStoreRequestCreateOrUpdateInputBase
+{
+    /// <summary>
+    ///     叫料类型
+    /// </summary>
+    [Display(Name = "叫料类型")]
+    public EnumIssueRequestType IssueRequestType { get; set; }
+
+    /// <summary>
+    ///     使用在途库
+    /// </summary>
+    [Display(Name = "使用在途库")]
+    public bool UseOnTheWayLocation { get; set; }
+
+    /// <summary>
+    ///     明细列表
+    /// </summary>
+    [Display(Name = "明细列表")]
+    public List<InjectionPlanRequestDetailInput> Details { get; set; } = new();
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/InjectionPlanRequests/Inputs/InjectionPlanRequestImportInput.cs

@@ -0,0 +1,48 @@
+using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+[Display(Name = "叫料申请")]
+public class InjectionPlanRequestImportInput : SfsStoreImportInputBase
+{
+    /// <summary>
+    ///     叫料类型
+    /// </summary>
+    [Display(Name = "叫料类型")]
+    public EnumIssueRequestType IssueRequestType { 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; }
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/InjectionIssueRequests/DTOs/InjectionIssueRequestDTO.cs

@@ -1,5 +1,4 @@
 using System.ComponentModel.DataAnnotations;
-using Win_in.Sfs.Shared.Domain.Entities;
 using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
@@ -11,7 +10,6 @@ public class InjectionIssueRequestDTO : SfsStoreRequestDTOBase<InjectionIssueReq
     /// </summary>
     [Display(Name = "叫料类型")]
     public EnumIssueRequestType IssueRequestType { get; set; }
-
     /// <summary>
     ///     是否使用在途库
     /// </summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/InjectionIssueRequests/IInjectionIssueRequestAppService.cs

@@ -1,8 +1,8 @@
+using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Volo.Abp.Application.Dtos;
-using Win_in.Sfs.Basedata.Application.Contracts;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
@@ -10,12 +10,7 @@ public interface IInjectionIssueRequestAppService
     : ISfsStoreRequestMasterAppServiceBase<InjectionIssueRequestDTO, SfsStoreRequestInputBase, InjectionIssueRequestEditInput, InjectionIssueRequestDetailDTO, SfsStoreRequestInputBase>
 
 {
-    /// <summary>
+    Task<InjectionIssueRequestDTO> CreateAndHandleAsync(InjectionIssueRequestEditInput input);
-    /// 获取物品类别列表
+    Task UpdateStatusCompletedAsync(string number);
-    /// </summary>
+    Task<string> IsHasNewJobAsync(string requestNumber, List<string> jobNumber);
-    /// <returns></returns>
-    Task<List<ItemBasicDTO>> GetItemCategoryListAsync();
-
-
-    Task<List<UnCompletedRequestDto>> GetUnCompletedRequestAsync(List<UnCompletedRequestDto> p_list);
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/InjectionIssueRequests/InjectionIssueRequestPermissions.cs

@@ -11,17 +11,12 @@ public static class InjectionIssueRequestPermissions
     public const string Update = Default + "." + StorePermissions.UpdateStr;
     public const string Delete = Default + "." + StorePermissions.DeleteStr;
 
-    //自动叫料申请
-    public const string AutoInjectionIssueRequest = StorePermissions.GroupName + "." + nameof(AutoInjectionIssueRequest);
-
     public static void AddInjectionIssueRequestPermission(this PermissionGroupDefinition permissionGroup)
     {
-        var InjectionIssueRequestPermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(InjectionIssueRequest)));
+        var injectionIssueRequestPermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(InjectionIssueRequest)));
-        InjectionIssueRequestPermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr));
+        injectionIssueRequestPermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr));
-        InjectionIssueRequestPermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr));
+        injectionIssueRequestPermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr));
-        InjectionIssueRequestPermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr));
+        injectionIssueRequestPermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr));
-
-        permissionGroup.AddPermission(AutoInjectionIssueRequest, StorePermissionDefinitionProvider.L(nameof(AutoInjectionIssueRequest)));
 
     }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/InjectionIssueRequests/Inputs/InjectionIssueRequestEditInput.cs

@@ -1,11 +1,14 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
 public class InjectionIssueRequestEditInput : SfsStoreRequestCreateOrUpdateInputBase
 {
+    #region Base   
+
     /// <summary>
     ///     叫料类型
     /// </summary>
@@ -22,5 +25,10 @@ public class InjectionIssueRequestEditInput : SfsStoreRequestCreateOrUpdateInput
     /// 明细列表
     /// </summary>
     [Display(Name = "明细列表")]
-    public List<InjectionIssueRequestDetailInput> Details { get; set; } = new();
+    public List<InjectionIssueRequestDetailInput> Details { get; set; } = new List<InjectionIssueRequestDetailInput>();
+    #endregion
+
+    #region Create  
+
+    #endregion
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/InjectionIssueRequests/Inputs/InjectionIssueRequestImportInput.cs

@@ -1,4 +1,6 @@
 using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Shared.Application.Contracts;
+using Win_in.Sfs.Shared.Domain.Shared;
 using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/InjectionPlanJobs/InjectionPlanJobAppService.cs

@@ -0,0 +1,187 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Threading;
+using System.Threading.Tasks;
+using Castle.Components.DictionaryAdapter;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Volo.Abp;
+using Volo.Abp.Application.Dtos;
+using Win_in.Sfs.Basedata.Application.Contracts;
+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;
+using Win_in.Sfs.Wms.Store.Notes;
+
+namespace Win_in.Sfs.Wms.Store.Application;
+
+/// <summary>
+/// 注塑计划任务
+/// </summary>
+[Authorize]
+[Route($"{StoreConsts.RootPath}injection-plan-job")]
+public class InjectionPlanJobAppService
+    : SfsJobAppServiceBase<InjectionPlanJob, InjectionPlanJobDetail, InjectionPlanJobDTO, SfsJobRequestInputBase,
+            InjectionPlanJobCheckInput, InjectionPlanJobEditInput>,
+        IInjectionPlanJobAppService, ITransferLibCallback
+{
+    private readonly IInjectionPlanJobManager _injectionJobManager;
+    private readonly ILocationAppService _locationAppService;
+    private readonly ITransferLibJobAppService _transferLibJobAppService;
+
+    public InjectionPlanJobAppService(
+        IInjectionPlanJobRepository repository, IInjectionPlanJobManager injectionJobManager,
+        ILocationAppService locationAppService, ITransferLibJobAppService transferLibJobAppService) : base(repository, injectionJobManager)
+    {
+        _injectionJobManager = injectionJobManager;
+        _locationAppService = locationAppService;
+        _transferLibJobAppService = transferLibJobAppService;
+    }
+
+    [HttpPost("add-many")]
+    public override async Task<List<InjectionPlanJobDTO>> CreateManyAsync(List<InjectionPlanJobEditInput> inputs)
+    {
+        foreach (var input in inputs)
+        {
+            await CheckMinRowAndSetStatusAsync(input).ConfigureAwait(false);
+        }
+
+        return await base.CreateManyAsync(inputs).ConfigureAwait(false);
+    }
+
+    [HttpPost("")]
+    public override async Task<InjectionPlanJobDTO> CreateAsync(InjectionPlanJobEditInput input)
+    {
+        await CheckMinRowAndSetStatusAsync(input).ConfigureAwait(false);
+
+        return await base.CreateAsync(input).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    ///     判断是不是在最底层 如果不是则把状态变更为等待 并把库移推荐的From和To赋值
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    private async Task CheckMinRowAndSetStatusAsync(InjectionPlanJobEditInput input)
+    {
+        var jobDetailInputdetail = input.Details.FirstOrDefault();
+
+        var loctionDto = await _locationAppService.GetByCodeAsync(jobDetailInputdetail.RecommendFromLocationCode)
+            .ConfigureAwait(false);
+
+        if (loctionDto.Type == EnumLocationType.RAW && loctionDto.RowCode != 1)
+        {
+            input.JobStatus = EnumJobStatus.Wait;
+
+            jobDetailInputdetail.TransferLibFromArriveDate = jobDetailInputdetail.RecommendFromArriveDate;
+            jobDetailInputdetail.TransferLibFromContainerCode = jobDetailInputdetail.RecommendFromContainerCode;
+            jobDetailInputdetail.TransferLibFromExpireDate = jobDetailInputdetail.RecommendFromExpireDate;
+            jobDetailInputdetail.TransferLibFromLocationArea = jobDetailInputdetail.RecommendFromLocationArea;
+            jobDetailInputdetail.TransferLibFromLocationCode = jobDetailInputdetail.RecommendFromLocationCode;
+            jobDetailInputdetail.TransferLibFromLocationErpCode = jobDetailInputdetail.RecommendFromLocationErpCode;
+            jobDetailInputdetail.TransferLibFromLocationGroup = jobDetailInputdetail.RecommendFromLocationGroup;
+            jobDetailInputdetail.TransferLibFromLot = jobDetailInputdetail.RecommendFromLot;
+            jobDetailInputdetail.TransferLibFromPackingCode = jobDetailInputdetail.RecommendFromPackingCode;
+            jobDetailInputdetail.TransferLibFromProduceDate = jobDetailInputdetail.RecommendFromProduceDate;
+            jobDetailInputdetail.TransferLibFromQty = jobDetailInputdetail.RecommendFromQty;
+            jobDetailInputdetail.TransferLibFromSupplierBatch = jobDetailInputdetail.RecommendFromSupplierBatch;
+            jobDetailInputdetail.TransferLibFromWarehouseCode = jobDetailInputdetail.RecommendFromWarehouseCode;
+
+            jobDetailInputdetail.TransferLibToArriveDate = jobDetailInputdetail.RecommendToArriveDate;
+            jobDetailInputdetail.TransferLibToContainerCode = jobDetailInputdetail.RecommendToContainerCode;
+            jobDetailInputdetail.TransferLibToExpireDate = jobDetailInputdetail.RecommendToExpireDate;
+            jobDetailInputdetail.TransferLibToLocationArea = jobDetailInputdetail.RecommendToLocationArea;
+            jobDetailInputdetail.TransferLibToLocationCode = jobDetailInputdetail.RecommendToLocationCode;
+            jobDetailInputdetail.TransferLibToLocationErpCode = jobDetailInputdetail.RecommendToLocationErpCode;
+            jobDetailInputdetail.TransferLibToLocationGroup = jobDetailInputdetail.RecommendToLocationGroup;
+            jobDetailInputdetail.TransferLibToLot = jobDetailInputdetail.RecommendToLot;
+            jobDetailInputdetail.TransferLibToPackingCode = jobDetailInputdetail.RecommendToPackingCode;
+            jobDetailInputdetail.TransferLibToProduceDate = jobDetailInputdetail.RecommendToProduceDate;
+            jobDetailInputdetail.TransferLibToQty = jobDetailInputdetail.RecommendToQty;
+            jobDetailInputdetail.TransferLibToSupplierBatch = jobDetailInputdetail.RecommendToSupplierBatch;
+            jobDetailInputdetail.TransferLibToWarehouseCode = jobDetailInputdetail.RecommendToWarehouseCode;
+        }
+    }
+
+    [HttpPost("cancel-by-request/{injectionNumber}")]
+    public virtual async Task CancelByMaterialRequestAsync(string injectionNumber)
+    {
+        var entities = await _repository.GetListAsync(p => p.InjectionPlanRequestNumber == injectionNumber)
+            .ConfigureAwait(false);
+        foreach (var entity in entities)
+        {
+            await _injectionJobManager.CancelAsync(entity).ConfigureAwait(false);
+        }
+    }
+
+    [HttpPost("invalid")]
+    public override async Task CancelAsync(Guid id)
+    {
+        var injectionJob = await _repository.GetAsync(id).ConfigureAwait(false);
+        if (injectionJob == null)
+        {
+            throw new UserFriendlyException($"未找到ID为 {id} 的任务");
+        }
+
+        await _injectionJobManager.CancelAsync(injectionJob).ConfigureAwait(false);
+    }
+
+    [HttpPost("by-request-number/{requestNumber}")]
+    public virtual async Task<List<InjectionPlanJobDTO>> GetByRequestNumberAsync(string requestNumber)
+    {
+        var entitys = await _repository.GetListAsync(p => p.InjectionPlanRequestNumber == requestNumber)
+            .ConfigureAwait(false);
+        return ObjectMapper.Map<List<InjectionPlanJob>, List<InjectionPlanJobDTO>>(entitys);
+    }
+
+    [HttpPost("Do-Call-Back")]
+    public async Task DoTransferLibCallbackAsync(TransferLibJobDTO dto)
+    {
+        var job = await _repository.FindAsync(p => p.Number == dto.CallJobNumber).ConfigureAwait(false); 
+
+        var transferLibJobDto= await _transferLibJobAppService.GetByNumberAsync(dto.Number).ConfigureAwait(false);
+
+        var transferLibNoteDetail= dto.Details.First();
+
+        var jobDetail = job.Details.First();
+        job.JobStatus = EnumJobStatus.Open;
+
+        jobDetail.TransferLibFromArriveDate = transferLibNoteDetail.HandledFromArriveDate;
+        jobDetail.TransferLibFromContainerCode=transferLibNoteDetail.HandledFromContainerCode;
+        jobDetail.TransferLibFromExpireDate=transferLibNoteDetail.HandledFromExpireDate;
+        jobDetail.TransferLibFromLocationArea=transferLibNoteDetail.HandledFromLocationArea;
+        jobDetail.TransferLibFromLocationCode=transferLibNoteDetail.HandledFromLocationCode;
+        jobDetail.TransferLibFromLocationErpCode = transferLibNoteDetail.HandledFromLocationErpCode;
+        jobDetail.TransferLibFromLocationGroup=transferLibNoteDetail.HandledFromLocationGroup;
+        jobDetail.TransferLibFromLot=transferLibNoteDetail.HandledFromLot;
+        jobDetail.TransferLibFromPackingCode = transferLibNoteDetail.HandledFromPackingCode;
+        jobDetail.TransferLibFromProduceDate = transferLibNoteDetail.HandledFromProduceDate;
+        jobDetail.TransferLibFromQty=transferLibNoteDetail.HandledFromQty;
+        jobDetail.TransferLibFromSupplierBatch=transferLibNoteDetail.HandledFromSupplierBatch;
+        jobDetail.TransferLibFromWarehouseCode = transferLibNoteDetail.HandledFromWarehouseCode;
+
+        jobDetail.TransferLibToArriveDate = transferLibNoteDetail.HandledToArriveDate;
+        jobDetail.TransferLibToContainerCode = transferLibNoteDetail.HandledToContainerCode;
+        jobDetail.TransferLibToExpireDate = transferLibNoteDetail.HandledToExpireDate;
+        jobDetail.TransferLibToLocationArea = transferLibNoteDetail.HandledToLocationArea;
+        jobDetail.TransferLibToLocationCode = transferLibNoteDetail.HandledToLocationCode;
+        jobDetail.TransferLibToLocationErpCode = transferLibNoteDetail.HandledToLocationErpCode;
+        jobDetail.TransferLibToLocationGroup = transferLibNoteDetail.HandledToLocationGroup;
+        jobDetail.TransferLibToLot = transferLibNoteDetail.HandledToLot;
+        jobDetail.TransferLibToPackingCode = transferLibNoteDetail.HandledToPackingCode;
+        jobDetail.TransferLibToProduceDate = transferLibNoteDetail.HandledToProduceDate;
+        jobDetail.TransferLibToQty = transferLibNoteDetail.HandledToQty;
+        jobDetail.TransferLibToSupplierBatch = transferLibNoteDetail.HandledToSupplierBatch;
+        jobDetail.TransferLibToWarehouseCode = transferLibNoteDetail.HandledToWarehouseCode;
+
+        await _repository.UpdateAsync(job).ConfigureAwait(false);
+
+        return;
+    }
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/InjectionPlanJobs/InjectionPlanJobAutoMapperProfile.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 InjectionPlanJobAutoMapperProfile()
+    {
+        CreateMap<InjectionPlanJob, InjectionPlanJobDTO>()
+             .ReverseMap();
+
+        //CreateMap<InjectionPlanJobDTO, InjectionPlanJob>();
+
+        CreateMap<InjectionPlanJobDetail, InjectionPlanJobDetailDTO>()
+            ;
+
+        CreateMap<InjectionPlanJobDetailDTO, InjectionPlanJobDetail>()
+            ;
+
+        CreateMap<InjectionPlanJobDetailInput, InjectionPlanJobDetail>()
+            .IgnoreAuditedObjectProperties()
+            .Ignore(x => x.MasterID)
+            .Ignore(x => x.TenantId)
+            .Ignore(x => x.Number)
+            .Ignore(x => x.Id);
+
+    }
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs

@@ -30,7 +30,7 @@ using Win_in.Sfs.Wms.Store.Options;
 namespace Win_in.Sfs.Wms.Store.Application;
 
 [Authorize]
-[Route($"{StoreConsts.RootPath}assemble-job")]
+[Route($"{StoreConsts.RootPath}assemble-issue-job")]
 public class AssembleIssueJobAppService
     : SfsJobAppServiceBase<AssembleIssueJob, AssembleIssueJobDetail, AssembleIssueJobDTO, SfsJobRequestInputBase,
             AssembleIssueJobCheckInput, AssembleIssueJobEditInput>,

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs

@@ -1,29 +1,30 @@
 using System;
 using System.Collections.Generic;
-using System.Data;
 using System.Linq;
-using System.Linq.Expressions;
+using System.Net.Http;
-using System.Threading;
+using System.Net.Http.Headers;
+using System.Text;
+using System.Text.Json;
 using System.Threading.Tasks;
 using Castle.Components.DictionaryAdapter;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Options;
+using MyNamespace;
 using Volo.Abp;
-using Volo.Abp.Application.Dtos;
 using Win_in.Sfs.Basedata.Application.Contracts;
-using Win_in.Sfs.Basedata.Domain.Shared;
-using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Shared.Domain.Shared;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
+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;
+using Win_in.Sfs.Wms.Store.Jobs.IssueJobs.proxy;
 using Win_in.Sfs.Wms.Store.Notes;
+using Win_in.Sfs.Wms.Store.Options;
 
 namespace Win_in.Sfs.Wms.Store.Application;
 
-/// <summary>
-/// 注塑发料任务
-/// </summary>
 [Authorize]
 [Route($"{StoreConsts.RootPath}injection-issue-job")]
 public class InjectionIssueJobAppService
@@ -31,17 +32,32 @@ public class InjectionIssueJobAppService
             InjectionIssueJobCheckInput, InjectionIssueJobEditInput>,
         IInjectionIssueJobAppService, ITransferLibCallback
 {
-    private readonly IInjectionIssueJobManager _injectionJobManager;
+    private readonly IInjectionIssueJobManager _injectionIssueJobManager;
     private readonly ILocationAppService _locationAppService;
-    private readonly ITransferLibJobAppService _transferLibJobAppService;
+    private readonly IInjectionIssueNoteAppService _injectionIssueNoteAppService;
+    private readonly IExpectOutAppService _expectOutAppService;
+    private readonly IHttpClientFactory _httpClientFactory;
+    private readonly ITransferLibRequestAppService _transferLibRequestAppService;
+    private readonly IOptions<RestoOptions> _options;
+
+    protected IInjectionIssueRequestAppService InjectionIssueRequestAppService =>
+        LazyServiceProvider.LazyGetRequiredService<IInjectionIssueRequestAppService>();
 
     public InjectionIssueJobAppService(
-        IInjectionIssueJobRepository repository, IInjectionIssueJobManager injectionJobManager,
+        IInjectionIssueJobRepository repository, IInjectionIssueJobManager injectionIssueJobManager,
-        ILocationAppService locationAppService, ITransferLibJobAppService transferLibJobAppService) : base(repository, injectionJobManager)
+        ILocationAppService locationAppService,
+        IInjectionIssueNoteAppService injectionIssueNoteAppService, IExpectOutAppService expectOutAppService
+        , IHttpClientFactory httpClientFactory
+        , IOptions<RestoOptions> options, ITransferLibRequestAppService transferLibRequestAppService) : base(
+        repository, injectionIssueJobManager)
     {
-        _injectionJobManager = injectionJobManager;
+        _injectionIssueJobManager = injectionIssueJobManager;
         _locationAppService = locationAppService;
-        _transferLibJobAppService = transferLibJobAppService;
+        _injectionIssueNoteAppService = injectionIssueNoteAppService;
+        _expectOutAppService = expectOutAppService;
+        _httpClientFactory = httpClientFactory;
+        _options = options;
+        _transferLibRequestAppService = transferLibRequestAppService;
     }
 
     [HttpPost("add-many")]
@@ -50,74 +66,28 @@ public class InjectionIssueJobAppService
         foreach (var input in inputs)
         {
             await CheckMinRowAndSetStatusAsync(input).ConfigureAwait(false);
+            await CheckDimensionalStorehouseAsync(input).ConfigureAwait(false);
         }
 
-        return await base.CreateManyAsync(inputs).ConfigureAwait(false);
+        var injectionIssueJobDtos = await base.CreateManyAsync(inputs).ConfigureAwait(false);
+        foreach (var injectionIssueJobDto in injectionIssueJobDtos)
+        {
+            await CheckDimensionalStorehouseAsync(injectionIssueJobDto).ConfigureAwait(false);
+        }
+
+        return injectionIssueJobDtos;
     }
 
     [HttpPost("")]
     public override async Task<InjectionIssueJobDTO> CreateAsync(InjectionIssueJobEditInput input)
     {
         await CheckMinRowAndSetStatusAsync(input).ConfigureAwait(false);
+        await CheckDimensionalStorehouseAsync(input).ConfigureAwait(false);
 
-        return await base.CreateAsync(input).ConfigureAwait(false);
+        var injectionIssueJobDto = await base.CreateAsync(input).ConfigureAwait(false);
-    }
+        await CheckDimensionalStorehouseAsync(injectionIssueJobDto).ConfigureAwait(false);
-
-    /// <summary>
-    ///     判断是不是在最底层 如果不是则把状态变更为等待 并把库移推荐的From和To赋值
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    private async Task CheckMinRowAndSetStatusAsync(InjectionIssueJobEditInput input)
-    {
-        var jobDetailInputdetail = input.Details.FirstOrDefault();
-
-        var loctionDto = await _locationAppService.GetByCodeAsync(jobDetailInputdetail.RecommendFromLocationCode)
-            .ConfigureAwait(false);
-
-        if (loctionDto.Type == EnumLocationType.RAW && loctionDto.RowCode != 1)
-        {
-            input.JobStatus = EnumJobStatus.Wait;
-
-            jobDetailInputdetail.TransferLibFromArriveDate = jobDetailInputdetail.RecommendFromArriveDate;
-            jobDetailInputdetail.TransferLibFromContainerCode = jobDetailInputdetail.RecommendFromContainerCode;
-            jobDetailInputdetail.TransferLibFromExpireDate = jobDetailInputdetail.RecommendFromExpireDate;
-            jobDetailInputdetail.TransferLibFromLocationArea = jobDetailInputdetail.RecommendFromLocationArea;
-            jobDetailInputdetail.TransferLibFromLocationCode = jobDetailInputdetail.RecommendFromLocationCode;
-            jobDetailInputdetail.TransferLibFromLocationErpCode = jobDetailInputdetail.RecommendFromLocationErpCode;
-            jobDetailInputdetail.TransferLibFromLocationGroup = jobDetailInputdetail.RecommendFromLocationGroup;
-            jobDetailInputdetail.TransferLibFromLot = jobDetailInputdetail.RecommendFromLot;
-            jobDetailInputdetail.TransferLibFromPackingCode = jobDetailInputdetail.RecommendFromPackingCode;
-            jobDetailInputdetail.TransferLibFromProduceDate = jobDetailInputdetail.RecommendFromProduceDate;
-            jobDetailInputdetail.TransferLibFromQty = jobDetailInputdetail.RecommendFromQty;
-            jobDetailInputdetail.TransferLibFromSupplierBatch = jobDetailInputdetail.RecommendFromSupplierBatch;
-            jobDetailInputdetail.TransferLibFromWarehouseCode = jobDetailInputdetail.RecommendFromWarehouseCode;
-
-            jobDetailInputdetail.TransferLibToArriveDate = jobDetailInputdetail.RecommendToArriveDate;
-            jobDetailInputdetail.TransferLibToContainerCode = jobDetailInputdetail.RecommendToContainerCode;
-            jobDetailInputdetail.TransferLibToExpireDate = jobDetailInputdetail.RecommendToExpireDate;
-            jobDetailInputdetail.TransferLibToLocationArea = jobDetailInputdetail.RecommendToLocationArea;
-            jobDetailInputdetail.TransferLibToLocationCode = jobDetailInputdetail.RecommendToLocationCode;
-            jobDetailInputdetail.TransferLibToLocationErpCode = jobDetailInputdetail.RecommendToLocationErpCode;
-            jobDetailInputdetail.TransferLibToLocationGroup = jobDetailInputdetail.RecommendToLocationGroup;
-            jobDetailInputdetail.TransferLibToLot = jobDetailInputdetail.RecommendToLot;
-            jobDetailInputdetail.TransferLibToPackingCode = jobDetailInputdetail.RecommendToPackingCode;
-            jobDetailInputdetail.TransferLibToProduceDate = jobDetailInputdetail.RecommendToProduceDate;
-            jobDetailInputdetail.TransferLibToQty = jobDetailInputdetail.RecommendToQty;
-            jobDetailInputdetail.TransferLibToSupplierBatch = jobDetailInputdetail.RecommendToSupplierBatch;
-            jobDetailInputdetail.TransferLibToWarehouseCode = jobDetailInputdetail.RecommendToWarehouseCode;
-        }
-    }
 
-    [HttpPost("cancel-by-request/{injectionNumber}")]
+        return injectionIssueJobDto;
-    public virtual async Task CancelByMaterialRequestAsync(string injectionNumber)
-    {
-        var entities = await _repository.GetListAsync(p => p.InjectionIssueRequestNumber == injectionNumber)
-            .ConfigureAwait(false);
-        foreach (var entity in entities)
-        {
-            await _injectionJobManager.CancelAsync(entity).ConfigureAwait(false);
-        }
     }
 
     [HttpPost("invalid")]
@@ -129,27 +99,55 @@ public class InjectionIssueJobAppService
             throw new UserFriendlyException($"未找到ID为 {id} 的任务");
         }
 
-        await _injectionJobManager.CancelAsync(injectionJob).ConfigureAwait(false);
+        if (injectionJob.JobStatus == EnumJobStatus.Open ||
+            injectionJob.JobStatus == EnumJobStatus.Partial ||
+            injectionJob.JobStatus == EnumJobStatus.Wait ||
+            injectionJob.JobStatus == EnumJobStatus.Doing)
+        {
+            await _expectOutAppService.RemoveByNumberAsync(injectionJob.Number).ConfigureAwait(false);
+            await _transferLibRequestAppService.CancelByCallRequestNumberAsync(injectionJob.InjectionRequestNumber)
+                .ConfigureAwait(false);
+
+            injectionJob.JobStatus = EnumJobStatus.Cancelled;
+            await _repository.UpdateAsync(injectionJob).ConfigureAwait(false);
+        }
+        else
+        {
+            throw new UserFriendlyException($"任务状态不是" +
+                                            $"{EnumJobStatus.Open.GetDisplayName()}、" +
+                                            $"{EnumJobStatus.Partial.GetDisplayName()}、" +
+                                            $"{EnumJobStatus.Doing.GetDisplayName()}、" +
+                                            $"{EnumJobStatus.Wait.GetDisplayName()}");
+        }
     }
 
     [HttpPost("by-request-number/{requestNumber}")]
     public virtual async Task<List<InjectionIssueJobDTO>> GetByRequestNumberAsync(string requestNumber)
     {
-        var entitys = await _repository.GetListAsync(p => p.InjectionIssueRequestNumber == requestNumber)
+        var entitys = await _repository.GetListAsync(p => p.InjectionRequestNumber == requestNumber)
             .ConfigureAwait(false);
         return ObjectMapper.Map<List<InjectionIssueJob>, List<InjectionIssueJobDTO>>(entitys);
     }
 
+    /// <summary>
+    ///     库移回调
+    /// </summary>
+    /// <param name="dto"></param>
+    /// <returns></returns>
     [HttpPost("Do-Call-Back")]
     public async Task DoTransferLibCallbackAsync(TransferLibJobDTO dto)
     {
         var job = await _repository.FindAsync(p => p.Number == dto.CallJobNumber).ConfigureAwait(false);
 
-        var transferLibJobDto= await _transferLibJobAppService.GetByNumberAsync(dto.Number).ConfigureAwait(false);
+        if (job.JobStatus != EnumJobStatus.Wait)
+        {
+            throw new UserFriendlyException($"任务状态不是{EnumJobStatus.Wait.GetDisplayName()}");
+        }
 
         var transferLibNoteDetail = dto.Details.First();
 
         var jobDetail = job.Details.First();
+
         job.JobStatus = EnumJobStatus.Open;
 
         jobDetail.TransferLibFromArriveDate = transferLibNoteDetail.HandledFromArriveDate;
@@ -181,7 +179,421 @@ public class InjectionIssueJobAppService
         jobDetail.TransferLibToWarehouseCode = transferLibNoteDetail.HandledToWarehouseCode;
 
         await _repository.UpdateAsync(job).ConfigureAwait(false);
+    }
 
-        return;
+    /// <summary>
+    ///     执行任务明细
+    /// </summary>
+    /// <returns></returns>
+    [HttpPost("ExecuteDetail/{masterId}")]
+    public async Task ExecuteDetailAsync(Guid masterId, Guid detailId, InjectionIssueJobDetailDTO issueJobDetailDto)
+    {
+        var injectionIssueJob = await _repository.GetAsync(masterId).ConfigureAwait(false);
+        injectionIssueJob.JobStatus = EnumJobStatus.Doing;
+
+        var injectionIssueJobDto = ObjectMapper.Map<InjectionIssueJob, InjectionIssueJobDTO>(injectionIssueJob);
+        injectionIssueJobDto.Details = new List<InjectionIssueJobDetailDTO> { issueJobDetailDto };
+        var injectionIssueNoteEditInput = await BuildInjectionIssueNoteAsync(injectionIssueJobDto).ConfigureAwait(false);
+        await _injectionIssueNoteAppService.CreateAsync(injectionIssueNoteEditInput).ConfigureAwait(false);
+
+        var issueJobDetail = ObjectMapper.Map<InjectionIssueJobDetailDTO, InjectionIssueJobDetail>(issueJobDetailDto);
+        var entityDetail = injectionIssueJob.Details.Find(p => p.Id == detailId);
+        issueJobDetail.HandledFromQty = entityDetail.HandledFromQty;
+        issueJobDetail.HandledToQty = entityDetail.HandledToQty;
+
+        issueJobDetail.HandledToQty += issueJobDetailDto.HandledToQty;
+        issueJobDetail.HandledFromQty += issueJobDetailDto.HandledFromQty;
+        injectionIssueJob.Details = new EditableList<InjectionIssueJobDetail> { issueJobDetail };
+
+        if (injectionIssueJob.EnumIssueSendType == EnumIssueSendType.BoxQtyType) //按箱叫料 因为任务只有1箱 所以可以直接完成
+        {
+            if (issueJobDetailDto.RecommendToPackingCode != issueJobDetailDto.HandledToPackingCode)
+            {
+                await CheckPackingCodeIsUserAsync(issueJobDetailDto.HandledToPackingCode, injectionIssueJob.Number).ConfigureAwait(false);
+            }
+
+            await UpdateRequestAndjobStatusDoneAsync(injectionIssueJob, issueJobDetailDto, issueJobDetailDto.HandledToQty)
+                .ConfigureAwait(false);
+            await _expectOutAppService.RemoveByNumberAsync(injectionIssueJob.Number).ConfigureAwait(false);
+        }
+        else
+        {
+            var detail = injectionIssueJob.Details.First(p => p.Id == issueJobDetailDto.Id);
+            if (issueJobDetail.HandledToQty >= detail.RequestQty)
+            {
+                await UpdateRequestAndjobStatusDoneAsync(injectionIssueJob, issueJobDetailDto,
+                    issueJobDetailDto.HandledToQty).ConfigureAwait(false);
+            }
+            else
+            {
+                await RemoveExpectOutAsync(injectionIssueJob, issueJobDetailDto, issueJobDetailDto.HandledToQty)
+                    .ConfigureAwait(false);
+            }
+        }
+
+        await _repository.UpdateAsync(injectionIssueJob).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    ///     完成任务
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    [HttpPost("Complete/{id}")]
+    public async Task CompleteAsync(Guid id)
+    {
+        var injectionIssueJob = await _repository.FindAsync(id).ConfigureAwait(false);
+
+        injectionIssueJob.JobStatus = EnumJobStatus.Done;
+
+        await _expectOutAppService.RemoveByNumberAsync(injectionIssueJob.Number).ConfigureAwait(false);
+
+        await InjectionIssueRequestAppService.UpdateStatusCompletedAsync(injectionIssueJob.InjectionRequestNumber)
+            .ConfigureAwait(false);
+        await _transferLibRequestAppService.CancelByCallRequestNumberAsync(injectionIssueJob.InjectionRequestNumber)
+            .ConfigureAwait(false);
+
+        await _repository.UpdateAsync(injectionIssueJob).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    ///     请求点了完成，任务全部都完成
+    /// </summary>
+    /// <param name="requestNumber"></param>
+    /// <returns></returns>
+    [HttpPost("complete-by-request/{requestNumber}")]
+    public async Task CompleteByRequestNumberAsync(string requestNumber)
+    {
+        var injectionIssueJobs = await _repository.GetListAsync(p => p.InjectionRequestNumber == requestNumber)
+            .ConfigureAwait(false);
+
+        foreach (var injectionIssueJob in injectionIssueJobs)
+        {
+            injectionIssueJob.JobStatus = EnumJobStatus.Done;
+            await _repository.UpdateAsync(injectionIssueJob).ConfigureAwait(false);
+            await _expectOutAppService.RemoveByNumberAsync(injectionIssueJob.Number).ConfigureAwait(false);
+            await _transferLibRequestAppService.CancelByCallRequestNumberAsync(injectionIssueJob.InjectionRequestNumber)
+                .ConfigureAwait(false);
+        }
+    }
+
+    #region 立库
+
+    /// <summary>
+    ///     立体库同步
+    /// </summary>
+    /// <param name="input"></param>
+    /// <param name="p_loc"></param>
+    /// <returns></returns>
+    [HttpPost("sync-issue-job-stereo")]
+    public async Task<ReusltObject> SyncIssueJobStereoAsync(List<InjectionIssueJobDTO> input, string p_loc)
+    {
+        var ret = new ReusltObject();
+        ret.Code = "1";
+        ret.Message = "操作成功";
+        ret.OperateTime = DateTime.Now.ToString("yyyy-MM-dd");
+        try
+        {
+            var IssueJobToRestoDetailDTOs = new List<IssueJobToRestoDetailDTO>();
+            var main = new IssueJobToRestoDTO();
+            main.OperatorName = CurrentUser.UserName;
+            foreach (var job in input)
+            {
+                foreach (var jobitem in job.Details)
+                {
+                    IssueJobToRestoDetailDTOs.Add(new IssueJobToRestoDetailDTO
+                    {
+                        Count = jobitem.HandledToQty,
+                        ProductNo = jobitem.ItemCode,
+                        NeedSite = p_loc,
+                        WorkNo = job.Number,
+                        TaskNo = job.Number
+                    });
+                }
+            }
+
+            main.Details = IssueJobToRestoDetailDTOs;
+            var httpclient = _httpClientFactory.CreateClient();
+#if DEBUG
+
+            var json = JsonSerializer.Serialize(main);
+            _options.Value.Address = "http://localhost:59094/"; //测试地址
+            _options.Value.Token = ""; //测试token
+            _options.Value.UserName = ""; //测试用户名
+            _options.Value.Password = ""; //测试密码
+
+#endif
+            if (!string.IsNullOrEmpty(_options.Value.Token))
+            {
+                var token = _options.Value.Token;
+                httpclient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
+            }
+
+            if (!string.IsNullOrEmpty(_options.Value.UserName) && !string.IsNullOrEmpty(_options.Value.Password))
+            {
+                var username = _options.Value.UserName;
+                var password = _options.Value.Password;
+                httpclient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic",
+                    Convert.ToBase64String(Encoding.ASCII.GetBytes($"{username}:{password}")));
+            }
+
+            var client = new IssueJobToRestoClient(_options.Value.Address, httpclient);
+            ret = await client.SyncIssueJobStereoAsync(main).ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            ret = new ReusltObject();
+            ret.Code = "2";
+            ret.Message = ex.Message;
+            ret.OperateTime = DateTime.Now.ToString("yyyy-MM-dd");
         }
+
+        return ret;
+    }
+
+    [HttpPost("receive-issue-job-stereo")]
+    public virtual async Task<ReusltObject> SyncReciveIssueJobStereoAsync(IssueRequestFromRestoDTO input)
+    {
+#if DEBUG
+        var json = JsonSerializer.Serialize(input);
+#endif
+        var errors = new List<string>();
+        var ret = new ReusltObject { Code = "1", OperateTime = DateTime.Now.ToString("yyyy-MM-dd"), Message = "操作成功" };
+        try
+        {
+            if (input.Jobs.Count > 0)
+            {
+                var jobs = input.Jobs;
+                var numbers = jobs.Select(p => p.JobNumber);
+                var query = _repository.WithDetails()
+                    .Where(p => numbers.Contains(p.Number));
+                var entities = query.ToList();
+                var dtos = ObjectMapper.Map<List<InjectionIssueJob>, List<InjectionIssueJobDTO>>(entities);
+                if (input.Jobs.Count == entities.Count)
+                {
+                    errors.Add("立体库提交出库任务和WMS任务不符,请核对! \n");
+                }
+
+                foreach (var itm in dtos)
+                {
+                    var first = jobs.FirstOrDefault(p => p.JobNumber == itm.Number);
+                    var itmDetails = itm.Details.ToList();
+                    var details = new List<InjectionIssueJobDetailDTO>();
+                    foreach (var detail in first.Details)
+                    {
+                        var entity = itmDetails.FirstOrDefault(p => p.ItemCode == detail.ItemCode);
+                        var dto = new InjectionIssueJobDetailDTO();
+                        dto.HandledFromLocationCode = entity.HandledFromLocationCode;
+                        dto.HandledToLocationCode = entity.HandledToLocationCode;
+                        dto.ItemCode = detail.ItemCode;
+                        dto.RecommendFromQty = detail.Qty;
+                        dto.RecommendToQty = detail.Qty;
+                        dto.HandledFromQty = detail.Qty;
+                        dto.HandledToQty = detail.Qty;
+                        dto.Status = entity.Status;
+                        details.Add(dto);
+                    }
+
+                    itm.Details = details;
+                    await CompleteAsync(itm.Id, itm).ConfigureAwait(false);
+                }
+            }
+            else
+            {
+                errors.Add("立体库确认单据里无数据! \n");
+            }
+        }
+        catch (Exception ex)
+        {
+            ret = new ReusltObject
+            {
+                Code = "2",
+                OperateTime = DateTime.Now.ToString("yyyy-MM-dd"),
+                Message = ex.Message
+            };
+            return ret;
+        }
+
+        if (errors.Count > 0)
+        {
+            ret = new ReusltObject
+            {
+                Code = "2",
+                OperateTime = DateTime.Now.ToString("yyyy-MM-dd"),
+                Message = string.Join(",", errors.ToArray())
+            };
+        }
+
+        return ret;
+    }
+
+    #endregion
+
+    #region 私有
+
+    /// <summary>
+    ///     创建补料记录实体
+    /// </summary>
+    /// <param name="injectionIssueJobDto"></param>
+    /// <returns></returns>
+    private async Task<InjectionIssueNoteEditInput> BuildInjectionIssueNoteAsync(InjectionIssueJobDTO injectionIssueJobDto)
+    {
+        var injectionIssueNoteCreateInput =
+            ObjectMapper.Map<InjectionIssueJobDTO, InjectionIssueNoteEditInput>(injectionIssueJobDto);
+        injectionIssueNoteCreateInput.JobNumber = injectionIssueJobDto.Number;
+
+        await Task.CompletedTask.ConfigureAwait(false);
+
+        return injectionIssueNoteCreateInput;
+    }
+
+    /// <summary>
+    ///     判断是不是在最底层 如果不是则把状态变更为等待 并把库移推荐的From和To赋值
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    private async Task CheckMinRowAndSetStatusAsync(InjectionIssueJobEditInput input)
+    {
+        var jobDetailInputdetail = input.Details.FirstOrDefault();
+
+        var loctionDto = await _locationAppService.GetByCodeAsync(jobDetailInputdetail.RecommendFromLocationCode)
+            .ConfigureAwait(false);
+
+        if (loctionDto.Type == EnumLocationType.RAW && loctionDto.RowCode != 1)
+        {
+            input.JobStatus = EnumJobStatus.Wait;
+        }
+        else if (loctionDto.Type == EnumLocationType.RAW && loctionDto.RowCode == 1)
+        {
+            jobDetailInputdetail.TransferLibFromArriveDate = jobDetailInputdetail.RecommendFromArriveDate;
+            jobDetailInputdetail.TransferLibFromContainerCode = jobDetailInputdetail.RecommendFromContainerCode;
+            jobDetailInputdetail.TransferLibFromExpireDate = jobDetailInputdetail.RecommendFromExpireDate;
+            jobDetailInputdetail.TransferLibFromLocationArea = jobDetailInputdetail.RecommendFromLocationArea;
+            jobDetailInputdetail.TransferLibFromLocationCode = jobDetailInputdetail.RecommendFromLocationCode;
+            jobDetailInputdetail.TransferLibFromLocationErpCode = jobDetailInputdetail.RecommendFromLocationErpCode;
+            jobDetailInputdetail.TransferLibFromLocationGroup = jobDetailInputdetail.RecommendFromLocationGroup;
+            jobDetailInputdetail.TransferLibFromLot = jobDetailInputdetail.RecommendFromLot;
+            jobDetailInputdetail.TransferLibFromPackingCode = jobDetailInputdetail.RecommendFromPackingCode;
+            jobDetailInputdetail.TransferLibFromProduceDate = jobDetailInputdetail.RecommendFromProduceDate;
+            jobDetailInputdetail.TransferLibFromQty = jobDetailInputdetail.RecommendFromQty;
+            jobDetailInputdetail.TransferLibFromSupplierBatch = jobDetailInputdetail.RecommendFromSupplierBatch;
+            jobDetailInputdetail.TransferLibFromWarehouseCode = jobDetailInputdetail.RecommendFromWarehouseCode;
+
+            jobDetailInputdetail.TransferLibToArriveDate = jobDetailInputdetail.RecommendToArriveDate;
+            jobDetailInputdetail.TransferLibToContainerCode = jobDetailInputdetail.RecommendToContainerCode;
+            jobDetailInputdetail.TransferLibToExpireDate = jobDetailInputdetail.RecommendToExpireDate;
+            jobDetailInputdetail.TransferLibToLot = jobDetailInputdetail.RecommendToLot;
+            jobDetailInputdetail.TransferLibToPackingCode = jobDetailInputdetail.RecommendToPackingCode;
+            jobDetailInputdetail.TransferLibToProduceDate = jobDetailInputdetail.RecommendToProduceDate;
+            jobDetailInputdetail.TransferLibToQty = jobDetailInputdetail.RecommendToQty;
+            jobDetailInputdetail.TransferLibToSupplierBatch = jobDetailInputdetail.RecommendToSupplierBatch;
+            jobDetailInputdetail.TransferLibToWarehouseCode = jobDetailInputdetail.TransferLibFromWarehouseCode;
+            jobDetailInputdetail.TransferLibToLocationArea = jobDetailInputdetail.TransferLibFromLocationArea;
+            jobDetailInputdetail.TransferLibToLocationCode = jobDetailInputdetail.TransferLibFromLocationCode;
+            jobDetailInputdetail.TransferLibToLocationErpCode = jobDetailInputdetail.TransferLibFromLocationErpCode;
+            jobDetailInputdetail.TransferLibToLocationGroup = jobDetailInputdetail.TransferLibFromLocationGroup;
+        }
+    }
+
+    /// <summary>
+    ///     判断是不是在立体库
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    private async Task CheckDimensionalStorehouseAsync(InjectionIssueJobEditInput input)
+    {
+        var jobDetailInputdetail = input.Details.FirstOrDefault();
+
+        var loctionDto = await _locationAppService.GetByCodeAsync(jobDetailInputdetail.RecommendFromLocationCode)
+            .ConfigureAwait(false);
+
+        if (loctionDto.Type == EnumLocationType.DimensionalStorehouse)
+        {
+            input.JobStatus = EnumJobStatus.Wait;
+        }
+    }
+
+    /// <summary>
+    ///     判断是不是在立体库
+    /// </summary>
+    /// <param name="injectionIssueJobDto"></param>
+    /// <returns></returns>
+    private async Task CheckDimensionalStorehouseAsync(InjectionIssueJobDTO injectionIssueJobDto)
+    {
+        var jobDetailInputdetail = injectionIssueJobDto.Details.FirstOrDefault();
+
+        var loctionDto = await _locationAppService.GetByCodeAsync(jobDetailInputdetail.RecommendFromLocationCode)
+            .ConfigureAwait(false);
+
+        if (loctionDto.Type == EnumLocationType.DimensionalStorehouse)
+        {
+            //TODO 立体库
+            var ret = await SyncIssueJobStereoAsync(new List<InjectionIssueJobDTO> { injectionIssueJobDto },
+                loctionDto.Code).ConfigureAwait(false);
+            if (ret.Code != "1")
+            {
+                throw new UserFriendlyException($"调用立体库不成功！原因:{ret.Message}");
+            }
+        }
+    }
+
+    /// <summary>
+    ///     修改当前任务状态 和 该任务的请求状态
+    /// </summary>
+    /// <param name="injectionIssueJob"></param>
+    /// <param name="injectionIssueJobDetailDto"></param>
+    /// <param name="handledToQty"></param>
+    /// <returns></returns>
+    /// <exception cref="UserFriendlyException"></exception>
+    private async Task UpdateRequestAndjobStatusDoneAsync(InjectionIssueJob injectionIssueJob,
+        InjectionIssueJobDetailDTO injectionIssueJobDetailDto, decimal handledToQty)
+    {
+        if (injectionIssueJob.JobStatus is EnumJobStatus.Closed or EnumJobStatus.Cancelled or EnumJobStatus.None
+            or EnumJobStatus.Done) //需要考虑下 多次提交的问题 所以不判断 进行中
+        {
+            throw new UserFriendlyException(
+                $"任务状态错误：编号为【{injectionIssueJob.Number}】的任务状态为【{injectionIssueJob.JobStatus.GetDisplayName()}】");
+        }
+
+        injectionIssueJob.JobStatus = EnumJobStatus.Done;
+
+        await RemoveExpectOutAsync(injectionIssueJob, injectionIssueJobDetailDto, handledToQty).ConfigureAwait(false);
+
+        //await _expectOutAppService.RemoveByNumberAsync(injectionIssueJob.Number).ConfigureAwait(false);
+
+        await InjectionIssueRequestAppService.UpdateStatusCompletedAsync(injectionIssueJob.InjectionRequestNumber)
+            .ConfigureAwait(false);
+
+        await Task.CompletedTask.ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// 判断实际TO的箱码是否被占用
+    /// </summary>
+    /// <param name="packingCode"></param>
+    /// <param name="jobNumber"></param>
+    /// <returns></returns>
+    /// <exception cref="UserFriendlyException"></exception>
+    private async Task CheckPackingCodeIsUserAsync(string packingCode, string jobNumber)
+    {
+        var list = await _expectOutAppService.GetListByPackingCodeAsync(packingCode).ConfigureAwait(false);
+        list = list.Where(p => p.JobNumber != jobNumber).ToList();
+        if (list.Any())
+        {
+            throw new UserFriendlyException($"任务号【{list.First().JobNumber}】的任务，已占用【{packingCode}】箱码的库存。");
+        }
+    }
+
+    private async Task RemoveExpectOutAsync(InjectionIssueJob injectionIssueJob,
+        InjectionIssueJobDetailDTO injectionIssueJobDetailDto,
+        decimal handledToQty)
+    {
+        await _expectOutAppService.RemoveByNumberAndInventoryAsync(injectionIssueJob.Number,
+            injectionIssueJobDetailDto.ItemCode,
+            injectionIssueJobDetailDto.HandledToLocationCode, injectionIssueJobDetailDto.HandledToPackingCode,
+            injectionIssueJobDetailDto.Status, injectionIssueJobDetailDto.HandledToLot,
+            handledToQty).ConfigureAwait(false);
+    }
+
+    #endregion
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAutoMapperProfile.cs

@@ -12,8 +12,6 @@ public partial class StoreApplicationAutoMapperProfile : Profile
         CreateMap<InjectionIssueJob, InjectionIssueJobDTO>()
              .ReverseMap();
 
-        //CreateMap<InjectionIssueJobDTO, InjectionIssueJob>();
-
         CreateMap<InjectionIssueJobDetail, InjectionIssueJobDetailDTO>()
             ;
 

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/InjectionPlanNotes/InjectionPlanNoteAppService.cs

@@ -0,0 +1,112 @@
+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.Domain.Shared.Enums.Store;
+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}injection-plan-note")]
+public class InjectionPlanNoteAppService :
+    SfsStoreWithDetailsAppServiceBase<InjectionPlanNote, InjectionPlanNoteDTO, SfsStoreRequestInputBase, InjectionPlanNoteEditInput, InjectionPlanNoteDetail,
+        InjectionPlanNoteDetailDTO, SfsStoreRequestInputBase, InjectionPlanNoteImportInput>,
+    IInjectionPlanNoteAppService
+{
+    private readonly IInjectionPlanNoteManager _injectionNoteManager;
+
+    public InjectionPlanNoteAppService(
+        IInjectionPlanNoteRepository repository,
+        IInjectionPlanNoteManager injectionNoteManager
+    ) : base(repository)
+    {
+        _injectionNoteManager = injectionNoteManager;
+    }
+
+    [HttpPost("")]
+    //[Authorize(InjectionPlanNotePermissions.Create)]
+    public override async Task<InjectionPlanNoteDTO> CreateAsync(InjectionPlanNoteEditInput input)
+    {
+        var entity = ObjectMapper.Map<InjectionPlanNoteEditInput, InjectionPlanNote>(input);
+        await _injectionNoteManager.CreateAsync(entity).ConfigureAwait(false);
+        var dto = ObjectMapper.Map<InjectionPlanNote, InjectionPlanNoteDTO>(entity);
+        return dto;
+    }
+
+    /// <summary>
+    /// 确认对应的记录单
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    [HttpPost("confirm/{id}")]
+    public virtual async Task<InjectionPlanNoteDTO> ConfirmAsync(Guid id)
+    {
+        var injectionNote= await _repository.GetAsync(id).ConfigureAwait(false);
+        injectionNote.Confirmed = true;
+        injectionNote=await _repository.UpdateAsync(injectionNote).ConfigureAwait(false);
+        await LocalEventBus.PublishAsync(new SfsConfirmedEntityEventData<InjectionPlanNote>(injectionNote), false).ConfigureAwait(false);
+        return ObjectMapper.Map<InjectionPlanNote, InjectionPlanNoteDTO>(injectionNote);
+    }
+
+    [HttpPost("confirm-by-number/{number}")]
+    public virtual async Task<InjectionPlanNoteDTO> ConfirmAsync(string number)
+    {
+        var entity = await _repository.FindAsync(p => p.Number == number).ConfigureAwait(false);
+        Check.NotNull(entity, nameof(InjectionPlanNote));
+        var result = await _injectionNoteManager.ConfirmAsync(entity.Id).ConfigureAwait(false);
+        var dto = ObjectMapper.Map<InjectionPlanNote, InjectionPlanNoteDTO>(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<InjectionPlanNoteDTO>> GetListByTypeAsync(SfsStoreRequestInputBase requestInput,
+        EnumIssueRequestType issueRequestType, bool includeDetails = false, CancellationToken cancellationToken = default)
+    {
+        Expression<Func<InjectionPlanNote, bool>> expression = p => p.IssueRequestType == issueRequestType;
+        if (requestInput.Condition.Filters?.Count > 0)
+        {
+            expression = expression.And(requestInput.Condition.Filters.ToLambda<InjectionPlanNote>());
+        }
+
+        return await GetPagedListAsync(expression, requestInput.SkipCount, requestInput.MaxResultCount,
+            requestInput.Sorting, includeDetails, cancellationToken).ConfigureAwait(false);
+    }
+
+    [HttpPost("list-by-type-and-un-confirmed")]
+    public virtual async Task<List<InjectionPlanNoteDTO>> GetListUnConfirmedByTypeAsync(EnumIssueRequestType issueRequestType)
+    {
+        var entities = await _repository.GetListAsync(c => !c.Confirmed && c.IssueRequestType == issueRequestType)
+            .ConfigureAwait(false);
+
+        var dtos = ObjectMapper.Map<List<InjectionPlanNote>, List<InjectionPlanNoteDTO>>(entities);
+
+        return dtos;
+    }
+   
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/InjectionPlanNotes/InjectionPlanNoteAutoMapperProfile.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 InjectionPlanNoteAutoMapperProfile()
+    {
+        CreateMap<InjectionPlanNote, InjectionPlanNoteDTO>()
+            .ReverseMap();
+
+        CreateMap<InjectionPlanNoteDetail, InjectionPlanNoteDetailDTO>();
+
+        CreateMap<InjectionPlanNoteDetailInput, InjectionPlanNoteDetail>()
+               .IgnoreAuditedObjectProperties()
+               .Ignore(x => x.MasterID)
+               .Ignore(x => x.TenantId)
+               .Ignore(x => x.Number)
+               .Ignore(x => x.Id);
+
+        CreateMap<InjectionPlanNoteEditInput, InjectionPlanNote>()
+            .IgnoreAuditedObjectProperties()
+            .Ignore(x => x.TenantId)
+            .Ignore(x => x.Number)
+            .Ignore(x => x.Id);
+        ;
+    }
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/IssueNotes/InjectionIssueNotes/InjectionIssueNoteAppService.cs

@@ -10,7 +10,6 @@ using Volo.Abp;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Domain.Entities;
 using Win_in.Sfs.Shared.Domain;
-using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 using Win_in.Sfs.Shared.Event;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 using Win_in.Sfs.Wms.Store.Domain;
@@ -18,9 +17,6 @@ using Win_in.Sfs.Wms.Store.Domain.Shared;
 
 namespace Win_in.Sfs.Wms.Store.Application;
 
-/// <summary>
-/// 注塑发料记录
-/// </summary>
 [Authorize]
 [Route($"{StoreConsts.RootPath}injection-issue-note")]
 public class InjectionIssueNoteAppService :
@@ -28,14 +24,14 @@ public class InjectionIssueNoteAppService :
         InjectionIssueNoteDetailDTO, SfsStoreRequestInputBase, InjectionIssueNoteImportInput>,
     IInjectionIssueNoteAppService
 {
-    private readonly IInjectionIssueNoteManager _injectionNoteManager;
+    private readonly IInjectionIssueNoteManager _injectionIssueNoteManager;
 
     public InjectionIssueNoteAppService(
         IInjectionIssueNoteRepository repository,
-        IInjectionIssueNoteManager injectionNoteManager
+        IInjectionIssueNoteManager injectionIssueNoteManager
     ) : base(repository)
     {
-        _injectionNoteManager = injectionNoteManager;
+        _injectionIssueNoteManager = injectionIssueNoteManager;
     }
 
     [HttpPost("")]
@@ -43,7 +39,7 @@ public class InjectionIssueNoteAppService :
     public override async Task<InjectionIssueNoteDTO> CreateAsync(InjectionIssueNoteEditInput input)
     {
         var entity = ObjectMapper.Map<InjectionIssueNoteEditInput, InjectionIssueNote>(input);
-        await _injectionNoteManager.CreateAsync(entity).ConfigureAwait(false);
+        await _injectionIssueNoteManager.CreateAsync(entity).ConfigureAwait(false);
         var dto = ObjectMapper.Map<InjectionIssueNote, InjectionIssueNoteDTO>(entity);
         return dto;
     }
@@ -56,57 +52,11 @@ public class InjectionIssueNoteAppService :
     [HttpPost("confirm/{id}")]
     public virtual async Task<InjectionIssueNoteDTO> ConfirmAsync(Guid id)
     {
-        var injectionNote= await _repository.GetAsync(id).ConfigureAwait(false);
+        var injectionIssueNote = await _repository.GetAsync(id).ConfigureAwait(false);
-        injectionNote.Confirmed = true;
+        injectionIssueNote.Confirmed = true;
-        injectionNote=await _repository.UpdateAsync(injectionNote).ConfigureAwait(false);
+        injectionIssueNote = await _repository.UpdateAsync(injectionIssueNote).ConfigureAwait(false);
-        await LocalEventBus.PublishAsync(new SfsConfirmedEntityEventData<InjectionIssueNote>(injectionNote), false).ConfigureAwait(false);
+        await LocalEventBus.PublishAsync(new SfsConfirmedEntityEventData<InjectionIssueNote>(injectionIssueNote), false).ConfigureAwait(false);
-        return ObjectMapper.Map<InjectionIssueNote, InjectionIssueNoteDTO>(injectionNote);
+        return ObjectMapper.Map<InjectionIssueNote, InjectionIssueNoteDTO>(injectionIssueNote);
-    }
-
-    [HttpPost("confirm-by-number/{number}")]
-    public virtual async Task<InjectionIssueNoteDTO> ConfirmAsync(string number)
-    {
-        var entity = await _repository.FindAsync(p => p.Number == number).ConfigureAwait(false);
-        Check.NotNull(entity, nameof(InjectionIssueNote));
-        var result = await _injectionNoteManager.ConfirmAsync(entity.Id).ConfigureAwait(false);
-        var dto = ObjectMapper.Map<InjectionIssueNote, InjectionIssueNoteDTO>(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<InjectionIssueNoteDTO>> GetListByTypeAsync(SfsStoreRequestInputBase requestInput,
-        EnumIssueRequestType issueRequestType, bool includeDetails = false, CancellationToken cancellationToken = default)
-    {
-        Expression<Func<InjectionIssueNote, bool>> expression = p => p.IssueRequestType == issueRequestType;
-        if (requestInput.Condition.Filters?.Count > 0)
-        {
-            expression = expression.And(requestInput.Condition.Filters.ToLambda<InjectionIssueNote>());
-        }
-
-        return await GetPagedListAsync(expression, requestInput.SkipCount, requestInput.MaxResultCount,
-            requestInput.Sorting, includeDetails, cancellationToken).ConfigureAwait(false);
-    }
-
-    [HttpPost("list-by-type-and-un-confirmed")]
-    public virtual async Task<List<InjectionIssueNoteDTO>> GetListUnConfirmedByTypeAsync(EnumIssueRequestType issueRequestType)
-    {
-        var entities = await _repository.GetListAsync(c => !c.Confirmed && c.IssueRequestType == issueRequestType)
-            .ConfigureAwait(false);
-
-        var dtos = ObjectMapper.Map<List<InjectionIssueNote>, List<InjectionIssueNoteDTO>>(entities);
-
-        return dtos;
     }
 
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/InjectionPlanRequests/InjectionPlanRequestAppService.cs

@@ -0,0 +1,214 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Volo.Abp;
+using Win_in.Sfs.Basedata.Application.Contracts;
+using Win_in.Sfs.Shared.Domain.Shared;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
+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}injection-plan-request")]
+public class InjectionPlanRequestAppService : SfsStoreRequestAppServiceBase<InjectionPlanRequest,
+        InjectionPlanRequestDTO,
+        SfsStoreRequestInputBase, InjectionPlanRequestEditInput, InjectionPlanRequestDetail,
+        InjectionPlanRequestDetailDTO,
+        SfsStoreRequestInputBase, InjectionPlanRequestImportInput>,
+    IInjectionPlanRequestAppService
+{
+    private readonly IInjectionPlanRequestManager _injectionRequestManager;
+    private readonly ILocationAppService _locationAppService;
+    private readonly IItemBasicAppService _itemBasicAppService;
+    private readonly IItemContainerAppService _itemContainerAppService;
+
+    private readonly ITransactionTypeAppService _transactionTypeAppService;
+
+    public InjectionPlanRequestAppService(
+        IInjectionPlanRequestRepository repository,
+        IInjectionPlanRequestManager injectionRequestManager,
+        ILocationAppService locationAppService,
+        IItemBasicAppService itemBasicAppService,
+        IItemContainerAppService itemContainerAppService,
+        ITransactionTypeAppService transactionTypeAppService
+    )
+        : base(repository, injectionRequestManager)
+    {
+        _injectionRequestManager = injectionRequestManager;
+        _locationAppService = locationAppService;
+        _itemBasicAppService = itemBasicAppService;
+        _itemContainerAppService = itemContainerAppService;
+        _transactionTypeAppService = transactionTypeAppService;
+    }
+
+    public override async Task<InjectionPlanRequestDTO> HandleAsync(Guid id)
+    {
+        await Task.CompletedTask.ConfigureAwait(false);
+        return null;
+    }
+
+    [HttpPost("")]
+    public override async Task<InjectionPlanRequestDTO> CreateAsync(InjectionPlanRequestEditInput 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.ToLocationArea = toLocationDto.AreaCode;
+            detailInput.ToLocationGroup = toLocationDto.LocationGroupCode;
+            detailInput.ToWarehouseCode = toLocationDto.WarehouseCode;
+            detailInput.ProdLine = detailInput.ToLocationCode;
+            detailInput.ToLocationErpCode = toLocationDto.ErpLocationCode;
+
+            detailInput.ItemDesc1 = itemBasicDto.Desc1;
+            detailInput.ItemDesc2 = itemBasicDto.Desc2;
+            detailInput.ItemName = itemBasicDto.Name;
+
+            var itemContainerDto = await _itemContainerAppService.GetListByItemCodeAsync(detailInput.ItemCode)
+                .ConfigureAwait(false);
+            if (itemContainerDto.Count > 0)
+            {
+                detailInput.Uom = itemContainerDto[0].BasicUom;
+                detailInput.Qty = itemContainerDto[0].Qty;
+                detailInput.StdPackQty = itemBasicDto.StdPackQty;
+            }
+            else
+            {
+                detailInput.Uom = itemBasicDto.BasicUom;
+                detailInput.StdPackQty = itemBasicDto.StdPackQty;
+                detailInput.Qty = itemBasicDto.StdPackQty;
+            }
+
+            detailInput.Status = EnumStatus.Open;
+
+            //因为是刚创建的 所以发料数一定是0
+            detailInput.IssuedQty = 0;
+        }
+
+        await SetRequestAutoPropertiesAsync(input).ConfigureAwait(false);
+        var entity = ObjectMapper.Map<InjectionPlanRequestEditInput, InjectionPlanRequest>(input);
+
+        var result = await _injectionRequestManager.CreateByNumberAsync(entity).ConfigureAwait(false);
+
+        var dto = ObjectMapper.Map<InjectionPlanRequest, InjectionPlanRequestDTO>(result);
+
+        return dto;
+    }
+
+    /// <summary>
+    ///     赋值Request业务属性
+    /// </summary>
+    /// <param name="entity"></param>
+    /// <returns></returns>
+    private async Task SetRequestAutoPropertiesAsync(InjectionPlanRequestEditInput entity)
+    {
+        var tranType = await _transactionTypeAppService.GetByTransTypeAsync(EnumTransType.Issue, EnumTransSubType.None)
+            .ConfigureAwait(false);
+        Check.NotNull(tranType, "事务类型", "事务类型不存在");
+        entity.AutoSubmit = tranType.AutoSubmitRequest;
+        entity.AutoAgree = tranType.AutoAgreeRequest;
+        entity.AutoHandle = tranType.AutoHandleRequest;
+        entity.AutoCompleteJob = tranType.AutoCompleteJob;
+        entity.DirectCreateNote = tranType.DirectCreateNote;
+    }
+
+    [HttpPost("create-and-handle")]
+    public async Task<InjectionPlanRequestDTO> CreateAndHandleAsync(InjectionPlanRequestEditInput input)
+    {
+        var injectionRequestDto = await CreateAsync(input).ConfigureAwait(false);
+
+        await HandleAsync(injectionRequestDto.Id).ConfigureAwait(false);
+
+        return injectionRequestDto;
+    }
+
+    /// <summary>
+    ///     获取物品类别列表
+    /// </summary>
+    /// <param name="type"></param>
+    /// <returns></returns>
+    [HttpGet("list/item-category")]
+    public virtual async Task<List<ItemBasicDTO>> GetItemCategoryListAsync()
+    {
+        var entities = await _itemBasicAppService.GetCategoryListAsync().ConfigureAwait(false);
+
+        return entities;
+    }
+
+    /// <summary>
+    ///     获取已完成的叫料单数量
+    /// </summary>
+    /// <returns></returns>
+    [HttpPost("get-uncompleted-request")]
+    public async Task<List<UnCompletedRequestDto>> GetUnCompletedRequestAsync(List<UnCompletedRequestDto> p_list)
+    {
+        var returnList = new List<UnCompletedRequestDto>();
+        //枚举类型查不到改成SQL查询
+        var list = await _repository.GetListAsync(p =>
+                p.RequestStatus != EnumRequestStatus.Completed && p.IssueRequestType == EnumIssueRequestType.Vision)
+            .ConfigureAwait(false);
+        foreach (var itm in list)
+        {
+            var query = from detail in itm.Details
+                join citm in p_list on new
+                    {
+                        detail.ItemCode, locCode = detail.ToLocationCode, areaCode = detail.PositionCode
+                    } equals
+                    new { citm.ItemCode, locCode = citm.LocCode, areaCode = citm.PositionCode }
+                select new UnCompletedRequestDto
+                {
+                    ItemCode = detail.ItemCode, LocCode = detail.ToLocationCode, PositionCode = detail.PositionCode
+                };
+
+            returnList.AddRange(query.ToList());
+        }
+
+        return returnList;
+    }
+
+    #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
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/InjectionPlanRequests/InjectionPlanRequestAutoMapperProfile.cs

@@ -0,0 +1,65 @@
+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 InjectionPlanRequestAutoMapperProfile()
+    {
+        CreateMap<InjectionPlanRequest, InjectionPlanRequestDTO>()
+            .ReverseMap();
+
+        CreateMap<InjectionPlanRequestDetail, InjectionPlanRequestDetailDTO>()
+            .ReverseMap();
+
+        CreateMap<InjectionPlanRequestDetailInput, InjectionPlanRequestDetail>()
+              .IgnoreAuditedObjectProperties()
+              .Ignore(x => x.MasterID)
+              .Ignore(x => x.TenantId)
+              .Ignore(x => x.Number)
+              .Ignore(x => x.Id);
+
+        CreateMap<InjectionPlanRequestImportInput, InjectionPlanRequest>()
+            .IgnoreAuditedObjectProperties()
+            .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<InjectionPlanRequestImportInput, InjectionPlanRequestDetail>()
+            .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.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<InjectionPlanRequestEditInput, InjectionPlanRequest>()
+            .IgnoreAuditedObjectProperties()
+            .Ignore(x => x.RequestStatus)
+            .Ignore(x => x.ConcurrencyStamp).Ignore(x => x.Id);
+    }
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/InjectionIssueRequests/InjectionIssueRequestAppService.cs

@@ -2,12 +2,13 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Castle.Components.DictionaryAdapter;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using NUglify.Helpers;
 using Volo.Abp;
 using Win_in.Sfs.Basedata.Application.Contracts;
 using Win_in.Sfs.Shared.Domain.Shared;
-using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 using Win_in.Sfs.Wms.Store.Domain;
 using Win_in.Sfs.Wms.Store.Domain.Shared;
@@ -15,45 +16,51 @@ using Win_in.Sfs.Wms.Store.Domain.Shared;
 namespace Win_in.Sfs.Wms.Store.Application;
 
 /// <summary>
-///     注塑发料申请
+/// 注塑叫料申请
 /// </summary>
 [Authorize]
 [Route($"{StoreConsts.RootPath}injection-issue-request")]
-public class InjectionIssueRequestAppService : SfsStoreRequestAppServiceBase<InjectionIssueRequest,
+public class InjectionIssueRequestAppService : SfsStoreRequestAppServiceBase<InjectionIssueRequest, InjectionIssueRequestDTO,
-        InjectionIssueRequestDTO,
+        SfsStoreRequestInputBase, InjectionIssueRequestEditInput, InjectionIssueRequestDetail, InjectionIssueRequestDetailDTO,
-        SfsStoreRequestInputBase, InjectionIssueRequestEditInput, InjectionIssueRequestDetail,
-        InjectionIssueRequestDetailDTO,
         SfsStoreRequestInputBase, InjectionIssueRequestImportInput>,
     IInjectionIssueRequestAppService
 {
-    private readonly IInjectionIssueRequestManager _injectionRequestManager;
+    private readonly IInjectionIssueRequestManager _injectionIssueRequestManager;
+    private readonly IItemStoreRelationAppService _itemStoreRelationApp;
+    private readonly IAreaAppService _areaApp;
     private readonly ILocationAppService _locationAppService;
     private readonly IItemBasicAppService _itemBasicAppService;
-    private readonly IItemContainerAppService _itemContainerAppService;
+    private readonly IProductionLineAppService _productionLineAppService;
+    private readonly IInjectionIssueJobAppService _injectionIssueJobAppService;
 
     private readonly ITransactionTypeAppService _transactionTypeAppService;
 
     public InjectionIssueRequestAppService(
         IInjectionIssueRequestRepository repository,
-        IInjectionIssueRequestManager injectionRequestManager,
+        IInjectionIssueRequestManager injectionIssueRequestManager,
+        IPreparationPlanManager preparationPlanManager,
+        IItemStoreRelationAppService itemStoreRelationApp,
+        IAreaAppService areaApp,
         ILocationAppService locationAppService,
         IItemBasicAppService itemBasicAppService,
-        IItemContainerAppService itemContainerAppService,
+        IProductionLineAppService productionLineAppService,
-        ITransactionTypeAppService transactionTypeAppService
+        ITransactionTypeAppService transactionTypeAppService, IInjectionIssueJobAppService injectionIssueJobAppService)
-    )
+        : base(repository, injectionIssueRequestManager)
-        : base(repository, injectionRequestManager)
     {
-        _injectionRequestManager = injectionRequestManager;
+        _injectionIssueRequestManager = injectionIssueRequestManager;
+        _itemStoreRelationApp = itemStoreRelationApp;
+        _areaApp = areaApp;
         _locationAppService = locationAppService;
         _itemBasicAppService = itemBasicAppService;
-        _itemContainerAppService = itemContainerAppService;
+        _productionLineAppService = productionLineAppService;
+
         _transactionTypeAppService = transactionTypeAppService;
+        _injectionIssueJobAppService = injectionIssueJobAppService;
     }
 
     public override async Task<InjectionIssueRequestDTO> HandleAsync(Guid id)
     {
-        await Task.CompletedTask.ConfigureAwait(false);
+        return await base.HandleAsync(id).ConfigureAwait(false);
-        return null;
     }
 
     [HttpPost("")]
@@ -67,49 +74,40 @@ public class InjectionIssueRequestAppService : SfsStoreRequestAppServiceBase<Inj
             }
         }
 
-        foreach (var detailInput in input.Details) //赋值生产线
+        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);
+            var productionLineDto = await _productionLineAppService.GetByLocationCodeAsync(detailInput.ToLocationCode)
+                .ConfigureAwait(false);
+            CheckProductionLine(productionLineDto, detailInput.ProdLine);
+
+            detailInput.ProdLine = productionLineDto.Code;
 
             detailInput.ToLocationArea = toLocationDto.AreaCode;
             detailInput.ToLocationGroup = toLocationDto.LocationGroupCode;
             detailInput.ToWarehouseCode = toLocationDto.WarehouseCode;
-            detailInput.ProdLine = detailInput.ToLocationCode;
             detailInput.ToLocationErpCode = toLocationDto.ErpLocationCode;
 
             detailInput.ItemDesc1 = itemBasicDto.Desc1;
             detailInput.ItemDesc2 = itemBasicDto.Desc2;
             detailInput.ItemName = itemBasicDto.Name;
-
-            var itemContainerDto = await _itemContainerAppService.GetListByItemCodeAsync(detailInput.ItemCode)
-                .ConfigureAwait(false);
-            if (itemContainerDto.Count > 0)
-            {
-                detailInput.Uom = itemContainerDto[0].BasicUom;
-                detailInput.Qty = itemContainerDto[0].Qty;
-                detailInput.StdPackQty = itemBasicDto.StdPackQty;
-            }
-            else
-            {
             detailInput.Uom = itemBasicDto.BasicUom;
             detailInput.StdPackQty = itemBasicDto.StdPackQty;
-                detailInput.Qty = itemBasicDto.StdPackQty;
-            }
-
             detailInput.Status = EnumStatus.Open;
 
             //因为是刚创建的 所以发料数一定是0
             detailInput.IssuedQty = 0;
+            detailInput.RecommendType = EnumRecommendType.KITTING;
         }
 
         await SetRequestAutoPropertiesAsync(input).ConfigureAwait(false);
         var entity = ObjectMapper.Map<InjectionIssueRequestEditInput, InjectionIssueRequest>(input);
 
-        var result = await _injectionRequestManager.CreateByNumberAsync(entity).ConfigureAwait(false);
+        var result = await _injectionIssueRequestManager.CreateByNumberAsync(entity).ConfigureAwait(false);
 
         var dto = ObjectMapper.Map<InjectionIssueRequest, InjectionIssueRequestDTO>(result);
 
@@ -136,59 +134,239 @@ public class InjectionIssueRequestAppService : SfsStoreRequestAppServiceBase<Inj
     [HttpPost("create-and-handle")]
     public async Task<InjectionIssueRequestDTO> CreateAndHandleAsync(InjectionIssueRequestEditInput input)
     {
-        var injectionRequestDto = await CreateAsync(input).ConfigureAwait(false);
+        var injectionIssueRequestDto = await CreateAsync(input).ConfigureAwait(false);
 
-        await HandleAsync(injectionRequestDto.Id).ConfigureAwait(false);
+        //await HandleAsync(injectionIssueRequestDto.Id).ConfigureAwait(false);
 
-        return injectionRequestDto;
+        return injectionIssueRequestDto;
     }
 
-    /// <summary>
+    public override async Task<InjectionIssueRequestDTO> CancelAsync(Guid id)
-    ///     获取物品类别列表
+    {
-    /// </summary>
+        var request = await _repository.GetAsync(id).ConfigureAwait(false);
-    /// <param name="type"></param>
+
-    /// <returns></returns>
+        var list = await _injectionIssueJobAppService.GetByRequestNumberAsync(request.Number).ConfigureAwait(false);
-    [HttpGet("list/item-category")]
+        if (list.Any())
-    public virtual async Task<List<ItemBasicDTO>> GetItemCategoryListAsync()
+        {
+            foreach (var injectionIssueJobDto in list)
+            {
+                if (injectionIssueJobDto.JobStatus == EnumJobStatus.Open ||
+                    injectionIssueJobDto.JobStatus == EnumJobStatus.Partial ||
+                    injectionIssueJobDto.JobStatus == EnumJobStatus.Doing ||
+                    injectionIssueJobDto.JobStatus == EnumJobStatus.Wait)
+                {
+                    await _injectionIssueJobAppService.CancelAsync(injectionIssueJobDto.Id).ConfigureAwait(false);
+                }
+            }
+        }
+
+        if (request.RequestStatus == EnumRequestStatus.Partial || request.RequestStatus == EnumRequestStatus.Handling ||
+            request.RequestStatus == EnumRequestStatus.New)
+        {
+            request.RequestStatus = EnumRequestStatus.Cancelled;
+            await _repository.UpdateAsync(request).ConfigureAwait(false);
+        }
+        else
         {
-        var entities = await _itemBasicAppService.GetCategoryListAsync().ConfigureAwait(false);
+            throw new UserFriendlyException($"【{request.RequestStatus.GetDisplayName()}】状态不允许取消");
+        }
 
-        return entities;
+        return ObjectMapper.Map<InjectionIssueRequest, InjectionIssueRequestDTO>(request);
+    }
+
+    [HttpPost("UpdateStatusCompleted")]
+    public async Task UpdateStatusCompletedAsync(string number)
+    {
+        var injectionIssueRequest = await _repository.FindAsync(p => p.Number == number).ConfigureAwait(false);
+
+        await UpdateInjectionIssueRequestDetailQtyAsync(injectionIssueRequest, new EditableList<InjectionIssueJobDTO>())
+            .ConfigureAwait(false);
+
+        var injectionIssueJobDtos = await _injectionIssueJobAppService.GetByRequestNumberAsync(injectionIssueRequest.Number)
+            .ConfigureAwait(false);
+
+        if (injectionIssueJobDtos.Any(p =>
+                p.JobStatus == EnumJobStatus.Open || p.JobStatus == EnumJobStatus.Doing ||
+                p.JobStatus == EnumJobStatus.Partial))
+        {
+            return;
+        }
+
+        var flag = true;
+
+        foreach (var detail in injectionIssueRequest.Details)
+        {
+            if (detail.Qty >= detail.IssuedQty)
+            {
+                flag = false;
+                return;
+            }
+        }
+
+        if (flag)
+        {
+            CheckStatus(EnumRequestStatus.Completed, injectionIssueRequest.RequestStatus);
+            injectionIssueRequest.RequestStatus = EnumRequestStatus.Completed;
+            await _repository.UpdateAsync(injectionIssueRequest).ConfigureAwait(false);
+        }
     }
 
     /// <summary>
-    ///     获取已完成的叫料单数量
+    ///     修改请求的 已发 已收数量
     /// </summary>
+    /// <param name="injectionIssueRequest"></param>
+    /// <param name="addInjectionIssueJobDtos"></param>
     /// <returns></returns>
-    [HttpPost("get-uncompleted-request")]
+    private async Task UpdateInjectionIssueRequestDetailQtyAsync(InjectionIssueRequest injectionIssueRequest,
-    public async Task<List<UnCompletedRequestDto>> GetUnCompletedRequestAsync(List<UnCompletedRequestDto> p_list)
+        List<InjectionIssueJobDTO> addInjectionIssueJobDtos)
     {
-        var returnList = new List<UnCompletedRequestDto>();
+        //原有任务
-        //枚举类型查不到改成SQL查询
+        var existInjectionIssueJobDtos = await _injectionIssueJobAppService
-        var list = await _repository.GetListAsync(p =>
+            .GetByRequestNumberAsync(injectionIssueRequest.Number)
-                p.RequestStatus != EnumRequestStatus.Completed && p.IssueRequestType == EnumIssueRequestType.Vision)
             .ConfigureAwait(false);
-        foreach (var itm in list)
+
+        //新增的任务和已有的任务总和
+        var allInjectionIssueJobDtos = new List<InjectionIssueJobDTO>();
+        allInjectionIssueJobDtos.AddRange(addInjectionIssueJobDtos);
+        allInjectionIssueJobDtos.AddRange(existInjectionIssueJobDtos);
+
+        var groupByItemCodeLocationCode = injectionIssueRequest.Details.GroupBy(p =>
+            new { p.ItemCode, p.ToLocationCode });
+        foreach (var group in groupByItemCodeLocationCode)
         {
-            var query = from detail in itm.Details
+            foreach (var requestDetail in group)
-                join citm in p_list on new
             {
-                        detail.ItemCode, locCode = detail.ToLocationCode, areaCode = detail.PositionCode
+                //所有已发数量
-                    } equals
+                decimal allIssuedQty = 0;
-                    new { citm.ItemCode, locCode = citm.LocCode, areaCode = citm.PositionCode }
+
-                select new UnCompletedRequestDto
+                //所有已发数量
+                decimal allReceivedQty = 0;
+
+                foreach (var allInjectionIssueJobDto in allInjectionIssueJobDtos)
                 {
-                    ItemCode = detail.ItemCode, LocCode = detail.ToLocationCode, PositionCode = detail.PositionCode
+                    var jobDetailDtos = allInjectionIssueJobDto.Details.Where(p =>
-                };
+                        p.ItemCode == group.Key.ItemCode && p.RequestLocationCode == group.Key.ToLocationCode);
+                    //所有已发数量
+                    allIssuedQty += jobDetailDtos.Sum(p => p.RequestQty);
+                    //所有已发数量
+                    allReceivedQty += jobDetailDtos.Sum(p => p.HandledToQty);
+                }
 
-            returnList.AddRange(query.ToList());
+                requestDetail.IssuedQty += allIssuedQty;
+                requestDetail.ReceivedQty += allReceivedQty;
+            }
         }
 
-        return returnList;
+        await _repository.UpdateAsync(injectionIssueRequest).ConfigureAwait(false);
+    }
+
+    [HttpPost("IsHasNewJob")]
+    public async Task<string> IsHasNewJobAsync(string requestNumber, List<string> jobNumber)
+    {
+        var joblIssueJobDtos =
+            await _injectionIssueJobAppService.GetByRequestNumberAsync(requestNumber).ConfigureAwait(false);
+        if (joblIssueJobDtos != null && joblIssueJobDtos.Any())
+        {
+            var jobNumberList = joblIssueJobDtos.Select(p => p.Number);
+
+            var difference = jobNumberList.Except(jobNumber);
+            if (difference.Any())
+            {
+                var result = "已生成任务号";
+                difference.ForEach(p => result += "【" + p + "】");
+                result += "的任务";
+                return result;
+            }
+
+            return "无任务生成，请检查库存";
+        }
+
+        return "无任务生成，请检查库存";
+    }
+
+    public override async Task<InjectionIssueRequestDTO> CompleteAsync(Guid id)
+    {
+        var injectionIssueRequest = await _repository.GetAsync(id).ConfigureAwait(false);
+        if (injectionIssueRequest.RequestStatus == EnumRequestStatus.Handling ||
+            injectionIssueRequest.RequestStatus == EnumRequestStatus.Partial ||
+            injectionIssueRequest.RequestStatus == EnumRequestStatus.New)
+        {
+            injectionIssueRequest.RequestStatus = EnumRequestStatus.Completed;
+        }
+        else
+        {
+            throw new UserFriendlyException($"【{injectionIssueRequest.RequestStatus.GetDisplayName()}】状态不允许完成");
+        }
+
+        await _injectionIssueJobAppService.CompleteByRequestNumberAsync(injectionIssueRequest.Number).ConfigureAwait(false);
+
+        return ObjectMapper.Map<InjectionIssueRequest, InjectionIssueRequestDTO>(await _repository.UpdateAsync(injectionIssueRequest)
+            .ConfigureAwait(false));
     }
 
     #region 校验
 
+    private void CheckStatus(EnumRequestStatus targetStatus, EnumRequestStatus nowStatus)
+    {
+        var validSourceStatuses = new List<EnumRequestStatus>();
+        switch (targetStatus)
+        {
+            case EnumRequestStatus.None:
+                break;
+            case EnumRequestStatus.New:
+                break;
+            case EnumRequestStatus.Reviewing:
+                validSourceStatuses = new List<EnumRequestStatus> { EnumRequestStatus.New };
+                break;
+            case EnumRequestStatus.Refused:
+                validSourceStatuses = new List<EnumRequestStatus> { EnumRequestStatus.Reviewing };
+                break;
+            case EnumRequestStatus.Agreed:
+                validSourceStatuses = new List<EnumRequestStatus> { EnumRequestStatus.Reviewing };
+                break;
+            case EnumRequestStatus.Handling:
+                validSourceStatuses = new List<EnumRequestStatus>
+                {
+                    EnumRequestStatus.Agreed, EnumRequestStatus.Partial
+                };
+                break;
+            case EnumRequestStatus.Completed:
+                validSourceStatuses = new List<EnumRequestStatus>
+                {
+                    EnumRequestStatus.Handling, EnumRequestStatus.Partial
+                };
+                break;
+            case EnumRequestStatus.Cancelled:
+                validSourceStatuses = new List<EnumRequestStatus>
+                {
+                    EnumRequestStatus.New, EnumRequestStatus.Reviewing, EnumRequestStatus.Agreed
+                };
+                break;
+            case EnumRequestStatus.Abort:
+                validSourceStatuses = new List<EnumRequestStatus>
+                {
+                    EnumRequestStatus.Handling, EnumRequestStatus.Partial
+                };
+                break;
+            case EnumRequestStatus.Partial:
+                {
+                    validSourceStatuses = new List<EnumRequestStatus>
+                {
+                    EnumRequestStatus.Handling, EnumRequestStatus.Partial
+                };
+                    break;
+                }
+            default:
+                throw new ArgumentOutOfRangeException(nameof(targetStatus), targetStatus, null);
+        }
+
+        if (!validSourceStatuses.Contains(nowStatus))
+        {
+            throw new UserFriendlyException(
+                $"当前状态为 {nowStatus.GetDisplayName()} ,无法变更为 {targetStatus.GetDisplayName()}");
+        }
+    }
+
     private void CheckItemBasic(ItemBasicDTO itemBasicDto, string itemCode)
     {
         if (itemBasicDto == null)
@@ -204,9 +382,18 @@ public class InjectionIssueRequestAppService : SfsStoreRequestAppServiceBase<Inj
             throw new UserFriendlyException($"库位代码为【{locationCode}】不存在");
         }
 
-        if (locationDto.Type != EnumLocationType.WIP)
+        if (locationDto.Type != EnumLocationType.KittingWip)
+        {
+            throw new UserFriendlyException(
+                $"库位代码【{locationCode}】不是【{EnumLocationType.KittingWip.GetDisplayName()}】类型");
+        }
+    }
+
+    private void CheckProductionLine(ProductionLineDTO productionLineDto, string productionCode)
+    {
+        if (productionLineDto == null)
         {
-            throw new UserFriendlyException($"库位代码【{locationCode}】不是【{EnumLocationType.WIP.GetDisplayName()}】类型");
+            throw new UserFriendlyException($"未找到生产线【{productionCode}】");
         }
     }
 

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/InjectionPlanJobs/IInjectionPlanJobManager.cs

@@ -0,0 +1,10 @@
+using System;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
+
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+public interface IInjectionPlanJobManager : IJobManager<InjectionPlanJob>
+{
+    Task<InjectionPlanJob> GetAsync(Expression<Func<InjectionPlanJob, bool>> expression);
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/InjectionPlanJobs/IInjectionPlanJobRepository.cs

@@ -0,0 +1,6 @@
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+public interface IInjectionPlanJobRepository : ISfsJobRepositoryBase<InjectionPlanJob>
+{
+
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/InjectionPlanJobs/InjectionPlanJob.cs

@@ -0,0 +1,44 @@
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Shared.Domain.Entities;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
+
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+/// <summary>
+/// 注塑计划任务
+/// </summary>
+[Display(Name = "注塑计划任务")]
+public class InjectionPlanJob : SfsJobAggregateRootBase<InjectionPlanJobDetail>
+{
+    /// <summary>
+    ///     叫料类型
+    /// </summary>
+    [Display(Name = "叫料类型")]
+    public EnumIssueRequestType IssueRequestType { get; set; }
+
+    /// <summary>
+    ///     生产线
+    /// </summary>
+    [IgnoreUpdate]
+    public string ProdLine { get; set; }
+
+    /// <summary>
+    ///     注塑要料单号
+    /// </summary>
+    [IgnoreUpdate]
+    public string InjectionPlanRequestNumber { get; set; }
+
+    /// <summary>
+    ///     使用在途库
+    /// </summary>
+    [Display(Name = "使用在途库")]
+    [IgnoreUpdate]
+    public bool UseOnTheWayLocation { get; set; }
+
+    /// <summary>
+    ///     任务明细
+    /// </summary>
+    [IgnoreUpdate]
+    public override List<InjectionPlanJobDetail> Details { get; set; } = new();
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/InjectionPlanJobs/InjectionPlanJobDetail.cs

@@ -0,0 +1,531 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
+
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+public class InjectionPlanJobDetail : SfsDetailEntityBase
+{
+    #region 库存基础信息
+
+    /// <summary>
+    ///     物品代码
+    /// </summary>
+    [Display(Name = "物品代码")]
+    public string ItemCode { get; set; }
+
+    /// <summary>
+    ///     物品名称
+    /// </summary>
+    [Display(Name = "物品名称")]
+    public string ItemName { get; set; }
+
+    /// <summary>
+    ///     物品描述1
+    /// </summary>
+    [Display(Name = "物品描述1")]
+    public string ItemDesc1 { get; set; }
+
+    /// <summary>
+    ///     物品描述2
+    /// </summary>
+    [Display(Name = "物品描述2")]
+    public string ItemDesc2 { get; set; }
+
+    /// <summary>
+    ///     标包数量
+    /// </summary>
+    [Display(Name = "标包数量")]
+    [Column(TypeName = "decimal(18,6)")]
+    public decimal StdPackQty { get; set; }
+
+    /// <summary>
+    ///     库存状态
+    /// </summary>
+    [Display(Name = "库存状态")]
+    public EnumInventoryStatus Status { get; set; }
+
+    /// <summary>
+    ///     计量单位
+    /// </summary>
+    [Display(Name = "计量单位")]
+    public string Uom { get; set; }
+
+    #endregion
+
+    #region 请求信息
+
+    /// <summary>
+    ///     请求库位
+    /// </summary>
+    public string RequestLocationCode { get; set; }
+
+    /// <summary>
+    ///     到库区
+    /// </summary>
+    public string RequestLocationArea { get; set; }
+
+    /// <summary>
+    ///     到库位组
+    /// </summary>
+    public string RequestLocationGroup { get; set; }
+
+    /// <summary>
+    ///     到ERP库位
+    /// </summary>
+    public string RequestLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     到仓库
+    /// </summary>
+    public string RequestWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     在途库库位
+    /// </summary>
+    public string OnTheWayLocationCode { get; set; }
+
+    /// <summary>
+    ///     生产线
+    /// </summary>
+    public string ProdLine { get; set; }
+
+    /// <summary>
+    ///     位置码
+    /// </summary>
+    public string PositionCode { get; set; }
+
+    /// <summary>
+    ///     推荐的类型
+    /// </summary>
+    public EnumRecommendType RecommendType { get; set; }
+
+    /// <summary>
+    ///     需求数量
+    /// </summary>
+    public decimal RequestQty { get; set; }
+
+    #endregion
+
+    #region 推荐来源
+
+    /// <summary>
+    ///     推荐来源托标签
+    /// </summary>
+    public string RecommendFromContainerCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源箱标签
+    /// </summary>
+    public string RecommendFromPackingCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次供应商批次
+    /// </summary>
+    public string RecommendFromSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次到货时间
+    /// </summary>
+    public DateTime RecommendFromArriveDate { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次生产时间
+    /// </summary>
+    public DateTime RecommendFromProduceDate { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次过期时间
+    /// </summary>
+    public DateTime RecommendFromExpireDate { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次排序
+    /// </summary>
+    public string RecommendFromLot { get; set; }
+
+    /// <summary>
+    ///     推荐来源库位
+    /// </summary>
+    public string RecommendFromLocationCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源库区
+    /// </summary>
+    public string RecommendFromLocationArea { get; set; }
+
+    /// <summary>
+    ///     推荐来源库位组
+    /// </summary>
+    public string RecommendFromLocationGroup { get; set; }
+
+    /// <summary>
+    ///     推荐来源ERP库位
+    /// </summary>
+    public string RecommendFromLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源仓库
+    /// </summary>
+    public string RecommendFromWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源数量
+    /// </summary>
+    public decimal RecommendFromQty { get; set; }
+
+    #endregion
+
+    #region 推荐目标
+
+    /// <summary>
+    ///     推荐目标托标签
+    /// </summary>
+    public string RecommendToContainerCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标箱标签
+    /// </summary>
+    public string RecommendToPackingCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次供应商批次
+    /// </summary>
+    public string RecommendToSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次到货时间
+    /// </summary>
+    public DateTime RecommendToArriveDate { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次生产时间
+    /// </summary>
+    public DateTime RecommendToProduceDate { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次过期时间
+    /// </summary>
+    public DateTime RecommendToExpireDate { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次排序
+    /// </summary>
+    public string RecommendToLot { get; set; }
+
+    /// <summary>
+    ///     推荐目标库位
+    /// </summary>
+    public string RecommendToLocationCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标库区
+    /// </summary>
+    public string RecommendToLocationArea { get; set; }
+
+    /// <summary>
+    ///     推荐目标库位组
+    /// </summary>
+    public string RecommendToLocationGroup { get; set; }
+
+    /// <summary>
+    ///     推荐目标ERP库位
+    /// </summary>
+    public string RecommendToLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标仓库
+    /// </summary>
+    public string RecommendToWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标数量
+    /// </summary>
+    public decimal RecommendToQty { get; set; }
+
+    #endregion
+
+    #region 库移来源
+
+    /// <summary>
+    ///     库移来源托标签
+    /// </summary>
+    public string TransferLibFromContainerCode { get; set; }
+
+    /// <summary>
+    ///     库移来源箱标签
+    /// </summary>
+    public string TransferLibFromPackingCode { get; set; }
+
+    /// <summary>
+    ///     库移来源批次供应商批次
+    /// </summary>
+    public string TransferLibFromSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     库移来源批次到货时间
+    /// </summary>
+    public DateTime TransferLibFromArriveDate { get; set; }
+
+    /// <summary>
+    ///     库移来源批次生产时间
+    /// </summary>
+    public DateTime TransferLibFromProduceDate { get; set; }
+
+    /// <summary>
+    ///     库移来源批次过期时间
+    /// </summary>
+    public DateTime TransferLibFromExpireDate { get; set; }
+
+    /// <summary>
+    ///     库移来源批次排序
+    /// </summary>
+    public string TransferLibFromLot { get; set; }
+
+    /// <summary>
+    ///     库移来源库位
+    /// </summary>
+    public string TransferLibFromLocationCode { get; set; }
+
+    /// <summary>
+    ///     库移来源库区
+    /// </summary>
+    public string TransferLibFromLocationArea { get; set; }
+
+    /// <summary>
+    ///     库移来源库位组
+    /// </summary>
+    public string TransferLibFromLocationGroup { get; set; }
+
+    /// <summary>
+    ///     库移来源ERP库位
+    /// </summary>
+    public string TransferLibFromLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     库移来源仓库
+    /// </summary>
+    public string TransferLibFromWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     库移来源数量
+    /// </summary>
+    public decimal TransferLibFromQty { get; set; }
+
+    #endregion
+
+    #region 库移目标
+
+    /// <summary>
+    ///     库移目标托标签
+    /// </summary>
+    public string TransferLibToContainerCode { get; set; }
+
+    /// <summary>
+    ///     库移目标箱标签
+    /// </summary>
+    public string TransferLibToPackingCode { get; set; }
+
+    /// <summary>
+    ///     库移目标批次供应商批次
+    /// </summary>
+    public string TransferLibToSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     库移目标批次到货时间
+    /// </summary>
+    public DateTime TransferLibToArriveDate { get; set; }
+
+    /// <summary>
+    ///     库移目标批次生产时间
+    /// </summary>
+    public DateTime TransferLibToProduceDate { get; set; }
+
+    /// <summary>
+    ///     库移目标批次过期时间
+    /// </summary>
+    public DateTime TransferLibToExpireDate { get; set; }
+
+    /// <summary>
+    ///     库移目标批次排序
+    /// </summary>
+    public string TransferLibToLot { get; set; }
+
+    /// <summary>
+    ///     库移目标库位
+    /// </summary>
+    public string TransferLibToLocationCode { get; set; }
+
+    /// <summary>
+    ///     库移目标库区
+    /// </summary>
+    public string TransferLibToLocationArea { get; set; }
+
+    /// <summary>
+    ///     库移目标库位组
+    /// </summary>
+    public string TransferLibToLocationGroup { get; set; }
+
+    /// <summary>
+    ///     库移目标ERP库位
+    /// </summary>
+    public string TransferLibToLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     库移目标仓库
+    /// </summary>
+    public string TransferLibToWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     库移目标数量
+    /// </summary>
+    public decimal TransferLibToQty { get; set; }
+
+    #endregion
+
+    #region 实际来源
+
+    /// <summary>
+    ///     实际目标托标签
+    /// </summary>
+    public string HandledFromContainerCode { get; set; }
+
+    /// <summary>
+    ///     实际箱标签
+    /// </summary>
+    public string HandledFromPackingCode { get; set; }
+
+    /// <summary>
+    ///     实际批次供应商批次
+    /// </summary>
+    public string HandledFromSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     实际批次到货时间
+    /// </summary>
+    public DateTime HandledFromArriveDate { get; set; }
+
+    /// <summary>
+    ///     实际批次生产时间
+    /// </summary>
+    public DateTime HandledFromProduceDate { get; set; }
+
+    /// <summary>
+    ///     实际批次过期时间
+    /// </summary>
+    public DateTime HandledFromExpireDate { get; set; }
+
+    /// <summary>
+    ///     实际批次排序
+    /// </summary>
+    public string HandledFromLot { get; set; }
+
+    /// <summary>
+    ///     实际库位
+    /// </summary>
+    public string HandledFromLocationCode { get; set; }
+
+    /// <summary>
+    ///     实际库区
+    /// </summary>
+    public string HandledFromLocationArea { get; set; }
+
+    /// <summary>
+    ///     实际库位组
+    /// </summary>
+    public string HandledFromLocationGroup { get; set; }
+
+    /// <summary>
+    ///     实际ERP库位
+    /// </summary>
+    public string HandledFromLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     实际仓库
+    /// </summary>
+    public string HandledFromWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     实际数量
+    /// </summary>
+    public decimal HandledFromQty { get; set; }
+
+    #endregion
+
+    #region 实际目标
+
+    /// <summary>
+    ///     实际目标托标签
+    /// </summary>
+    public string HandledToContainerCode { get; set; }
+
+    /// <summary>
+    ///     实际箱标签
+    /// </summary>
+    public string HandledToPackingCode { get; set; }
+
+    /// <summary>
+    ///     实际批次供应商批次
+    /// </summary>
+    public string HandledToSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     实际批次到货时间
+    /// </summary>
+    public DateTime HandledToArriveDate { get; set; }
+
+    /// <summary>
+    ///     实际批次生产时间
+    /// </summary>
+    public DateTime HandledToProduceDate { get; set; }
+
+    /// <summary>
+    ///     实际批次过期时间
+    /// </summary>
+    public DateTime HandledToExpireDate { get; set; }
+
+    /// <summary>
+    ///     实际批次排序
+    /// </summary>
+    public string HandledToLot { get; set; }
+
+    /// <summary>
+    ///     实际库位
+    /// </summary>
+    public string HandledToLocationCode { get; set; }
+
+    /// <summary>
+    ///     实际库区
+    /// </summary>
+    public string HandledToLocationArea { get; set; }
+
+    /// <summary>
+    ///     实际库位组
+    /// </summary>
+    public string HandledToLocationGroup { get; set; }
+
+    /// <summary>
+    ///     实际ERP库位
+    /// </summary>
+    public string HandledToLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     实际仓库
+    /// </summary>
+    public string HandledToWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     实际数量
+    /// </summary>
+    public decimal HandledToQty { get; set; }
+
+    #endregion
+
+    public void SetId(Guid id)
+    {
+        Id = id;
+    }
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/InjectionPlanJobs/InjectionPlanJobManager.cs

@@ -0,0 +1,121 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
+using Volo.Abp;
+using Volo.Abp.Users;
+using Volo.Abp.Validation;
+using Win_in.Sfs.Shared.Domain.Shared;
+using Win_in.Sfs.Wms.Inventory.Application.Contracts;
+
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+public class InjectionPlanJobManager : SfsJobManagerBase<InjectionPlanJob, InjectionPlanJobDetail>, IInjectionPlanJobManager
+{
+    private readonly IBalanceAppService _balanceAppService;
+    private readonly IExpectOutAppService _expectOutAppService;
+
+    public InjectionPlanJobManager(
+        IInjectionPlanJobRepository repository, IBalanceAppService balanceAppService, IExpectOutAppService expectOutAppService) : base(repository)
+    {
+        _balanceAppService = balanceAppService;
+        _expectOutAppService = expectOutAppService;
+    }
+
+    /// <summary>
+    /// 执行任务 发料任务
+    /// </summary>
+    /// <param name="id"></param>
+    /// <param name="input"></param>
+    /// <param name="user"></param>
+    /// <returns></returns>
+    public override async Task<InjectionPlanJob> CompleteAsync(InjectionPlanJob input, ICurrentUser user)
+    {
+        var entity = await Repository.FindAsync(input.Id).ConfigureAwait(false);
+
+        var inputDetail = input.Details.First();
+        var detail = entity.Details.First();
+
+        var expectOutDtos = await _expectOutAppService.GetListByItemCodeAndStatusAndPackingCodeAsync(detail.ItemCode, detail.HandledFromLocationCode, detail.HandledFromPackingCode, detail.Status, detail.HandledFromLot).ConfigureAwait(false);
+        if (expectOutDtos.Any())
+        {
+            throw new UserFriendlyException($" 箱码：{detail.HandledFromPackingCode}," +
+                                            $" 物品代码：{detail.ItemCode}," +
+                                            $" 库位代码：{detail.HandledFromLocationCode}," +
+                                            $" 状态：{detail.Status}," +
+                                            $" 批次：{detail.HandledFromLot}" +
+                                            $" 的库存被占用【预计出】");
+        }
+
+        var balanceDto=await _balanceAppService.GetRealQtyByPackingCodeAndItemCodeAndLocationCodeAndStatusAsync(inputDetail.HandledFromPackingCode, inputDetail.ItemCode, inputDetail.HandledFromLocationCode, inputDetail.Status, inputDetail.HandledFromLot).ConfigureAwait(false);
+        if (balanceDto.Qty <= 0)
+        {
+            throw new UserFriendlyException($" 箱码：{detail.HandledFromPackingCode}," +
+                                            $" 物品代码：{detail.ItemCode}," +
+                                            $" 库位代码：{detail.HandledFromLocationCode}," +
+                                            $" 状态：{detail.Status}," +
+                                            $" 批次：{detail.HandledFromLot}" +
+                                            $" 的可用库存不大于0，现在为{balanceDto.Qty}，请检查【库存数量】和【预计出】");
+        }
+
+        detail.HandledFromArriveDate = inputDetail.HandledFromArriveDate;
+        detail.HandledFromContainerCode = inputDetail.HandledFromContainerCode;
+        detail.HandledFromExpireDate = inputDetail.HandledFromExpireDate;
+        detail.HandledFromLocationArea = inputDetail.HandledFromLocationArea;
+        detail.HandledFromLocationCode = inputDetail.HandledFromLocationCode;
+        detail.HandledFromLocationErpCode = inputDetail.HandledFromLocationErpCode;
+        detail.HandledFromLocationGroup = inputDetail.HandledFromLocationGroup;
+        detail.HandledFromLot = inputDetail.HandledFromLot;
+        detail.HandledFromPackingCode = inputDetail.HandledFromPackingCode;
+        detail.HandledFromProduceDate = inputDetail.HandledFromProduceDate;
+        detail.HandledFromQty = inputDetail.HandledFromQty;
+        detail.HandledFromSupplierBatch = inputDetail.HandledFromSupplierBatch;
+        detail.HandledFromWarehouseCode = inputDetail.HandledFromWarehouseCode;
+
+        detail.HandledToArriveDate = inputDetail.HandledToArriveDate;
+        detail.HandledToContainerCode = inputDetail.HandledToContainerCode;
+        detail.HandledToExpireDate = inputDetail.HandledToExpireDate;
+        detail.HandledToLocationArea = inputDetail.HandledToLocationArea;
+        detail.HandledToLocationCode = inputDetail.HandledToLocationCode;
+        detail.HandledToLocationErpCode = inputDetail.HandledToLocationErpCode;
+        detail.HandledToLocationGroup = inputDetail.HandledToLocationGroup;
+        detail.HandledToLot = inputDetail.HandledToLot;
+        detail.HandledToPackingCode = inputDetail.HandledToPackingCode;
+        detail.HandledToProduceDate = inputDetail.HandledToProduceDate;
+        detail.HandledToQty = inputDetail.HandledToQty;
+        detail.HandledToSupplierBatch = inputDetail.HandledToSupplierBatch;
+        detail.HandledToWarehouseCode = inputDetail.HandledToWarehouseCode;
+
+        detail.HandledToPackingCode = string.Empty;
+        detail.HandledToLot = string.Empty;
+        detail.HandledToContainerCode = string.Empty;
+
+        return await base.CompleteAsync(entity, user).ConfigureAwait(false);
+    }
+
+    public async Task<InjectionPlanJob> GetAsync(Expression<Func<InjectionPlanJob, bool>> expression)
+    {
+        return await Repository.FindAsync(expression).ConfigureAwait(false);
+    }
+
+    #region 无用
+
+    public override Task<List<InjectionPlanJob>> GetWorkingListByPackingAsync(string packingCode)
+    {
+        throw new NotImplementedException();
+    }
+
+    public override Task<List<InjectionPlanJob>> GetWorkingListByContainerAsync(string containerCode)
+    {
+        throw new NotImplementedException();
+    }
+
+    public override void CheckDetails(InjectionPlanJob entity, AbpValidationResult result)
+    {
+        throw new NotImplementedException();
+    }
+
+    #endregion
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJob.cs

@@ -1,5 +1,7 @@
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using System.Threading.Tasks;
 using Win_in.Sfs.Shared.Domain.Entities;
 using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
@@ -20,25 +22,23 @@ public class InjectionIssueJob : SfsJobAggregateRootBase<InjectionIssueJobDetail
     /// <summary>
     /// 生产线
     /// </summary>
-    [IgnoreUpdate]
     public string ProdLine { get; set; }
 
     /// <summary>
-    ///     注塑要料单号
+    /// 要料单号
     /// </summary>
-    [IgnoreUpdate]
+    public string InjectionRequestNumber { get; set; }
-    public string InjectionIssueRequestNumber { get; set; }
 
     /// <summary>
     /// 使用在途库
     /// </summary>
     [Display(Name = "使用在途库")]
-    [IgnoreUpdate]
     public bool UseOnTheWayLocation { get; set; }
 
     /// <summary>
     /// 任务明细
     /// </summary>
-    [IgnoreUpdate]
+    public override List<InjectionIssueJobDetail> Details { get; set; } = new List<InjectionIssueJobDetail>();
-    public override List<InjectionIssueJobDetail> Details { get; set; } = new();
+
+    public EnumIssueSendType EnumIssueSendType { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobDetail.cs

@@ -1,9 +1,8 @@
 using System;
-using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Shared.Domain.Shared;
-using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Domain;
 
@@ -14,25 +13,21 @@ public class InjectionIssueJobDetail : SfsDetailEntityBase
     /// <summary>
     /// 物品代码
     /// </summary>
-    [Display(Name = "物品代码")]
     public string ItemCode { get; set; }
 
     /// <summary>
     /// 物品名称
     /// </summary>
-    [Display(Name = "物品名称")]
     public string ItemName { get; set; }
 
     /// <summary>
     /// 物品描述1
     /// </summary>
-    [Display(Name = "物品描述1")]
     public string ItemDesc1 { get; set; }
 
     /// <summary>
     /// 物品描述2
     /// </summary>
-    [Display(Name = "物品描述2")]
     public string ItemDesc2 { get; set; }
 
     /// <summary>
@@ -45,13 +40,11 @@ public class InjectionIssueJobDetail : SfsDetailEntityBase
     /// <summary>
     /// 库存状态
     /// </summary>
-    [Display(Name = "库存状态")]
     public EnumInventoryStatus Status { get; set; }
 
     /// <summary>
     /// 计量单位
     /// </summary>
-    [Display(Name = "计量单位")]
     public string Uom { get; set; }
 
     #endregion
@@ -526,6 +519,6 @@ public class InjectionIssueJobDetail : SfsDetailEntityBase
 
     public void SetId(Guid id)
     {
-        Id = id;
+        this.Id = id;
     }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobManager.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Linq.Expressions;
 using System.Threading.Tasks;
 using Volo.Abp;
+using Volo.Abp.Domain.Repositories;
 using Volo.Abp.Users;
 using Volo.Abp.Validation;
 using Win_in.Sfs.Shared.Domain.Shared;
@@ -18,7 +19,9 @@ public class InjectionIssueJobManager : SfsJobManagerBase<InjectionIssueJob, Inj
     private readonly IExpectOutAppService _expectOutAppService;
 
     public InjectionIssueJobManager(
-        IInjectionIssueJobRepository repository, IBalanceAppService balanceAppService, IExpectOutAppService expectOutAppService) : base(repository)
+        IInjectionIssueJobRepository repository,
+        IBalanceAppService balanceAppService,
+        IExpectOutAppService expectOutAppService) : base(repository)
     {
         _balanceAppService = balanceAppService;
         _expectOutAppService = expectOutAppService;

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/InjectionPlanNotes/IInjectionPlanNoteManager.cs

@@ -0,0 +1,10 @@
+using System;
+using System.Threading.Tasks;
+
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+public interface IInjectionPlanNoteManager : ISfsStoreManager<InjectionPlanNote, InjectionPlanNoteDetail>
+{
+    Task<InjectionPlanNote> ConfirmAsync(Guid id);
+
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/InjectionPlanNotes/IInjectionPlanNoteRepository.cs

@@ -0,0 +1,6 @@
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+public interface IInjectionPlanNoteRepository : ISfsStoreRepositoryBase<InjectionPlanNote>
+{
+
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/InjectionPlanNotes/InjectionPlanNote.cs

@@ -0,0 +1,72 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using Volo.Abp;
+using Win_in.Sfs.Shared.Domain.Entities;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
+
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+/// <summary>
+/// 注塑计划记录
+/// </summary>
+public class InjectionPlanNote : SfsStoreAggregateRootBase<InjectionPlanNoteDetail>, IHasJobNumber, IHasRequestNumber
+{
+    /// <summary>
+    /// 任务ID
+    /// </summary>
+    [IgnoreUpdate]
+    public string JobNumber { get; set; }
+
+    /// <summary>
+    /// 明细列表 
+    /// </summary>
+    [IgnoreUpdate]
+    public override List<InjectionPlanNoteDetail> Details { get; set; } = new List<InjectionPlanNoteDetail>();
+
+    [IgnoreUpdate]
+    public string RequestNumber { get; set; }
+
+    /// <summary>
+    ///     叫料类型
+    /// </summary>
+    [Display(Name = "叫料类型")]
+    public EnumIssueRequestType IssueRequestType { 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($"当前状态为 【已确认】 ,无法再次确认！");
+        }
+
+    }
+
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/InjectionPlanNotes/InjectionPlanNoteDetail.cs

@@ -0,0 +1,520 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
+
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+public class InjectionPlanNoteDetail : SfsStoreDetailEntityBase
+{
+    #region 库存基础信息
+
+    /// <summary>
+    ///     物品代码
+    /// </summary>
+    public string ItemCode { get; set; }
+
+    /// <summary>
+    ///     物品名称
+    /// </summary>
+    public string ItemName { get; set; }
+
+    /// <summary>
+    ///     物品描述1
+    /// </summary>
+    public string ItemDesc1 { get; set; }
+
+    /// <summary>
+    ///     物品描述2
+    /// </summary>
+    public string ItemDesc2 { get; set; }
+
+    /// <summary>
+    ///     标包数量
+    /// </summary>
+    [Display(Name = "标包数量")]
+    [Column(TypeName = "decimal(18,6)")]
+    public decimal StdPackQty { get; set; }
+
+    /// <summary>
+    ///     库存状态
+    /// </summary>
+    public EnumInventoryStatus Status { get; set; }
+
+    /// <summary>
+    ///     计量单位
+    /// </summary>
+    public string Uom { get; set; }
+
+    #endregion
+
+    #region 请求信息
+
+    /// <summary>
+    ///     请求库位
+    /// </summary>
+    public string RequestLocationCode { get; set; }
+
+    /// <summary>
+    ///     到库区
+    /// </summary>
+    public string RequestLocationArea { get; set; }
+
+    /// <summary>
+    ///     到库位组
+    /// </summary>
+    public string RequestLocationGroup { get; set; }
+
+    /// <summary>
+    ///     到ERP库位
+    /// </summary>
+    public string RequestLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     到仓库
+    /// </summary>
+    public string RequestWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     在途库库位
+    /// </summary>
+    public string OnTheWayLocationCode { get; set; }
+
+    /// <summary>
+    ///     生产线
+    /// </summary>
+    public string ProdLine { get; set; }
+
+    /// <summary>
+    ///     位置码
+    /// </summary>
+    public string PositionCode { get; set; }
+
+    /// <summary>
+    ///     推荐的类型
+    /// </summary>
+    public EnumRecommendType RecommendType { get; set; }
+
+    /// <summary>
+    ///     需求数量
+    /// </summary>
+    public decimal RequestQty { get; set; }
+
+    #endregion
+
+    #region 推荐来源
+
+    /// <summary>
+    ///     推荐来源托标签
+    /// </summary>
+    public string RecommendFromContainerCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源箱标签
+    /// </summary>
+    public string RecommendFromPackingCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次供应商批次
+    /// </summary>
+    public string RecommendFromSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次到货时间
+    /// </summary>
+    public DateTime RecommendFromArriveDate { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次生产时间
+    /// </summary>
+    public DateTime RecommendFromProduceDate { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次过期时间
+    /// </summary>
+    public DateTime RecommendFromExpireDate { get; set; }
+
+    /// <summary>
+    ///     推荐来源批次排序
+    /// </summary>
+    public string RecommendFromLot { get; set; }
+
+    /// <summary>
+    ///     推荐来源库位
+    /// </summary>
+    public string RecommendFromLocationCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源库区
+    /// </summary>
+    public string RecommendFromLocationArea { get; set; }
+
+    /// <summary>
+    ///     推荐来源库位组
+    /// </summary>
+    public string RecommendFromLocationGroup { get; set; }
+
+    /// <summary>
+    ///     推荐来源ERP库位
+    /// </summary>
+    public string RecommendFromLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源仓库
+    /// </summary>
+    public string RecommendFromWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源数量
+    /// </summary>
+    public decimal RecommendFromQty { get; set; }
+
+    #endregion
+
+    #region 推荐目标
+
+    /// <summary>
+    ///     推荐目标托标签
+    /// </summary>
+    public string RecommendToContainerCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标箱标签
+    /// </summary>
+    public string RecommendToPackingCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次供应商批次
+    /// </summary>
+    public string RecommendToSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次到货时间
+    /// </summary>
+    public DateTime RecommendToArriveDate { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次生产时间
+    /// </summary>
+    public DateTime RecommendToProduceDate { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次过期时间
+    /// </summary>
+    public DateTime RecommendToExpireDate { get; set; }
+
+    /// <summary>
+    ///     推荐目标批次排序
+    /// </summary>
+    public string RecommendToLot { get; set; }
+
+    /// <summary>
+    ///     推荐目标库位
+    /// </summary>
+    public string RecommendToLocationCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标库区
+    /// </summary>
+    public string RecommendToLocationArea { get; set; }
+
+    /// <summary>
+    ///     推荐目标库位组
+    /// </summary>
+    public string RecommendToLocationGroup { get; set; }
+
+    /// <summary>
+    ///     推荐目标ERP库位
+    /// </summary>
+    public string RecommendToLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标仓库
+    /// </summary>
+    public string RecommendToWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     推荐目标数量
+    /// </summary>
+    public decimal RecommendToQty { get; set; }
+
+    #endregion
+
+    #region 库移来源
+
+    /// <summary>
+    ///     库移来源托标签
+    /// </summary>
+    public string TransferLibFromContainerCode { get; set; }
+
+    /// <summary>
+    ///     库移来源箱标签
+    /// </summary>
+    public string TransferLibFromPackingCode { get; set; }
+
+    /// <summary>
+    ///     库移来源批次供应商批次
+    /// </summary>
+    public string TransferLibFromSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     库移来源批次到货时间
+    /// </summary>
+    public DateTime TransferLibFromArriveDate { get; set; }
+
+    /// <summary>
+    ///     库移来源批次生产时间
+    /// </summary>
+    public DateTime TransferLibFromProduceDate { get; set; }
+
+    /// <summary>
+    ///     库移来源批次过期时间
+    /// </summary>
+    public DateTime TransferLibFromExpireDate { get; set; }
+
+    /// <summary>
+    ///     库移来源批次排序
+    /// </summary>
+    public string TransferLibFromLot { get; set; }
+
+    /// <summary>
+    ///     库移来源库位
+    /// </summary>
+    public string TransferLibFromLocationCode { get; set; }
+
+    /// <summary>
+    ///     库移来源库区
+    /// </summary>
+    public string TransferLibFromLocationArea { get; set; }
+
+    /// <summary>
+    ///     库移来源库位组
+    /// </summary>
+    public string TransferLibFromLocationGroup { get; set; }
+
+    /// <summary>
+    ///     库移来源ERP库位
+    /// </summary>
+    public string TransferLibFromLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     库移来源仓库
+    /// </summary>
+    public string TransferLibFromWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     库移来源数量
+    /// </summary>
+    public decimal TransferLibFromQty { get; set; }
+
+    #endregion
+
+    #region 库移目标
+
+    /// <summary>
+    ///     库移目标托标签
+    /// </summary>
+    public string TransferLibToContainerCode { get; set; }
+
+    /// <summary>
+    ///     库移目标箱标签
+    /// </summary>
+    public string TransferLibToPackingCode { get; set; }
+
+    /// <summary>
+    ///     库移目标批次供应商批次
+    /// </summary>
+    public string TransferLibToSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     库移目标批次到货时间
+    /// </summary>
+    public DateTime TransferLibToArriveDate { get; set; }
+
+    /// <summary>
+    ///     库移目标批次生产时间
+    /// </summary>
+    public DateTime TransferLibToProduceDate { get; set; }
+
+    /// <summary>
+    ///     库移目标批次过期时间
+    /// </summary>
+    public DateTime TransferLibToExpireDate { get; set; }
+
+    /// <summary>
+    ///     库移目标批次排序
+    /// </summary>
+    public string TransferLibToLot { get; set; }
+
+    /// <summary>
+    ///     库移目标库位
+    /// </summary>
+    public string TransferLibToLocationCode { get; set; }
+
+    /// <summary>
+    ///     库移目标库区
+    /// </summary>
+    public string TransferLibToLocationArea { get; set; }
+
+    /// <summary>
+    ///     库移目标库位组
+    /// </summary>
+    public string TransferLibToLocationGroup { get; set; }
+
+    /// <summary>
+    ///     库移目标ERP库位
+    /// </summary>
+    public string TransferLibToLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     库移目标仓库
+    /// </summary>
+    public string TransferLibToWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     库移目标数量
+    /// </summary>
+    public decimal TransferLibToQty { get; set; }
+
+    #endregion
+
+    #region 实际来源
+
+    /// <summary>
+    ///     实际目标托标签
+    /// </summary>
+    public string HandledFromContainerCode { get; set; }
+
+    /// <summary>
+    ///     实际箱标签
+    /// </summary>
+    public string HandledFromPackingCode { get; set; }
+
+    /// <summary>
+    ///     实际批次供应商批次
+    /// </summary>
+    public string HandledFromSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     实际批次到货时间
+    /// </summary>
+    public DateTime HandledFromArriveDate { get; set; }
+
+    /// <summary>
+    ///     实际批次生产时间
+    /// </summary>
+    public DateTime HandledFromProduceDate { get; set; }
+
+    /// <summary>
+    ///     实际批次过期时间
+    /// </summary>
+    public DateTime HandledFromExpireDate { get; set; }
+
+    /// <summary>
+    ///     实际批次排序
+    /// </summary>
+    public string HandledFromLot { get; set; }
+
+    /// <summary>
+    ///     实际库位
+    /// </summary>
+    public string HandledFromLocationCode { get; set; }
+
+    /// <summary>
+    ///     实际库区
+    /// </summary>
+    public string HandledFromLocationArea { get; set; }
+
+    /// <summary>
+    ///     实际库位组
+    /// </summary>
+    public string HandledFromLocationGroup { get; set; }
+
+    /// <summary>
+    ///     实际ERP库位
+    /// </summary>
+    public string HandledFromLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     实际仓库
+    /// </summary>
+    public string HandledFromWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     实际数量
+    /// </summary>
+    public decimal HandledFromQty { get; set; }
+
+    #endregion
+
+    #region 实际目标
+
+    /// <summary>
+    ///     实际目标托标签
+    /// </summary>
+    public string HandledToContainerCode { get; set; }
+
+    /// <summary>
+    ///     实际箱标签
+    /// </summary>
+    public string HandledToPackingCode { get; set; }
+
+    /// <summary>
+    ///     实际批次供应商批次
+    /// </summary>
+    public string HandledToSupplierBatch { get; set; }
+
+    /// <summary>
+    ///     实际批次到货时间
+    /// </summary>
+    public DateTime HandledToArriveDate { get; set; }
+
+    /// <summary>
+    ///     实际批次生产时间
+    /// </summary>
+    public DateTime HandledToProduceDate { get; set; }
+
+    /// <summary>
+    ///     实际批次过期时间
+    /// </summary>
+    public DateTime HandledToExpireDate { get; set; }
+
+    /// <summary>
+    ///     实际批次排序
+    /// </summary>
+    public string HandledToLot { get; set; }
+
+    /// <summary>
+    ///     实际库位
+    /// </summary>
+    public string HandledToLocationCode { get; set; }
+
+    /// <summary>
+    ///     实际库区
+    /// </summary>
+    public string HandledToLocationArea { get; set; }
+
+    /// <summary>
+    ///     实际库位组
+    /// </summary>
+    public string HandledToLocationGroup { get; set; }
+
+    /// <summary>
+    ///     实际ERP库位
+    /// </summary>
+    public string HandledToLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     实际仓库
+    /// </summary>
+    public string HandledToWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     实际数量
+    /// </summary>
+    public decimal HandledToQty { get; set; }
+
+    #endregion
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/InjectionPlanNotes/InjectionPlanNoteManager.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 InjectionPlanNoteManager : SfsStoreManagerBase<InjectionPlanNote, InjectionPlanNoteDetail>, IInjectionPlanNoteManager
+{
+
+    public InjectionPlanNoteManager(
+        IInjectionPlanNoteRepository repository
+        ) : base(repository)
+    {
+    }
+
+    [UnitOfWork]
+    public virtual async Task<InjectionPlanNote> 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(InjectionPlanNote entity)
+    {
+        try
+        {
+            await LocalEventBus.PublishAsync(new SfsConfirmedEntityEventData<InjectionPlanNote>(entity), false).ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            Logger.LogDebug($"{nameof(InjectionPlanNote)} Confirmed Event:{ex.Message}", null);
+            Console.WriteLine(ex.Source);
+            throw;
+        }
+    }
+
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/InjectionIssueNotes/InjectionIssueNote.cs

@@ -8,7 +8,7 @@ using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 namespace Win_in.Sfs.Wms.Store.Domain;
 
 /// <summary>
-/// 注塑发料记录
+/// 注塑叫料记录
 /// </summary>
 public class InjectionIssueNote : SfsStoreAggregateRootBase<InjectionIssueNoteDetail>, IHasJobNumber, IHasRequestNumber
 {
@@ -21,12 +21,9 @@ public class InjectionIssueNote : SfsStoreAggregateRootBase<InjectionIssueNoteDe
     /// <summary>
     /// 明细列表 
     /// </summary>
-    [IgnoreUpdate]
     public override List<InjectionIssueNoteDetail> Details { get; set; } = new List<InjectionIssueNoteDetail>();
 
-    [IgnoreUpdate]
     public string RequestNumber { get; set; }
-
     /// <summary>
     ///     叫料类型
     /// </summary>
@@ -36,14 +33,12 @@ public class InjectionIssueNote : SfsStoreAggregateRootBase<InjectionIssueNoteDe
     /// <summary>
     /// 使用在途库
     /// </summary>
-    [IgnoreUpdate]
     public bool UseOnTheWayLocation { get; set; }
 
     /// <summary>
     /// 确认时间
     /// </summary>
     [Display(Name = "确认时间")]
-    [IgnoreUpdate]
     public DateTime? ConfirmTime { get; set; }
 
     /// <summary>
@@ -52,6 +47,8 @@ public class InjectionIssueNote : SfsStoreAggregateRootBase<InjectionIssueNoteDe
     [Display(Name = "已确认")]
     public bool Confirmed { get; set; }
 
+    public EnumIssueSendType EnumIssueSendType { get; set; }
+
     public void Confirm(DateTime confirmTime)
     {
 

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/InjectionIssueNotes/InjectionIssueNoteDetail.cs

@@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Shared.Domain.Shared;
-using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Domain;
 

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/InjectionPlanRequests/IInjectionPlanRequestManager.cs

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

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/InjectionPlanRequests/IInjectionPlanRequestRepository.cs

@@ -0,0 +1,9 @@
+using Win_in.Sfs.Shared.Domain;
+
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+public interface IInjectionPlanRequestRepository : ISfsStoreRepositoryBase<InjectionPlanRequest>,
+                                              ISfsBulkRepositoryBase<InjectionPlanRequest>
+{
+
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/InjectionPlanRequests/InjectionPlanRequest.cs

@@ -0,0 +1,24 @@
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Shared.Domain.Entities;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
+
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+/// <summary>
+/// 注塑计划申请
+/// </summary>
+public class InjectionPlanRequest : SfsStoreRequestAggregateRootBase<InjectionPlanRequestDetail>
+{
+    /// <summary>
+    ///     叫料类型
+    /// </summary>
+    [Display(Name = "叫料类型")]
+    public EnumIssueRequestType IssueRequestType { get; set; }
+
+    /// <summary>
+    ///     使用在途库
+    /// </summary>
+    public bool UseOnTheWayLocation { get; set; }
+       
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/InjectionPlanRequests/InjectionPlanRequestDetail.cs

@@ -0,0 +1,101 @@
+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.Domain;
+
+/// <summary>
+/// 注塑计划申请明细
+/// </summary>
+public class InjectionPlanRequestDetail : SfsStoreDetailWithQtyEntityBase, IHasToLocation
+{
+    #region 目标库位信息
+
+    /// <summary>
+    ///     目标库位
+    /// </summary>
+    [Display(Name = "目标库位")]
+    [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储位")]
+    public string ToLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     目标仓库
+    /// </summary>
+    [Display(Name = "目标仓库")]
+    public string ToWarehouseCode { get; set; }
+
+    #endregion
+
+    /// <summary>
+    ///     生产线
+    /// </summary>
+    public string ProdLine { 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; }
+
+    /// <summary>
+    ///     需求箱数量
+    /// </summary>
+    [Display(Name = "需求箱数量")]
+    public decimal BoxQty { get; set; }
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/InjectionPlanRequests/InjectionPlanRequestManager.cs

@@ -0,0 +1,77 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Win_in.Sfs.Shared.Domain.Shared;
+using Win_in.Sfs.Shared.Event;
+
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+public class InjectionPlanRequestManager
+    : SfsStoreRequestManagerBase<InjectionPlanRequest, InjectionPlanRequestDetail>
+        , IInjectionPlanRequestManager
+{
+    private readonly IInjectionPlanRequestRepository _repository;
+    private readonly IInjectionPlanJobRepository _injectionJobRepository;
+
+    public InjectionPlanRequestManager(
+        IInjectionPlanRequestRepository repository
+        , IInjectionPlanJobRepository injectionJobRepository
+    ) : base(repository)
+    {
+        _repository = repository;
+        _injectionJobRepository = injectionJobRepository;
+    }
+
+    #region 东阳V2
+
+    #endregion
+
+
+    /// <summary>
+    ///     创建 同时 直接赋值Number 为了返回Number
+    /// </summary>
+    /// <param name="entity"></param>
+    /// <returns></returns>
+    public virtual async Task<InjectionPlanRequest> CreateByNumberAsync(InjectionPlanRequest entity)
+    {
+        var number = string.IsNullOrEmpty(entity.Number)
+            ? await GenerateNumberAsync(nameof(InjectionPlanRequest), entity.ActiveDate).ConfigureAwait(false)
+            : entity.Number;
+        entity.SetIdAndNumberWithDetails(GuidGenerator, number);
+        entity.Submit();
+        entity.Agree();
+        entity.RequestStatus = EnumRequestStatus.Partial;
+        await LocalEventBus.PublishAsync(new SfsHandledEntityEventData<InjectionPlanRequest>(entity),false)
+            .ConfigureAwait(false);
+        await _repository.InsertAsync(entity).ConfigureAwait(false);
+        return entity;
+    }
+ 
+    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<InjectionPlanRequest> mergeEntities,
+        List<InjectionPlanRequest> deleteEntities = null)
+    {
+        if (deleteEntities != null && deleteEntities.Count > 0)
+        {
+            await _repository.BulkDeleteAsync(deleteEntities).ConfigureAwait(false);
+        }
+
+        await CreateManyAsync(mergeEntities).ConfigureAwait(false);
+    }
+
+    #endregion
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/InjectionIssueRequests/InjectionIssueRequest.cs

@@ -6,7 +6,7 @@ using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 namespace Win_in.Sfs.Wms.Store.Domain;
 
 /// <summary>
-///     注塑申请
+/// 注塑叫料申请
 /// </summary>
 public class InjectionIssueRequest : SfsStoreRequestAggregateRootBase<InjectionIssueRequestDetail>
 {
@@ -21,9 +21,4 @@ public class InjectionIssueRequest : SfsStoreRequestAggregateRootBase<InjectionI
     /// </summary>
     public bool UseOnTheWayLocation { get; set; }
     
-    /// <summary>
-    ///     明细列表
-    /// </summary>
-    [IgnoreUpdate]
-    public override List<InjectionIssueRequestDetail> Details { get; set; } = new();
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/InjectionIssueRequests/InjectionIssueRequestDetail.cs

@@ -1,3 +1,4 @@
+using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using Win_in.Sfs.Shared.Domain;
@@ -45,6 +46,7 @@ public class InjectionIssueRequestDetail : SfsStoreDetailWithQtyEntityBase, IHas
 
     #endregion
 
+
     /// <summary>
     /// 生产线
     /// </summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/InjectionIssueRequests/InjectionIssueRequestManager.cs

@@ -11,22 +11,14 @@ public class InjectionIssueRequestManager
         , IInjectionIssueRequestManager
 {
     private readonly IInjectionIssueRequestRepository _repository;
-    private readonly IInjectionIssueJobRepository _injectionJobRepository;
 
     public InjectionIssueRequestManager(
         IInjectionIssueRequestRepository repository
-        , IInjectionIssueJobRepository injectionJobRepository
     ) : base(repository)
     {
         _repository = repository;
-        _injectionJobRepository = injectionJobRepository;
     }
 
-    #region 东阳V2
-
-    #endregion
-
-
     /// <summary>
     ///     创建 同时 直接赋值Number 为了返回Number
     /// </summary>
@@ -56,22 +48,8 @@ public class InjectionIssueRequestManager
         }
     }
 
-
+    public Task ImportDataAsync(List<InjectionIssueRequest> entities, List<InjectionIssueRequest> deleteEntities = null)
-    #region 导入
-
-    /// <summary>
-    ///     执行导入
-    /// </summary>
-    public virtual async Task ImportDataAsync(List<InjectionIssueRequest> mergeEntities,
-        List<InjectionIssueRequest> deleteEntities = null)
-    {
-        if (deleteEntities != null && deleteEntities.Count > 0)
     {
-            await _repository.BulkDeleteAsync(deleteEntities).ConfigureAwait(false);
+        throw new System.NotImplementedException();
     }
-
-        await CreateManyAsync(mergeEntities).ConfigureAwait(false);
-    }
-
-    #endregion
 }

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

@@ -21,6 +21,7 @@ public interface IStoreDbContext : IEfCoreDbContext
     public DbSet<ProductReceiptRequest> ProductReceiptRequests { get; }
     public DbSet<MaterialRequest> MaterialRequests { get; }
     public DbSet<InjectionIssueRequest> InjectionIssueRequests { get; }
+    public DbSet<InjectionPlanRequest> InjectionPlanRequests { get; }
     public DbSet<KittingIssueRequest> KittingIssueRequests { get; }
     public DbSet<CoatingIssueRequest> CoatingIssueRequests { get; }
     public DbSet<AssembleIssueRequest> AssembleIssueRequest { get; }
@@ -83,6 +84,7 @@ public interface IStoreDbContext : IEfCoreDbContext
     public DbSet<WarehouseTransferNote> WarehouseTransferNotes { get; }
     public DbSet<IssueNote> IssueNotes { get; }
     public DbSet<InjectionIssueNote> InjectionIssueNotes { get; }
+    public DbSet<InjectionPlanNote> InjectionPlanNotes { get; }
     public DbSet<AssembleIssueNote> AssembleIssueNotes { get; }
     public DbSet<KittingIssueNote> KittingIssueNotes { get; }
     public DbSet<CoatingIssueNote> CoatingIssueNotes { get; }
@@ -116,6 +118,7 @@ public interface IStoreDbContext : IEfCoreDbContext
     public DbSet<PutawayJob> PutawayJobs { get; }
     public DbSet<IssueJob> IssueJobs { get; }
     public DbSet<InjectionIssueJob> InjectionIssueJobs { get; }
+    public DbSet<InjectionPlanJob> InjectionPlanJobs { get; }
     public DbSet<AssembleIssueJob> AssembleIssueJobs { get; }
     public DbSet<KittingIssueJob> KittingIssueJobs { get; }
     public DbSet<CoatingIssueJob> CoatingIssueJobs { get; }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/InjectionPlanJobs/InjectionPlanJobDbContextModelCreatingExtensions.cs

@@ -0,0 +1,61 @@
+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 InjectionPlanJobDbContextModelCreatingExtensions
+{
+    public static void ConfigureInjectionPlanJob(this ModelBuilder builder, StoreModelBuilderConfigurationOptions options)
+    {
+        builder.Entity<InjectionPlanJob>(b =>
+        {
+            //Configure table & schema name
+            b.ToTable(StoreDbProperties.JobDbTablePrefix + nameof(InjectionPlanJob), options.Schema);
+            //Configure ABP properties
+            b.ConfigureByConvention();
+            //Configure Sfs base properties
+            b.ConfigureSfsBase();
+            //Configure Job base properties
+            b.ConfigureJob<InjectionPlanJob, InjectionPlanJobDetail>();
+            //Properties
+            b.Property(q => q.InjectionPlanRequestNumber).HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.ProdLine).HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.JobType).HasConversion<string>();
+            b.Property(q => q.JobStatus).HasConversion<string>();
+            //Relations
+            b.HasMany(q => q.Details).WithOne().HasForeignKey(d => d.MasterID).IsRequired();
+            //Indexes
+            b.HasIndex(q => new { q.Number }).IsUnique();
+        });
+
+        builder.Entity<InjectionPlanJobDetail>(b =>
+        {
+            //Configure table & schema name
+            b.ToTable(StoreDbProperties.JobDbTablePrefix + nameof(InjectionPlanJobDetail), options.Schema);
+            //Configure ABP properties
+            b.ConfigureByConvention();
+            //Configure Sfs base properties
+            b.ConfigureSfsBase();
+            //Configure Job base properties
+            //b.ConfigureJobRecommendFromDetail();
+            //Properties
+            
+            b.Property(q => q.RequestLocationCode).HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.ProdLine).HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.OnTheWayLocationCode).HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.PositionCode).HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.OnTheWayLocationCode).HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.PositionCode).HasMaxLength(SfsPropertyConst.CodeLength).IsRequired(false);
+            b.Property(q => q.RecommendType).HasMaxLength(SfsPropertyConst.CodeLength).HasConversion<string>();
+            b.Property(q => q.Status).IsRequired().HasMaxLength(SfsPropertyConst.NameLength).HasConversion<string>();
+            //Relations
+            //None
+
+            //Indexes
+            //b.HasIndex(q => new { q.PackingCode }).IsUnique();
+        });
+    }
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/InjectionPlanJobs/InjectionPlanJobEfCoreRepository.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 InjectionPlanJobEfCoreRepository : SfsJobEfCoreRepositoryBase<StoreDbContext, InjectionPlanJob>, IInjectionPlanJobRepository
+{
+    public InjectionPlanJobEfCoreRepository(IDbContextProvider<StoreDbContext> dbContextProvider) : base(dbContextProvider)
+    {
+    }
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobDbContextModelCreatingExtensions.cs

@@ -21,7 +21,7 @@ public static class InjectionIssueJobDbContextModelCreatingExtensions
             //Configure Job base properties
             b.ConfigureJob<InjectionIssueJob, InjectionIssueJobDetail>();
             //Properties
-            b.Property(q => q.InjectionIssueRequestNumber).HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.InjectionRequestNumber).HasMaxLength(SfsPropertyConst.CodeLength);
             b.Property(q => q.ProdLine).HasMaxLength(SfsPropertyConst.CodeLength);
             b.Property(q => q.JobType).HasConversion<string>();
             b.Property(q => q.JobStatus).HasConversion<string>();

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240515012138_Update_CoatingIssue.cs

@@ -0,0 +1,67 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Win_in.Sfs.Wms.Store.Migrations
+{
+    public partial class Update_CoatingIssue : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.RenameColumn(
+                name: "MaterialRequestNumber",
+                table: "Job_CoatingIssueJob",
+                newName: "CoatingRequestNumber");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "PositionCode",
+                table: "Store_CoatingIssueRequestDetail",
+                type: "nvarchar(64)",
+                maxLength: 64,
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "nvarchar(max)",
+                oldNullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "EnumIssueSendType",
+                table: "Store_CoatingIssueNote",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "EnumIssueSendType",
+                table: "Job_CoatingIssueJob",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "EnumIssueSendType",
+                table: "Store_CoatingIssueNote");
+
+            migrationBuilder.DropColumn(
+                name: "EnumIssueSendType",
+                table: "Job_CoatingIssueJob");
+
+            migrationBuilder.RenameColumn(
+                name: "CoatingRequestNumber",
+                table: "Job_CoatingIssueJob",
+                newName: "MaterialRequestNumber");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "PositionCode",
+                table: "Store_CoatingIssueRequestDetail",
+                type: "nvarchar(max)",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "nvarchar(64)",
+                oldMaxLength: 64,
+                oldNullable: true);
+        }
+    }
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/InjectionPlanNotes/InjectionPlanNoteDbContextModelCreatingExtensions.cs

@@ -0,0 +1,56 @@
+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 InjectionPlanNoteDbContextModelCreatingExtensions
+{
+    public static void ConfigureInjectionPlanNote(this ModelBuilder builder, StoreModelBuilderConfigurationOptions options)
+    {
+        builder.Entity<InjectionPlanNote>(b =>
+        {
+            //Configure table & schema name
+            b.ToTable(options.TablePrefix + nameof(InjectionPlanNote), 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.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<InjectionPlanNoteDetail>(b =>
+       {
+           //Configure table & schema name
+           b.ToTable(options.TablePrefix + nameof(InjectionPlanNoteDetail), 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.ProdLine).HasMaxLength(SfsPropertyConst.NameLength);
+           b.Property(q => q.OnTheWayLocationCode).HasMaxLength(SfsPropertyConst.CodeLength);
+           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.HandledFromPackingCode, q.HandledFromLocationCode, q.HandledToLocationCode }).IsUnique();
+           b.HasIndex(q => new { q.HandledFromPackingCode });
+       });
+    }
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/InjectionPlanNotes/InjectionPlanNoteEfCoreRepository.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 InjectionPlanNoteEfCoreRepository : SfsStoreEfCoreRepositoryBase<StoreDbContext, InjectionPlanNote>, IInjectionPlanNoteRepository
+{
+    public InjectionPlanNoteEfCoreRepository(IDbContextProvider<StoreDbContext> dbContextProvider) : base(dbContextProvider)
+    {
+    }
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/InjectionPlanRequests/InjectionPlanRequestDbContextModelCreatingExtensions.cs

@@ -0,0 +1,61 @@
+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 InjectionPlanRequestDbContextModelCreatingExtensions
+{
+    public static void ConfigureInjectionPlanRequest(this ModelBuilder builder, StoreModelBuilderConfigurationOptions options)
+    {
+        builder.Entity<InjectionPlanRequest>(b =>
+        {
+            //Configure table & schema name
+            b.ToTable(options.TablePrefix + nameof(InjectionPlanRequest), options.Schema);
+            //Configure ABP properties
+            b.ConfigureByConvention();
+            //Configure Sfs base properties
+            b.ConfigureSfsStoreBase();
+
+            //Properties
+            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<InjectionPlanRequestDetail>(b =>
+        {
+            //Configure table & schema name
+            b.ToTable(options.TablePrefix + nameof(InjectionPlanRequestDetail), 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.ProdLine).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 });
+        });
+    }
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/InjectionPlanRequests/InjectionPlanRequestEfCoreRepository.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 InjectionPlanRequestEfCoreRepository : SfsStoreEfCoreRepositoryBase<StoreDbContext, InjectionPlanRequest>, IInjectionPlanRequestRepository
+{
+    public InjectionPlanRequestEfCoreRepository(IDbContextProvider<StoreDbContext> dbContextProvider) : base(dbContextProvider)
+    {
+    }
+}

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<InjectionIssueRequest> InjectionIssueRequests { get; set; }
+    public DbSet<InjectionPlanRequest> InjectionPlanRequests { get; set; }
     public DbSet<KittingIssueRequest> KittingIssueRequests { get; set; }
     public DbSet<CoatingIssueRequest> CoatingIssueRequests { get; set; }
     public DbSet<AssembleIssueRequest> AssembleIssueRequest { get; set; }
@@ -83,6 +84,7 @@ public class StoreDbContext : AbpDbContext<StoreDbContext>, IStoreDbContext
     public DbSet<WarehouseTransferNote> WarehouseTransferNotes { get; set; }
     public DbSet<IssueNote> IssueNotes { get; set; }
     public DbSet<InjectionIssueNote> InjectionIssueNotes { get; set; }
+    public DbSet<InjectionPlanNote> InjectionPlanNotes { get; set; }
     public DbSet<AssembleIssueNote> AssembleIssueNotes { get; set; }
     public DbSet<KittingIssueNote> KittingIssueNotes { get; set; }
     public DbSet<CoatingIssueNote> CoatingIssueNotes { get; set; }
@@ -113,6 +115,7 @@ public class StoreDbContext : AbpDbContext<StoreDbContext>, IStoreDbContext
     public DbSet<PutawayJob> PutawayJobs { get; set; }
     public DbSet<IssueJob> IssueJobs { get; set; }
     public DbSet<InjectionIssueJob> InjectionIssueJobs { get; set; }
+    public DbSet<InjectionPlanJob> InjectionPlanJobs { get; set; }
     public DbSet<AssembleIssueJob> AssembleIssueJobs { get; set; }   
     public DbSet<KittingIssueJob> KittingIssueJobs { get; set; }
     public DbSet<CoatingIssueJob> CoatingIssueJobs { get; set; }

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.ConfigureInjectionIssueRequest(options);
+        builder.ConfigureInjectionPlanRequest(options);
         builder.ConfigureKittingIssueRequest(options);
         builder.ConfigureCoatingIssueRequest(options);
         builder.ConfigureAssembleIssueRequest(options);
@@ -87,6 +88,7 @@ public static class StoreDbContextModelCreatingExtensions
         builder.ConfigureWarehouseTransferNote(options);
         builder.ConfigureIssueNote(options);
         builder.ConfigureInjectionIssueNote(options);
+        builder.ConfigureInjectionPlanNote(options);
         builder.ConfigureAssembleIssueNote(options);
         builder.ConfigureKittingIssueNote(options);
         builder.ConfigureCoatingIssueNote(options);
@@ -122,6 +124,7 @@ public static class StoreDbContextModelCreatingExtensions
         builder.ConfigurePutawayJob(options);
         builder.ConfigureIssueJob(options);
         builder.ConfigureInjectionIssueJob(options);
+        builder.ConfigureInjectionPlanJob(options);
         builder.ConfigureAssembleIssueJob(options);
         builder.ConfigureKittingIssueJob(options);
         builder.ConfigureCoatingIssueJob(options);

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Jobs/InjectionJobAutoMapperProfile.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Jobs/InjectionIssueJobAutoMapperProfile.cs

@@ -15,7 +15,7 @@ public partial class StoreEventAutoMapperProfile : Profile
 
         CreateMap<InjectionIssueJob, InjectionIssueNote>()
             .ForMember(x => x.JobNumber, y => y.MapFrom(d => d.Number))
-            .ForMember(x => x.RequestNumber, y => y.MapFrom(d => d.InjectionIssueRequestNumber))
+            .ForMember(x => x.RequestNumber, y => y.MapFrom(d => d.InjectionRequestNumber))
             .ForMember(x => x.ActiveDate, y => y.MapFrom(d => DateTime.Now))
             .ForMember(x => x.Worker, y => y.MapFrom(d => d.CompleteUserName))
             .Ignore(x => x.Confirmed)
@@ -26,12 +26,21 @@ public partial class StoreEventAutoMapperProfile : Profile
             ;
 
         CreateMap<InjectionIssueJob, InjectionIssueNoteEditInput>()
-            .ForMember(x => x.RequestNumber, y => y.MapFrom(d => d.InjectionIssueRequestNumber))
+            .ForMember(x => x.RequestNumber, y => y.MapFrom(d => d.InjectionRequestNumber))
             .Ignore(x => x.Confirmed)
             .Ignore(x => x.JobNumber)
             .Ignore(x => x.ActiveDate)
             ;
         CreateMap<InjectionIssueJobDetail, InjectionIssueNoteDetailInput>()
             ;
+
+        CreateMap<InjectionIssueJobDTO, InjectionIssueNoteEditInput>()
+            .ForMember(x => x.RequestNumber, y => y.MapFrom(d => d.InjectionRequestNumber))
+            .Ignore(x => x.Confirmed)
+            .Ignore(x => x.JobNumber)
+            .Ignore(x => x.ActiveDate)
+            ;
+        CreateMap<InjectionIssueJobDetailDTO, InjectionIssueNoteDetailInput>()
+            ;
     }
 }

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

@@ -0,0 +1,37 @@
+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 InjectionPlanJobAutoMapperProfile()
+    {
+
+        CreateMap<InjectionPlanJob, InjectionPlanNote>()
+            .ForMember(x => x.JobNumber, y => y.MapFrom(d => d.Number))
+            .ForMember(x => x.RequestNumber, y => y.MapFrom(d => d.InjectionPlanRequestNumber))
+            .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<InjectionPlanJobDetail, InjectionPlanNoteDetail>()
+            ;
+
+        CreateMap<InjectionPlanJob, InjectionPlanNoteEditInput>()
+            .ForMember(x => x.RequestNumber, y => y.MapFrom(d => d.InjectionPlanRequestNumber))
+            .Ignore(x => x.Confirmed)
+            .Ignore(x => x.JobNumber)
+            .Ignore(x => x.ActiveDate)
+            ;
+        CreateMap<InjectionPlanJobDetail, InjectionPlanNoteDetailInput>()
+            ;
+    }
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Notes/InjectionPlanNoteAutoMapperProfile.cs

@@ -0,0 +1,51 @@
+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 InjectionPlanNoteAutoMapperProfile()
+    {
+        CreateMap<InjectionPlanNoteDetail, 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)
+
+            .ForMember(x => x.Qty, y => y.MapFrom(t => t.HandledToQty))
+            .ForMember(x => x.SupplierBatch, y => y.MapFrom(t => t.HandledFromSupplierBatch))
+            .ForMember(x => x.ArriveDate, y => y.MapFrom(t => t.HandledFromArriveDate))
+            .ForMember(x => x.ProduceDate, y => y.MapFrom(t => t.HandledFromProduceDate))
+            .ForMember(x => x.ExpireDate, y => y.MapFrom(t => t.HandledFromExpireDate))
+
+            .ForMember(x => x.FromPackingCode, y => y.MapFrom(t => t.HandledFromPackingCode))
+            .ForMember(x => x.FromContainerCode, y => y.MapFrom(t => t.HandledFromContainerCode))
+
+            .ForMember(x => x.FromLot, y => y.MapFrom(t => t.HandledFromLot))
+            .ForMember(x => x.FromStatus, y => y.MapFrom(t => t.Status))
+
+            .ForMember(x => x.FromLocationCode, y => y.MapFrom(t => t.HandledFromLocationCode))
+            .ForMember(x => x.FromLocationGroup, y => y.MapFrom(t => t.HandledFromLocationGroup))
+            .ForMember(x => x.FromLocationArea, y => y.MapFrom(t => t.HandledFromLocationArea))
+            .ForMember(x => x.FromLocationErpCode, y => y.MapFrom(t => t.HandledFromLocationErpCode))
+            .ForMember(x => x.FromWarehouseCode, y => y.MapFrom(t => t.HandledFromWarehouseCode))
+
+            .ForMember(x => x.ToLot, y => y.MapFrom(t => t.HandledToLot))
+            .ForMember(x => x.ToStatus, y => y.MapFrom(t => t.Status))
+            .ForMember(x => x.ToPackingCode, y => y.MapFrom(t => t.HandledToPackingCode))
+            .ForMember(x => x.ToContainerCode, y => y.MapFrom(t => t.HandledToContainerCode))
+
+            .ForMember(x => x.ToLocationCode, y => y.MapFrom(t => t.HandledToLocationCode))
+            .ForMember(x => x.ToLocationGroup, y => y.MapFrom(t => t.HandledToLocationGroup))
+            .ForMember(x => x.ToLocationArea, y => y.MapFrom(t => t.HandledToLocationArea))
+            .ForMember(x => x.ToLocationErpCode, y => y.MapFrom(t => t.HandledToLocationErpCode))
+            .ForMember(x => x.ToWarehouseCode, y => y.MapFrom(t => t.HandledToWarehouseCode))
+
+            ;
+    }
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/InjectionRequestAutoMapperProfile.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/InjectionIssueRequestAutoMapperProfile.cs

@@ -12,7 +12,7 @@ public partial class StoreEventAutoMapperProfile : Profile
     private void InjectionIssueRequestAutoMapperProfile()
     {
         CreateMap<InjectionIssueRequest, InjectionIssueJobEditInput>()
-            .ForMember(x => x.InjectionIssueRequestNumber, y => y.MapFrom(d => d.Number))
+            .ForMember(x => x.InjectionRequestNumber, y => y.MapFrom(d => d.Number))
             .Ignore(x => x.WarehouseCode)
             .Ignore(x => x.UpStreamJobNumber)
             .Ignore(x => x.JobType)
@@ -30,6 +30,7 @@ public partial class StoreEventAutoMapperProfile : Profile
             .Ignore(x => x.CompleteUserName)
             .Ignore(x => x.CompleteTime)
             .Ignore(x => x.Details)
+            .Ignore(x => x.EnumIssueSendType)
             ;
     }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/InjectionPlanRequestAutoMapperProfile.cs

@@ -0,0 +1,35 @@
+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 InjectionPlanRequestAutoMapperProfile()
+    {
+        CreateMap<InjectionPlanRequest, InjectionPlanJobEditInput>()
+            .ForMember(x => x.InjectionPlanRequestNumber, y => y.MapFrom(d => d.Number))
+            .Ignore(x => x.WarehouseCode)
+            .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)
+            ;
+    }
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/InjectionIssueJobEventHandler.cs

@@ -1,6 +1,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Castle.Components.DictionaryAdapter;
+using Volo.Abp;
 using Volo.Abp.EventBus;
 using Volo.Abp.Uow;
 using Win_in.Sfs.Basedata.Application.Contracts;
@@ -18,16 +20,16 @@ public class InjectionIssueJobEventHandler :
     , ILocalEventHandler<SfsCreatedEntityEventData<InjectionIssueJob>>
     , ILocalEventHandler<SfsCreatedEntityEventData<List<InjectionIssueJob>>>
 {
-    private readonly IInjectionIssueNoteAppService _injectionNoteAppService;
+    private readonly IInjectionIssueNoteAppService _injectionIssueNoteAppService;
     private readonly IExpectOutAppService _expectOutAppService;
     private readonly ILocationAppService _locationAppService;
     private readonly ITransferLibRequestAppService _transferLibRequestAppService;
 
-    public InjectionIssueJobEventHandler(IInjectionIssueNoteAppService injectionNoteAppService,
+    public InjectionIssueJobEventHandler(IInjectionIssueNoteAppService injectionIssueNoteAppService,
         IExpectOutAppService expectOutAppService,
         ILocationAppService locationAppService, ITransferLibRequestAppService transferLibRequestAppService)
     {
-        _injectionNoteAppService = injectionNoteAppService;
+        _injectionIssueNoteAppService = injectionIssueNoteAppService;
         _expectOutAppService = expectOutAppService;
         _locationAppService = locationAppService;
         _transferLibRequestAppService = transferLibRequestAppService;
@@ -41,9 +43,7 @@ public class InjectionIssueJobEventHandler :
     [UnitOfWork]
     public virtual async Task HandleEventAsync(SfsCompletedEntityEventData<InjectionIssueJob> eventData)
     {
-        var entity = eventData.Entity;
+        await Task.CompletedTask.ConfigureAwait(false);
-        var injectionNote = await BuildInjectionIssueNoteAsync(entity).ConfigureAwait(false);
-        await _injectionNoteAppService.CreateAsync(injectionNote).ConfigureAwait(false);
     }
 
     /// <summary>
@@ -123,25 +123,48 @@ public class InjectionIssueJobEventHandler :
     ///     根据是否在 第一层 来创建 是否生成库移任务
     /// </summary>
     /// <returns></returns>
-    private async Task CreateTransferLibAsync(InjectionIssueJob injectionJob)
+    private async Task CreateTransferLibAsync(InjectionIssueJob injectionIssueJob)
+    {
+        foreach (var detail in injectionIssueJob.Details)
+        {
+            var locationDto = await _locationAppService.GetByCodeAsync(detail.RecommendFromLocationCode)
+                .ConfigureAwait(false);
+            var locationList = await _locationAppService.GetListByGroupsAsync(
+                new List<string> { detail.RecommendFromLocationGroup }).ConfigureAwait(false);
+            var locationListSort = locationList.OrderBy(p => p.RowCode);
+
+            var locationDtoRowOne = new LocationDTO();
+            if (locationListSort.Any())
             {
-        if (!await IsMinRowAsync(injectionJob).ConfigureAwait(false))
+                locationDtoRowOne = locationListSort.FirstOrDefault();
+            }
+            else
             {
-            foreach (var detail in injectionJob.Details)
+                locationDtoRowOne = await _locationAppService.GetFirstRowOneAsync().ConfigureAwait(false);
+                if (locationDtoRowOne == null)
+                {
+                    throw new UserFriendlyException("没有找到1层的库位");
+                }
+            }
+
+
+            if (locationDto.Type == EnumLocationType.RAW)
+            {
+                if (!await IsMinRowAsync(injectionIssueJob).ConfigureAwait(false))
                 {
                     var input = new TransferLibRequestEditInput();
                     input.CallBusinessType = nameof(IInjectionIssueJobAppService);
-                input.CallJobNumber = injectionJob.Number;
+                    input.CallJobNumber = injectionIssueJob.Number;
-                input.CallRequestNumber = injectionJob.InjectionIssueRequestNumber;
+                    input.CallRequestNumber = injectionIssueJob.InjectionRequestNumber;
                     input.CallServerName = "Win_in.Sfs.Wms.Store.Application.InjectionIssueJobAppService";
                     input.Type = "Transfer_Warehouse";
                     input.UseOnTheWayLocation = true;
 
                     var detailInput = new TransferLibRequestDetailInput();
                     detailInput.CallBusinessType = nameof(IInjectionIssueJobAppService);
-                detailInput.CallRequestNumber = injectionJob.InjectionIssueRequestNumber;
+                    detailInput.CallRequestNumber = injectionIssueJob.InjectionRequestNumber;
                     detailInput.CallServerName = "Win_in.Sfs.Wms.Store.Application.InjectionIssueJobAppService";
-                detailInput.CallJobNumber = injectionJob.Number;
+                    detailInput.CallJobNumber = injectionIssueJob.Number;
 
                     detailInput.JobStatus = EnumJobStatus.Open;
                     detailInput.ItemCode = detail.ItemCode;
@@ -151,7 +174,7 @@ public class InjectionIssueJobEventHandler :
 
                     detailInput.RecommendFromQty = detail.RecommendFromQty;
                     detailInput.RecommendFromLot = detail.RecommendFromLot;
-                detailInput.RecommendFromPackingCode = detailInput.RecommendFromPackingCode;
+                    detailInput.RecommendFromPackingCode = detail.RecommendFromPackingCode;
                     detailInput.RecommendToLot = detail.RecommendToLot;
 
                     detailInput.RecommendFromArriveDate = detail.RecommendFromArriveDate;
@@ -167,7 +190,7 @@ public class InjectionIssueJobEventHandler :
 
                     detailInput.RecommendToQty = detail.RecommendToQty;
                     detailInput.RecommendToLot = detail.RecommendToLot;
-                detailInput.RecommendToPackingCode = detailInput.RecommendToPackingCode;
+                    detailInput.RecommendToPackingCode = detail.RecommendToPackingCode;
                     detailInput.RecommendToLot = detail.RecommendToLot;
 
                     detailInput.RecommendToArriveDate = detail.RecommendToArriveDate;
@@ -175,16 +198,19 @@ public class InjectionIssueJobEventHandler :
                     detailInput.RecommendToProduceDate = detail.RecommendToProduceDate;
                     detailInput.RecommendToSupplierBatch = detail.RecommendToSupplierBatch;
 
-                detailInput.RecommendToLocationCode = detail.RecommendToLocationCode;
+                    detailInput.RecommendToLocationCode = locationDtoRowOne.Code;
-                detailInput.RecommendToLocationGroup = detail.RecommendToLocationGroup;
+                    detailInput.RecommendToLocationGroup = locationDtoRowOne.LocationGroupCode;
-                detailInput.RecommendToLocationArea = detail.RecommendToLocationArea;
+                    detailInput.RecommendToLocationArea = locationDtoRowOne.AreaCode;
-                detailInput.RecommendToLocationErpCode = detail.RecommendToLocationErpCode;
+                    detailInput.RecommendToLocationErpCode = locationDtoRowOne.ErpLocationCode;
-                detailInput.RecommendToWarehouseCode = detail.RecommendToWarehouseCode;
+                    detailInput.RecommendToWarehouseCode = locationDtoRowOne.WarehouseCode;
+
+                    input.Details = new EditableList<TransferLibRequestDetailInput> { detailInput };
 
                     await _transferLibRequestAppService.CreateAsync(input).ConfigureAwait(false);
                 }
             }
         }
+    }
 
     /// <summary>
     ///     创建补料记录实体
@@ -193,26 +219,26 @@ public class InjectionIssueJobEventHandler :
     /// <returns></returns>
     private async Task<InjectionIssueNoteEditInput> BuildInjectionIssueNoteAsync(InjectionIssueJob entity)
     {
-        var injectionNoteCreateInput = ObjectMapper.Map<InjectionIssueJob, InjectionIssueNoteEditInput>(entity);
+        var injectionIssueNoteCreateInput = ObjectMapper.Map<InjectionIssueJob, InjectionIssueNoteEditInput>(entity);
-        injectionNoteCreateInput.JobNumber = entity.Number;
+        injectionIssueNoteCreateInput.JobNumber = entity.Number;
 
         await Task.CompletedTask.ConfigureAwait(false);
 
-        return injectionNoteCreateInput;
+        return injectionIssueNoteCreateInput;
     }
 
     /// <summary>
     ///     判断是不是在最底层 如果不是则把状态变更为等待
     /// </summary>
-    /// <param name="injectionJob"></param>
+    /// <param name="injectionIssueJob"></param>
     /// <returns></returns>
-    private async Task<bool> IsMinRowAsync(InjectionIssueJob injectionJob)
+    private async Task<bool> IsMinRowAsync(InjectionIssueJob injectionIssueJob)
     {
-        var detail = injectionJob.Details.FirstOrDefault();
+        var detail = injectionIssueJob.Details.FirstOrDefault();
 
-        var loctionDto = await _locationAppService.GetByCodeAsync(detail.RecommendFromLocationCode)
+        var locationDto = await _locationAppService.GetByCodeAsync(detail.RecommendFromLocationCode)
             .ConfigureAwait(false);
-        if (loctionDto.RowCode == 1)
+        if (locationDto.Type == EnumLocationType.RAW && locationDto.RowCode == 1)
         {
             return true;
         }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/InjectionPlanJobEventHandler.cs

@@ -0,0 +1,224 @@
+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.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.BusinessJob;
+
+public class InjectionPlanJobEventHandler :
+    StoreEventHandlerBase
+    , ILocalEventHandler<SfsCompletedEntityEventData<InjectionPlanJob>>
+    , ILocalEventHandler<SfsCreatedEntityEventData<InjectionPlanJob>>
+    , ILocalEventHandler<SfsCreatedEntityEventData<List<InjectionPlanJob>>>
+{
+    private readonly IInjectionPlanNoteAppService _injectionNoteAppService;
+    private readonly IExpectOutAppService _expectOutAppService;
+    private readonly ILocationAppService _locationAppService;
+    private readonly ITransferLibRequestAppService _transferLibRequestAppService;
+
+    public InjectionPlanJobEventHandler(IInjectionPlanNoteAppService injectionNoteAppService,
+        IExpectOutAppService expectOutAppService,
+        ILocationAppService locationAppService, ITransferLibRequestAppService transferLibRequestAppService)
+    {
+        _injectionNoteAppService = injectionNoteAppService;
+        _expectOutAppService = expectOutAppService;
+        _locationAppService = locationAppService;
+        _transferLibRequestAppService = transferLibRequestAppService;
+    }
+
+    /// <summary>
+    ///     执行后
+    /// </summary>
+    /// <param name="eventData"></param>
+    /// <returns></returns>
+    [UnitOfWork]
+    public virtual async Task HandleEventAsync(SfsCompletedEntityEventData<InjectionPlanJob> eventData)
+    {
+        var entity = eventData.Entity;
+        var injectionNote = await BuildInjectionPlanNoteAsync(entity).ConfigureAwait(false);
+        await _injectionNoteAppService.CreateAsync(injectionNote).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    ///     创建后
+    /// </summary>
+    /// <param name="eventData"></param>
+    /// <returns></returns>
+    public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<InjectionPlanJob> eventData)
+    {
+        var entity = eventData.Entity;
+
+        await CreateExpectOutAsync(entity).ConfigureAwait(false);
+
+        await CreateTransferLibAsync(entity).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    ///     批量创建后
+    /// </summary>
+    /// <param name="eventData"></param>
+    /// <returns></returns>
+    public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<List<InjectionPlanJob>> eventData)
+    {
+        var entitys = eventData.Entity;
+
+        foreach (var entity in entitys)
+        {
+            await CreateExpectOutAsync(entity).ConfigureAwait(false);
+
+            await CreateTransferLibAsync(entity).ConfigureAwait(false);
+        }
+    }
+
+    #region 私有
+
+    /// <summary>
+    ///     创建预计出
+    /// </summary>
+    /// <param name="entity"></param>
+    /// <returns></returns>
+    private async Task CreateExpectOutAsync(InjectionPlanJob entity)
+    {
+        var expectOutEditInputs = new List<ExpectOutEditInput>();
+        foreach (var detail in entity.Details)
+        {
+            var inputoExpectOutEditInput = new ExpectOutEditInput();
+            inputoExpectOutEditInput.JobNumber = entity.Number;
+            inputoExpectOutEditInput.ItemCode = detail.ItemCode;
+            inputoExpectOutEditInput.Qty = detail.RecommendFromQty;
+            inputoExpectOutEditInput.LocationCode = detail.RecommendFromLocationCode;
+            inputoExpectOutEditInput.ArriveDate = detail.RecommendFromArriveDate;
+            inputoExpectOutEditInput.ContainerCode = detail.RecommendFromContainerCode;
+            inputoExpectOutEditInput.ExpireDate = detail.RecommendFromExpireDate;
+            inputoExpectOutEditInput.ItemDesc1 = detail.ItemDesc1;
+            inputoExpectOutEditInput.ItemDesc2 = detail.ItemDesc2;
+            inputoExpectOutEditInput.ItemName = detail.ItemName;
+            inputoExpectOutEditInput.LocationArea = detail.RecommendFromLocationArea;
+            inputoExpectOutEditInput.LocationGroup = detail.RecommendFromLocationGroup;
+            inputoExpectOutEditInput.LocationErpCode = detail.RecommendFromLocationErpCode;
+            inputoExpectOutEditInput.PackingCode = detail.RecommendFromPackingCode;
+            inputoExpectOutEditInput.Lot = detail.RecommendFromLot;
+            inputoExpectOutEditInput.ProduceDate = detail.RecommendFromProduceDate;
+            inputoExpectOutEditInput.Status = detail.Status;
+            inputoExpectOutEditInput.Uom = detail.Uom;
+            inputoExpectOutEditInput.SupplierBatch = detail.RecommendFromSupplierBatch;
+            inputoExpectOutEditInput.WarehouseCode = detail.RecommendFromWarehouseCode;
+
+            expectOutEditInputs.Add(inputoExpectOutEditInput);
+        }
+
+        await _expectOutAppService.AddManyAsync(expectOutEditInputs).ConfigureAwait(false);
+
+        await Task.CompletedTask.ConfigureAwait(false);
+    }
+
+    /// <summary>
+    ///     根据是否在 第一层 来创建 是否生成库移任务
+    /// </summary>
+    /// <returns></returns>
+    private async Task CreateTransferLibAsync(InjectionPlanJob injectionJob)
+    {
+        if (!await IsMinRowAsync(injectionJob).ConfigureAwait(false))
+        {
+            foreach (var detail in injectionJob.Details)
+            {
+                var input = new TransferLibRequestEditInput();
+                input.CallBusinessType = nameof(IInjectionPlanJobAppService);
+                input.CallJobNumber = injectionJob.Number;
+                input.CallRequestNumber = injectionJob.InjectionPlanRequestNumber;
+                input.CallServerName = "Win_in.Sfs.Wms.Store.Application.InjectionPlanJobAppService";
+                input.Type = "Transfer_Warehouse";
+                input.UseOnTheWayLocation = true;
+
+                var detailInput = new TransferLibRequestDetailInput();
+                detailInput.CallBusinessType = nameof(IInjectionPlanJobAppService);
+                detailInput.CallRequestNumber = injectionJob.InjectionPlanRequestNumber;
+                detailInput.CallServerName = "Win_in.Sfs.Wms.Store.Application.InjectionPlanJobAppService";
+                detailInput.CallJobNumber = injectionJob.Number;
+
+                detailInput.JobStatus = EnumJobStatus.Open;
+                detailInput.ItemCode = detail.ItemCode;
+                detailInput.StdPackQty = detail.StdPackQty;
+                detailInput.Uom = detail.Uom;
+                detailInput.Status = detail.Status;
+
+                detailInput.RecommendFromQty = detail.RecommendFromQty;
+                detailInput.RecommendFromLot = detail.RecommendFromLot;
+                detailInput.RecommendFromPackingCode = detailInput.RecommendFromPackingCode;
+                detailInput.RecommendToLot = detail.RecommendToLot;
+
+                detailInput.RecommendFromArriveDate = detail.RecommendFromArriveDate;
+                detailInput.RecommendFromExpireDate = detail.RecommendFromExpireDate;
+                detailInput.RecommendFromProduceDate = detail.RecommendFromProduceDate;
+                detailInput.RecommendFromSupplierBatch = detail.RecommendFromSupplierBatch;
+
+                detailInput.RecommendFromLocationCode = detail.RecommendFromLocationCode;
+                detailInput.RecommendFromLocationGroup = detail.RecommendFromLocationGroup;
+                detailInput.RecommendFromLocationArea = detail.RecommendFromLocationArea;
+                detailInput.RecommendFromLocationErpCode = detail.RecommendFromLocationErpCode;
+                detailInput.RecommendFromWarehouseCode = detail.RecommendFromWarehouseCode;
+
+                detailInput.RecommendToQty = detail.RecommendToQty;
+                detailInput.RecommendToLot = detail.RecommendToLot;
+                detailInput.RecommendToPackingCode = detailInput.RecommendToPackingCode;
+                detailInput.RecommendToLot = detail.RecommendToLot;
+
+                detailInput.RecommendToArriveDate = detail.RecommendToArriveDate;
+                detailInput.RecommendToExpireDate = detail.RecommendToExpireDate;
+                detailInput.RecommendToProduceDate = detail.RecommendToProduceDate;
+                detailInput.RecommendToSupplierBatch = detail.RecommendToSupplierBatch;
+
+                detailInput.RecommendToLocationCode = detail.RecommendToLocationCode;
+                detailInput.RecommendToLocationGroup = detail.RecommendToLocationGroup;
+                detailInput.RecommendToLocationArea = detail.RecommendToLocationArea;
+                detailInput.RecommendToLocationErpCode = detail.RecommendToLocationErpCode;
+                detailInput.RecommendToWarehouseCode = detail.RecommendToWarehouseCode;
+
+                await _transferLibRequestAppService.CreateAsync(input).ConfigureAwait(false);
+            }
+        }
+    }
+
+    /// <summary>
+    ///     创建补料记录实体
+    /// </summary>
+    /// <param name="entity"></param>
+    /// <returns></returns>
+    private async Task<InjectionPlanNoteEditInput> BuildInjectionPlanNoteAsync(InjectionPlanJob entity)
+    {
+        var injectionNoteCreateInput = ObjectMapper.Map<InjectionPlanJob, InjectionPlanNoteEditInput>(entity);
+        injectionNoteCreateInput.JobNumber = entity.Number;
+
+        await Task.CompletedTask.ConfigureAwait(false);
+
+        return injectionNoteCreateInput;
+    }
+
+    /// <summary>
+    ///     判断是不是在最底层 如果不是则把状态变更为等待
+    /// </summary>
+    /// <param name="injectionJob"></param>
+    /// <returns></returns>
+    private async Task<bool> IsMinRowAsync(InjectionPlanJob injectionJob)
+    {
+        var detail = injectionJob.Details.FirstOrDefault();
+
+        var loctionDto = await _locationAppService.GetByCodeAsync(detail.RecommendFromLocationCode)
+            .ConfigureAwait(false);
+        if (loctionDto.RowCode == 1)
+        {
+            return true;
+        }
+
+        return false;
+    }
+
+    #endregion
+}

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

@@ -2,13 +2,17 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
 using System.Threading.Tasks;
+using AutoMapper;
 using Castle.Components.DictionaryAdapter;
 using Volo.Abp;
+using Volo.Abp.AutoMapper;
 using Volo.Abp.EventBus;
 using Win_in.Sfs.Basedata.Application.Contracts;
 using Win_in.Sfs.Shared.Domain.Shared;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 using Win_in.Sfs.Shared.Event;
 using Win_in.Sfs.Wms.Inventory.Application.Contracts;
+using Win_in.Sfs.Wms.Inventory.Domain;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 using Win_in.Sfs.Wms.Store.Domain;
 
@@ -22,22 +26,27 @@ public class InjectionIssueRequestEventHandler
         , ILocalEventHandler<SfsCreatedEntityEventData<InjectionIssueRequest>>
         , ILocalEventHandler<SfsCreatedEntityEventData<List<InjectionIssueRequest>>>
 {
-    private readonly IInjectionIssueJobAppService _injectionJobAppService;
+    private readonly IInjectionIssueJobAppService _injectionIssueJobAppService;
     private readonly IProductionLineAppService _productionLineAppService;
     private readonly IProductionLineItemAppService _productionLineItemAppService;
     private readonly ILocationAppService _locationAppService;
     private readonly IBalanceAppService _balanceAppService;
+    private IMapper _mapper;
+    //private readonly IInjectionIssueRequestManager _injectionIssueRequestManager; 
 
     public InjectionIssueRequestEventHandler(
-        IInjectionIssueJobAppService injectionJobAppService, IProductionLineAppService productionLineAppService,
+        IInjectionIssueJobAppService injectionIssueJobAppService, IProductionLineAppService productionLineAppService,
         ILocationAppService locationAppService,
-        IBalanceAppService balanceAppService, IProductionLineItemAppService productionLineItemAppService)
+        IBalanceAppService balanceAppService, IProductionLineItemAppService productionLineItemAppService
+    //, IInjectionIssueRequestManager injectionIssueRequestManager
+    )
     {
-        _injectionJobAppService = injectionJobAppService;
+        _injectionIssueJobAppService = injectionIssueJobAppService;
         _productionLineAppService = productionLineAppService;
         _locationAppService = locationAppService;
         _balanceAppService = balanceAppService;
         _productionLineItemAppService = productionLineItemAppService;
+        //_injectionIssueRequestManager = injectionIssueRequestManager;
     }
 
     /// <summary>
@@ -46,7 +55,9 @@ public class InjectionIssueRequestEventHandler
     /// <param name="eventData">Event data</param>
     public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<InjectionIssueRequest> eventData)
     {
-        await Task.CompletedTask.ConfigureAwait(false);
+        var entity = eventData.Entity;
+
+        await CreateAllInjectionIssueJobAsync(entity).ConfigureAwait(false);
     }
 
     /// <summary>
@@ -55,6 +66,8 @@ public class InjectionIssueRequestEventHandler
     /// <param name="eventData">Event data</param>
     public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<List<InjectionIssueRequest>> eventData)
     {
+        var entity = eventData.Entity;
+
         await Task.CompletedTask.ConfigureAwait(false);
     }
 
@@ -67,14 +80,7 @@ public class InjectionIssueRequestEventHandler
     {
         var entity = eventData.Entity;
 
-        List<InjectionIssueJobEditInput> injectionJobs = new EditableList<InjectionIssueJobEditInput>();
+        await CreateAllInjectionIssueJobAsync(entity).ConfigureAwait(false);
-
-        injectionJobs = await CreateInjectionIssueJobWithBoxQtyTypeAsync(entity).ConfigureAwait(false);
-
-        if (injectionJobs.Any())
-        {
-            await _injectionJobAppService.CreateManyAsync(injectionJobs).ConfigureAwait(false);
-        }
     }
 
     /// <summary>
@@ -95,68 +101,270 @@ public class InjectionIssueRequestEventHandler
     public virtual async Task HandleEventAsync(SfsCompletedEntityEventData<InjectionIssueRequest> eventData)
     {
         _ = eventData.Entity;
-        // await _injectionJobAppService.CompleteByInjectionIssueRequestAsync(entity.Number);
+        // await _injectionIssueJobAppService.CompleteByInjectionIssueRequestAsync(entity.Number);
 
         await Task.CompletedTask.ConfigureAwait(false);
     }
 
     #region 私有
 
+    #region 按数量叫料
+
+    /// <summary>
+    ///     创建注塑任务-按数量
+    /// </summary>
+    /// <param name="injectionIssueRequest"></param>
+    /// <param name="injectionIssueRequestDetails"></param>
+    /// <param name="recommendbalanceDtos"></param>
+    /// <param name="useBalanceList"></param>
+    /// <returns></returns>
+    /// <exception cref="UserFriendlyException"></exception>
+    private async Task<List<InjectionIssueJobEditInput>> CreateInjectionIssueJobWithQtyTypeAsync
+    (InjectionIssueRequest injectionIssueRequest, List<InjectionIssueRequestDetail> injectionIssueRequestDetails,
+        List<BalanceDTO> recommendbalanceDtos,
+        List<BalanceDTO> useBalanceList)
+    {
+        var jobs = new List<InjectionIssueJobEditInput>();
+        //用来临时存放所有未生成任务的发料集合 如果生成完了再这里去掉
+        var tempDetailDtos =
+            ObjectMapper.Map<List<InjectionIssueRequestDetail>, List<InjectionIssueRequestDetailDTO>>(
+                injectionIssueRequestDetails);
+
+        var injectionIssueJobDetailInputs = new List<InjectionIssueJobDetailInput>();
+
+        if (recommendbalanceDtos != null && recommendbalanceDtos.Count > 0)
+        {
+            var queue = new Queue<BalanceDTO>(recommendbalanceDtos);
+            while (queue.TryDequeue(out var balanceDto))
+            {
+                var next = false;
+
+                var temp = tempDetailDtos.ToList();
+
+                foreach (var tempDetailDto in tempDetailDtos)
+                {
+                    //未发送的数量
+                    tempDetailDto.Qty = tempDetailDto.Qty - tempDetailDto.IssuedQty;
+
+                    if (tempDetailDto.Qty > balanceDto.Qty) //需求量大于 这条推荐库存的余额
+                    {
+                        tempDetailDto.Qty -= balanceDto.Qty;
+                    }
+                    else if (tempDetailDto.Qty <= balanceDto.Qty)
+                    {
+                        temp.Remove(tempDetailDto);
+                        balanceDto.Qty = tempDetailDto.Qty;
+                    }
+
+                    injectionIssueJobDetailInputs.Add(
+                        await BuildInjectionIssueJobDetailWithQtyTypeAsync(tempDetailDto, balanceDto)
+                            .ConfigureAwait(false));
+                    useBalanceList.Add(balanceDto);
+
+                    if (balanceDto.Qty <= 0)
+                    {
+                        next = true;
+                        break;
+                    }
+                }
+
+                tempDetailDtos = temp;
+
+                if (next)
+                {
+                }
+            }
+        }
+
+        if (injectionIssueJobDetailInputs.Any())
+        {
+            var injectionIssueJobEditInput = new InjectionIssueJobEditInput();
+            injectionIssueJobEditInput = await BuildInjectionIssueJobCreateInputWithQtyTypeAsync(injectionIssueRequest,
+                injectionIssueRequestDetails.First()).ConfigureAwait(false);
+            injectionIssueJobEditInput.Details = injectionIssueJobDetailInputs;
+            jobs.Add(injectionIssueJobEditInput);
+        }
+
+        return jobs;
+    }
+
+    /// <summary>
+    ///     构造注塑任务-按数量
+    /// </summary>
+    /// <param name="injectionIssueRequest"></param>
+    /// <param name="requestDetailInput"></param>
+    /// <returns></returns>
+    private async Task<InjectionIssueJobEditInput> BuildInjectionIssueJobCreateInputWithQtyTypeAsync(
+        InjectionIssueRequest injectionIssueRequest, InjectionIssueRequestDetail requestDetailInput)
+    {
+        var job = ObjectMapper.Map<InjectionIssueRequest, InjectionIssueJobEditInput>(injectionIssueRequest);
+        job.JobType = EnumJobType.IssueJob;
+        job.JobStatus = EnumJobStatus.Open;
+        job.WorkGroupCode = requestDetailInput.ToLocationGroup;
+        job.WarehouseCode = requestDetailInput.ToWarehouseCode;
+        job.Worker = injectionIssueRequest.Worker;
+        job.InjectionRequestNumber = injectionIssueRequest.Number;
+        job.EnumIssueSendType = EnumIssueSendType.QtyType;
+
+        await Task.CompletedTask.ConfigureAwait(false);
+
+        return job;
+    }
+
+
+    /// <summary>
+    ///     构造注塑任务明细-按数量
+    /// </summary>
+    /// <param name="injectionIssueRequestDetail"></param>
+    /// <param name="balance"></param>
+    /// <returns></returns>
+    private async Task<InjectionIssueJobDetailInput> BuildInjectionIssueJobDetailWithQtyTypeAsync(
+        InjectionIssueRequestDetailDTO injectionIssueRequestDetail, BalanceDTO balance)
+    {
+        var detail = new InjectionIssueJobDetailInput();
+        detail.RequestLocationCode = injectionIssueRequestDetail.ToLocationCode;
+        detail.PositionCode = injectionIssueRequestDetail.PositionCode;
+        detail.RecommendType = injectionIssueRequestDetail.RecommendType;
+        detail.Uom = balance.Uom;
+        detail.ItemCode = balance.ItemCode;
+        detail.ItemDesc2 = balance.ItemDesc2;
+        detail.ItemDesc1 = balance.ItemDesc1;
+        detail.ItemName = balance.ItemName;
+        detail.ProdLine = injectionIssueRequestDetail.ProdLine;
+        detail.RequestQty = balance.Qty;
+        detail.StdPackQty = injectionIssueRequestDetail.StdPackQty;
+        detail.Status = balance.Status;
+
+        detail.RequestLocationErpCode = injectionIssueRequestDetail.ToLocationErpCode;
+        detail.RequestLocationArea = injectionIssueRequestDetail.ToLocationArea;
+        detail.RequestWarehouseCode = injectionIssueRequestDetail.ToWarehouseCode;
+        detail.RequestLocationGroup = injectionIssueRequestDetail.ToLocationGroup;
+        detail.RequestLocationCode = injectionIssueRequestDetail.ToLocationCode;
+
+        detail.RecommendFromPackingCode = balance.PackingCode;
+        detail.RecommendFromContainerCode = balance.ContainerCode;
+        detail.RecommendFromSupplierBatch = balance.SupplierBatch;
+        detail.RecommendFromProduceDate = balance.ProduceDate;
+        detail.RecommendFromExpireDate = balance.ExpireDate;
+        detail.RecommendFromLot = balance.Lot;
+        detail.RecommendFromProduceDate = balance.ProduceDate;
+        detail.RecommendFromArriveDate = balance.ArriveDate;
+        detail.RecommendFromQty = balance.Qty;
+        detail.RecommendFromContainerCode = balance.ContainerCode;
+        detail.RecommendFromPackingCode = balance.PackingCode;
+
+        detail.RecommendToPackingCode = balance.PackingCode;
+        detail.RecommendToContainerCode = balance.ContainerCode;
+        detail.RecommendToSupplierBatch = balance.SupplierBatch;
+        detail.RecommendToProduceDate = balance.ProduceDate;
+        detail.RecommendToExpireDate = balance.ExpireDate;
+        detail.RecommendToLot = balance.Lot;
+        detail.RecommendToProduceDate = balance.ProduceDate;
+        detail.RecommendToArriveDate = balance.ArriveDate;
+        detail.RecommendToQty = balance.Qty;
+        detail.RecommendToContainerCode = balance.ContainerCode;
+        detail.RecommendToPackingCode = balance.PackingCode;
+
+        detail.RecommendFromLocationArea = balance.LocationArea;
+        detail.RecommendFromLocationCode = balance.LocationCode;
+        detail.RecommendFromLocationErpCode = balance.LocationErpCode;
+        detail.RecommendFromLocationGroup = balance.LocationGroup;
+        detail.RecommendFromWarehouseCode = balance.WarehouseCode;
+
+        detail.RecommendToLocationCode = injectionIssueRequestDetail.ToLocationCode;
+        detail.RecommendToLocationErpCode = injectionIssueRequestDetail.ToLocationErpCode;
+        detail.RecommendToLocationArea = injectionIssueRequestDetail.ToLocationArea;
+        detail.RecommendToWarehouseCode = injectionIssueRequestDetail.ToWarehouseCode;
+        detail.RecommendToLocationGroup = injectionIssueRequestDetail.ToLocationGroup;
+
+        detail.TransferLibFromPackingCode = balance.PackingCode;
+        detail.TransferLibFromContainerCode = balance.ContainerCode;
+        detail.TransferLibFromSupplierBatch = balance.SupplierBatch;
+        detail.TransferLibFromProduceDate = balance.ProduceDate;
+        detail.TransferLibFromExpireDate = balance.ExpireDate;
+        detail.TransferLibFromLot = balance.Lot;
+        detail.TransferLibFromProduceDate = balance.ProduceDate;
+        detail.TransferLibFromArriveDate = balance.ArriveDate;
+        detail.TransferLibFromQty = balance.Qty;
+        detail.TransferLibFromContainerCode = balance.ContainerCode;
+        detail.TransferLibFromPackingCode = balance.PackingCode;
+
+        detail.TransferLibToPackingCode = balance.PackingCode;
+        detail.TransferLibToContainerCode = balance.ContainerCode;
+        detail.TransferLibToSupplierBatch = balance.SupplierBatch;
+        detail.TransferLibToProduceDate = balance.ProduceDate;
+        detail.TransferLibToExpireDate = balance.ExpireDate;
+        detail.TransferLibToLot = balance.Lot;
+        detail.TransferLibToProduceDate = balance.ProduceDate;
+        detail.TransferLibToArriveDate = balance.ArriveDate;
+        detail.TransferLibToQty = balance.Qty;
+        detail.TransferLibToPackingCode = balance.PackingCode;
+
+        detail.TransferLibFromLocationArea = balance.LocationArea;
+        detail.TransferLibFromLocationCode = balance.LocationCode;
+        detail.TransferLibFromLocationErpCode = balance.LocationErpCode;
+        detail.TransferLibFromLocationGroup = balance.LocationGroup;
+        detail.TransferLibFromWarehouseCode = balance.WarehouseCode;
+
+        detail.TransferLibToLocationCode = injectionIssueRequestDetail.ToLocationCode;
+        detail.TransferLibToLocationErpCode = injectionIssueRequestDetail.ToLocationErpCode;
+        detail.TransferLibToLocationArea = injectionIssueRequestDetail.ToLocationArea;
+        detail.TransferLibToWarehouseCode = injectionIssueRequestDetail.ToWarehouseCode;
+        detail.TransferLibToLocationGroup = injectionIssueRequestDetail.ToLocationGroup;
+
+        await Task.CompletedTask.ConfigureAwait(false);
+        return detail;
+    }
+
+    #endregion
+
     #region 按箱叫料
 
     /// <summary>
-    ///     创建注塑任务
+    ///     创建注塑任务 按箱叫料-按箱
     /// </summary>
-    /// <param name="injectionRequest"></param>
+    /// <param name="injectionIssueRequest"></param>
+    /// <param name="injectionIssueRequestDetailList"></param>
+    /// <param name="recommendbalanceDtos"></param>
+    /// <param name="useBalanceList"></param>
     /// <returns></returns>
     /// <exception cref="UserFriendlyException"></exception>
     private async Task<List<InjectionIssueJobEditInput>> CreateInjectionIssueJobWithBoxQtyTypeAsync
-        (InjectionIssueRequest injectionRequest)
+    (
+        InjectionIssueRequest injectionIssueRequest,
+        List<InjectionIssueRequestDetail> injectionIssueRequestDetailList,
+        List<SortBalance> recommendbalanceDtos,
+        List<BalanceDTO> useBalanceList)
     {
         var inputJobs = new List<InjectionIssueJobEditInput>();
-        var inputExpectOutEditInput = new ExpectOutEditInput();
-        //已用的库存的箱码集合
-        var useBalanceList = new List<string>();
 
-        var groupByItemCodeAndLocationCode =
+        //已用的库存的集合
-            injectionRequest.Details.GroupBy(p => new { p.ItemCode, p.ToLocationCode });
+        useBalanceList = useBalanceList;
 
-        foreach (var locationCodeItemCodeGroup in groupByItemCodeAndLocationCode)
+        foreach (var detail in injectionIssueRequestDetailList)
         {
-            var inputDetails = injectionRequest.Details.Where(p =>
+            //当前零件的集合
-                p.ItemCode == locationCodeItemCodeGroup.Key.ItemCode &&
+            var inputDetails = injectionIssueRequestDetailList;
-                p.ToLocationCode == locationCodeItemCodeGroup.Key.ToLocationCode);
-            var inputDetailTemplate = inputDetails.First();
             //获取请求下 这个零件和这个库位一个需要多少箱
-            var sumBoxQty = inputDetails.Sum(p => p.BoxQty);
+            var sumBoxQty = inputDetails.Sum(p => p.BoxQty - p.IssuedQty);
             //获取生产线
             var productionLineDto = await _productionLineAppService
                 .GetByLocationCodeAsync(inputDetails.First().ToLocationCode).ConfigureAwait(false);
-            if (productionLineDto == null)
+
-            {
-                throw new UserFriendlyException($"库位【{inputDetailTemplate.ToLocationCode}】没有对应的【生产线】");
-            }
 
             var productLineCodeAndItemCode = await _productionLineItemAppService
-                .GetByProductLineCodeAndItemCodeAsync(productionLineDto.Code, inputDetailTemplate.ItemCode)
+                .GetByProductLineCodeAndItemCodeAsync(productionLineDto.Code, detail.ItemCode)
                 .ConfigureAwait(false);
             if (productLineCodeAndItemCode == null)
             {
                 throw new UserFriendlyException(
-                    $"物品代码【{inputDetailTemplate.ItemCode}】在生产线【{productionLineDto.Code}】中没有对应的【生产线物品关系】");
+                    $"物品代码【{detail.ItemCode}】在生产线【{productionLineDto.Code}】中没有对应的【生产线物品关系】");
             }
 
-            //获取可用库存
+            //可用库存
-            var input = new RecommendBalanceRequestInput
+            var usableList = recommendbalanceDtos;
-            {
+            usableList = usableList.Where(p => !useBalanceList.Select(p => p.PackingCode).Contains(p.PackingCode))
-                ItemCode = locationCodeItemCodeGroup.Key.ItemCode,
+                .ToList();
-                Qty = decimal.MaxValue,
-                Statuses = new EditableList<EnumInventoryStatus> { EnumInventoryStatus.OK },
-                Locations = JsonSerializer.Deserialize<List<string>>(productLineCodeAndItemCode
-                    .RawLocationCodeListJson)
-            };
-            var usableList = await _balanceAppService.GetUsableListAsync(input).ConfigureAwait(false);
-            usableList = usableList.Where(p => !useBalanceList.Contains(p.PackingCode) && p.Qty != 0).ToList();
             if (usableList.Any())
             {
                 for (var i = 0; i < sumBoxQty; i++)
@@ -164,16 +372,19 @@ public class InjectionIssueRequestEventHandler
                     if (usableList.Any())
                     {
                         var firstUsable = usableList.First();
-                    useBalanceList.Add(firstUsable.PackingCode);
+                        useBalanceList.Add((BalanceDTO)firstUsable);
                         usableList.Remove(firstUsable);
 
-                    var injectionJobEditInput =
+                        var injectionIssueJobEditInput =
-                        await BuildInjectionIssueJobCreateInputWithBoxQtyTypeAsync(injectionRequest,
+                            await BuildInjectionIssueJobCreateInputWithBoxQtyTypeAsync(injectionIssueRequest,
-                                inputDetailTemplate,
+                                    detail, firstUsable)
-                                firstUsable)
                                 .ConfigureAwait(false);
 
-                    inputJobs.Add(injectionJobEditInput);
+                        inputJobs.Add(injectionIssueJobEditInput);
+                    }
+                    else
+                    {
+                        break;
                     }
                 }
             }
@@ -183,25 +394,26 @@ public class InjectionIssueRequestEventHandler
     }
 
     /// <summary>
-    ///     构造注塑任务
+    ///     构造注塑任务-按箱
     /// </summary>
-    /// <param name="injectionRequest"></param>
+    /// <param name="injectionIssueRequest"></param>
-    /// <param name="injectionRequestDetail"></param>
+    /// <param name="injectionIssueRequestDetail"></param>
     /// <param name="balanceDtos"></param>
     /// <returns></returns>
     private async Task<InjectionIssueJobEditInput> BuildInjectionIssueJobCreateInputWithBoxQtyTypeAsync(
-        InjectionIssueRequest injectionRequest,
+        InjectionIssueRequest injectionIssueRequest,
-        InjectionIssueRequestDetail injectionRequestDetail, BalanceDTO balanceDtos)
+        InjectionIssueRequestDetail injectionIssueRequestDetail, BalanceDTO balanceDtos)
     {
-        var job = ObjectMapper.Map<InjectionIssueRequest, InjectionIssueJobEditInput>(injectionRequest);
+        var job = ObjectMapper.Map<InjectionIssueRequest, InjectionIssueJobEditInput>(injectionIssueRequest);
         job.JobType = EnumJobType.IssueJob;
         job.JobStatus = EnumJobStatus.Open;
-        job.WorkGroupCode = injectionRequestDetail.ToLocationGroup;
+        job.WorkGroupCode = injectionIssueRequestDetail.ToLocationGroup;
-        job.WarehouseCode = injectionRequestDetail.ToWarehouseCode;
+        job.WarehouseCode = injectionIssueRequestDetail.ToWarehouseCode;
-        job.Worker = injectionRequest.Worker;
+        job.Worker = injectionIssueRequest.Worker;
-        job.InjectionIssueRequestNumber = injectionRequest.Number;
+        job.InjectionRequestNumber = injectionIssueRequest.Number;
+        job.EnumIssueSendType = EnumIssueSendType.BoxQtyType;
 
-        job.Details.Add(await BuildInjectionIssueJobDetailWithBoxQtyTypeAsync(injectionRequestDetail, balanceDtos)
+        job.Details.Add(await BuildInjectionIssueJobDetailWithBoxQtyTypeAsync(injectionIssueRequestDetail, balanceDtos)
             .ConfigureAwait(false));
 
         await Task.CompletedTask.ConfigureAwait(false);
@@ -210,31 +422,31 @@ public class InjectionIssueRequestEventHandler
     }
 
     /// <summary>
-    ///     构造注塑任务明细
+    ///     构造注塑任务明细-按箱
     /// </summary>
-    /// <param name="injectionRequestDetail"></param>
+    /// <param name="injectionIssueRequestDetail"></param>
     /// <param name="balance"></param>
     /// <param name="toLocationGroupCode"></param>
     /// <returns></returns>
     private async Task<InjectionIssueJobDetailInput> BuildInjectionIssueJobDetailWithBoxQtyTypeAsync(
-        InjectionIssueRequestDetail injectionRequestDetail, BalanceDTO balance)
+        InjectionIssueRequestDetail injectionIssueRequestDetail, BalanceDTO balance)
     {
         var detail = new InjectionIssueJobDetailInput();
-        detail.RequestLocationCode = injectionRequestDetail.ToLocationCode;
+        detail.RequestLocationCode = injectionIssueRequestDetail.ToLocationCode;
-        detail.RequestLocationGroup = injectionRequestDetail.ToLocationGroup;
+        detail.RequestLocationGroup = injectionIssueRequestDetail.ToLocationGroup;
-        detail.RequestLocationArea = injectionRequestDetail.ToLocationArea;
+        detail.RequestLocationArea = injectionIssueRequestDetail.ToLocationArea;
-        detail.RequestLocationErpCode = injectionRequestDetail.ToLocationErpCode;
+        detail.RequestLocationErpCode = injectionIssueRequestDetail.ToLocationErpCode;
-        detail.RequestWarehouseCode = injectionRequestDetail.ToWarehouseCode;
+        detail.RequestWarehouseCode = injectionIssueRequestDetail.ToWarehouseCode;
-
+        detail.RequestQty = 1;
-        detail.PositionCode = injectionRequestDetail.PositionCode;
+
-        detail.RecommendType = injectionRequestDetail.RecommendType;
+        detail.PositionCode = injectionIssueRequestDetail.PositionCode;
-        detail.ProdLine = injectionRequestDetail.ToLocationCode;
+        detail.RecommendType = injectionIssueRequestDetail.RecommendType;
-
+        detail.ProdLine = injectionIssueRequestDetail.ToLocationCode;
-        detail.ItemCode = injectionRequestDetail.ItemCode;
+
-        detail.ItemName = injectionRequestDetail.ItemName;
+        detail.ItemCode = injectionIssueRequestDetail.ItemCode;
-        detail.ItemDesc1 = injectionRequestDetail.ItemDesc1;
+        detail.ItemName = injectionIssueRequestDetail.ItemName;
-        detail.ItemDesc2 = injectionRequestDetail.ItemDesc2;
+        detail.ItemDesc1 = injectionIssueRequestDetail.ItemDesc1;
-        detail.StdPackQty = injectionRequestDetail.StdPackQty;
+        detail.ItemDesc2 = injectionIssueRequestDetail.ItemDesc2;
 
         detail.Status = EnumInventoryStatus.OK;
         detail.Uom = balance.Uom;
@@ -269,11 +481,11 @@ public class InjectionIssueRequestEventHandler
         detail.RecommendToProduceDate = balance.ProduceDate;
         detail.RecommendToArriveDate = balance.ArriveDate;
 
-        detail.RecommendToLocationCode = injectionRequestDetail.ToLocationCode;
+        detail.RecommendToLocationCode = injectionIssueRequestDetail.ToLocationCode;
-        detail.RecommendToLocationErpCode = injectionRequestDetail.ToLocationErpCode;
+        detail.RecommendToLocationErpCode = injectionIssueRequestDetail.ToLocationErpCode;
-        detail.RecommendToLocationArea = injectionRequestDetail.ToLocationArea;
+        detail.RecommendToLocationArea = injectionIssueRequestDetail.ToLocationArea;
-        detail.RecommendToWarehouseCode = injectionRequestDetail.ToWarehouseCode;
+        detail.RecommendToWarehouseCode = injectionIssueRequestDetail.ToWarehouseCode;
-        detail.RecommendToLocationGroup = injectionRequestDetail.ToLocationGroup;
+        detail.RecommendToLocationGroup = injectionIssueRequestDetail.ToLocationGroup;
 
         await Task.CompletedTask.ConfigureAwait(false);
         return detail;
@@ -282,4 +494,210 @@ public class InjectionIssueRequestEventHandler
     #endregion
 
     #endregion
+
+    //创建任务
+    private async Task<List<InjectionIssueJobDTO>> CreateAllInjectionIssueJobAsync(
+        InjectionIssueRequest injectionIssueRequest)
+    {
+        var injectionIssueJobEditInputs = new List<InjectionIssueJobEditInput>();
+
+        //已用的库存的集合
+        var useBalanceList = new List<BalanceDTO>();
+
+        foreach (var groupbyItemCodeAndProdLine in injectionIssueRequest.Details.GroupBy(p =>
+                     new { p.ItemCode }))
+        {
+            foreach (var injectionIssueRequestDetail in groupbyItemCodeAndProdLine)
+            {
+                var productionLineItemDto = await _productionLineItemAppService.GetByProductLineCodeAndItemCodeAsync(
+                    injectionIssueRequestDetail.ProdLine,
+                    groupbyItemCodeAndProdLine.Key.ItemCode).ConfigureAwait(false);
+
+                if (productionLineItemDto == null)
+                {
+                    throw new UserFriendlyException(
+                        $"未在生产线【{injectionIssueRequestDetail.ProdLine}】物品【{groupbyItemCodeAndProdLine.Key.ItemCode}】的关系，请查看【生产线物品关系】");
+                }
+
+                //原料
+                if (!string.IsNullOrEmpty(productionLineItemDto.RawLocationCodeListJson)) //因为一个零件 要不是原料 要不是半成品
+                {
+                    var usableLocationCode =
+                        JsonSerializer.Deserialize<List<string>>(productionLineItemDto.RawLocationCodeListJson);
+                    if (usableLocationCode.Any())
+                    {
+                        //获取可用库存
+                        var input = new RecommendBalanceRequestInput
+                        {
+                            ItemCode = injectionIssueRequestDetail.ItemCode,
+                            Qty = decimal.MaxValue,
+                            Statuses = new EditableList<EnumInventoryStatus> { EnumInventoryStatus.OK },
+                            Locations =
+                                JsonSerializer.Deserialize<List<string>>(productionLineItemDto.RawLocationCodeListJson),
+                            IsPackingCode = true
+                        };
+                        var usableList = await _balanceAppService.GetUsableListAsync(input).ConfigureAwait(false);
+                        var sortByFifoAsync = await SortByFifoAsync(usableList).ConfigureAwait(false);
+
+                        //因为是按箱叫料 先把值赋值给箱数量上
+                        injectionIssueRequestDetail.BoxQty = injectionIssueRequestDetail.Qty;
+
+                        if (usableList.Any())
+                        {
+                            //因为是原料所以按箱叫料
+                            injectionIssueJobEditInputs.AddRange(
+                                await CreateInjectionIssueJobWithBoxQtyTypeAsync(injectionIssueRequest,
+                                    new EditableList<InjectionIssueRequestDetail> { injectionIssueRequestDetail },
+                                    sortByFifoAsync,
+                                    useBalanceList).ConfigureAwait(false));
+                        }
+                    }
+                }
+
+                //半成品
+                if (!string.IsNullOrEmpty(productionLineItemDto.ProductLocationCodeListJson)) //因为一个零件 要不是原料 要不是半成品
+                {
+                    var usableLocationCode =
+                        JsonSerializer.Deserialize<List<string>>(productionLineItemDto.ProductLocationCodeListJson);
+                    if (usableLocationCode.Any())
+                    {
+                        //获取可用库存
+                        var input = new RecommendBalanceRequestInput
+                        {
+                            ItemCode = groupbyItemCodeAndProdLine.Key.ItemCode,
+                            Qty = injectionIssueRequestDetail.Qty,
+                            Statuses = new EditableList<EnumInventoryStatus> { EnumInventoryStatus.OK },
+                            Locations =
+                                JsonSerializer.Deserialize<List<string>>(productionLineItemDto
+                                    .ProductLocationCodeListJson),
+                            IsPackingCode = false
+                        };
+                        var usableList = await _balanceAppService.GetUsableListAsync(input).ConfigureAwait(false);
+                        var temp = usableList.ToList();
+
+                        foreach (var balanceDto in usableList) //计算已经用过的库存
+                        {
+                            var useBalanceDto = useBalanceList.Where(p =>
+                                p.ItemCode == balanceDto.ItemCode && p.LocationCode == balanceDto.LocationCode &&
+                                p.Lot == balanceDto.Lot && p.Status == balanceDto.Status &&
+                                p.PackingCode == balanceDto.PackingCode);
+                            if (useBalanceDto.Any()) //如果不为NULL，就是用过了的库存 需要减去使用量
+                            {
+                                balanceDto.Qty -= useBalanceDto.Sum(p => p.Qty);
+                                if (balanceDto.Qty <= 0)
+                                {
+                                    temp.Remove(balanceDto);
+                                }
+                            }
+                        }
+
+                        usableList = temp;
+
+                        injectionIssueJobEditInputs.AddRange(
+                            await CreateInjectionIssueJobWithQtyTypeAsync(injectionIssueRequest,
+                                new List<InjectionIssueRequestDetail> { injectionIssueRequestDetail }, temp,
+                                useBalanceList).ConfigureAwait(false));
+                    }
+                }
+            }
+        }
+
+        if (injectionIssueJobEditInputs.Count > 0) //有库存 可以创建任务
+        {
+            //新增任务
+            var addInjectionIssueJobDtos = await _injectionIssueJobAppService.CreateManyAsync(injectionIssueJobEditInputs)
+                .ConfigureAwait(false);
+
+            await UpdateInjectionIssueRequestDetailQtyAsync(injectionIssueRequest, addInjectionIssueJobDtos)
+                .ConfigureAwait(false);
+
+            return addInjectionIssueJobDtos;
         }
+
+        return new List<InjectionIssueJobDTO>();
+    }
+
+    /// <summary>
+    ///     修改请求的 已发 已收数量
+    /// </summary>
+    /// <param name="injectionIssueRequest"></param>
+    /// <param name="addInjectionIssueJobDtos"></param>
+    /// <returns></returns>
+    private async Task UpdateInjectionIssueRequestDetailQtyAsync(InjectionIssueRequest injectionIssueRequest,
+        List<InjectionIssueJobDTO> addInjectionIssueJobDtos)
+    {
+        //原有任务
+        var existInjectionIssueJobDtos = await _injectionIssueJobAppService
+            .GetByRequestNumberAsync(injectionIssueRequest.Number)
+            .ConfigureAwait(false);
+
+        //新增的任务和已有的任务总和
+        var allInjectionIssueJobDtos = new List<InjectionIssueJobDTO>();
+        allInjectionIssueJobDtos.AddRange(addInjectionIssueJobDtos);
+        allInjectionIssueJobDtos.AddRange(existInjectionIssueJobDtos);
+
+        var groupByItemCodeLocationCode = injectionIssueRequest.Details.GroupBy(p =>
+            new { p.ItemCode, p.ToLocationCode });
+        foreach (var group in groupByItemCodeLocationCode)
+        {
+            foreach (var requestDetail in group)
+            {
+                //所有已发数量
+                decimal allIssuedQty = 0;
+
+                //所有已发数量
+                decimal allReceivedQty = 0;
+
+                foreach (var allInjectionIssueJobDto in allInjectionIssueJobDtos)
+                {
+                    var jobDetailDtos = allInjectionIssueJobDto.Details.Where(p =>
+                        p.ItemCode == group.Key.ItemCode && p.RequestLocationCode == group.Key.ToLocationCode);
+                    //所有已发数量
+                    allIssuedQty += jobDetailDtos.Sum(p => p.RequestQty);
+                    //所有已发数量
+                    allReceivedQty += jobDetailDtos.Sum(p => p.HandledToQty);
+                }
+
+                requestDetail.IssuedQty += allIssuedQty;
+                requestDetail.ReceivedQty += allReceivedQty;
+            }
+        }
+
+        //await _injectionIssueRequestManager.UpdateAsync(injectionIssueRequest).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// 排序规则 1.批次正序 2.底层 3.到货日期正序 4.数量倒序(整箱优先) 5.库位正序 6.箱码正序
+    /// </summary>
+    /// <param name="balances"></param>
+    /// <returns></returns>
+    public async Task<List<SortBalance>> SortByFifoAsync(List<BalanceDTO> balances)
+    {
+        var sortBalances = new List<SortBalance>();
+        var config = new MapperConfiguration(cfg =>
+        {
+            cfg.CreateMap<BalanceDTO, SortBalance>()
+                .Ignore(x => x.LocationRow);
+        });
+        _mapper = new Mapper(config);
+
+        var resultBalances = _mapper.Map<List<BalanceDTO>, List<SortBalance>>(balances);
+        foreach (var resultBalance in resultBalances)
+        {
+            var locationDto = await _locationAppService.GetByCodeAsync(resultBalance.LocationCode).ConfigureAwait(false);
+            resultBalance.LocationRow = locationDto.RowCode;
+        }
+
+        resultBalances = resultBalances
+            .OrderBy(p => p.Lot)
+            .ThenBy(p => p.LocationRow)
+            .ThenBy(p => p.PutInTime)
+            .ThenBy(p => p.Qty)//2023-9-14 苑静雯 从小数开始发料
+            .ThenBy(p => p.LocationCode)
+            .ThenBy(p => p.PackingCode)
+            .ToList();
+
+        return resultBalances;
+    }
+}
+

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

@@ -0,0 +1,285 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json;
+using System.Threading.Tasks;
+using Castle.Components.DictionaryAdapter;
+using Volo.Abp;
+using Volo.Abp.EventBus;
+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;
+
+namespace Win_in.Sfs.Wms.Store.Event.BusinessRequest;
+
+public class InjectionPlanRequestEventHandler
+    : StoreEventHandlerBase
+        , ILocalEventHandler<SfsHandledEntityEventData<InjectionPlanRequest>>
+        , ILocalEventHandler<SfsAbortedEntityEventData<InjectionPlanRequest>>
+        , ILocalEventHandler<SfsCompletedEntityEventData<InjectionPlanRequest>>
+        , ILocalEventHandler<SfsCreatedEntityEventData<InjectionPlanRequest>>
+        , ILocalEventHandler<SfsCreatedEntityEventData<List<InjectionPlanRequest>>>
+{
+    private readonly IInjectionPlanJobAppService _injectionJobAppService;
+    private readonly IProductionLineAppService _productionLineAppService;
+    private readonly IProductionLineItemAppService _productionLineItemAppService;
+    private readonly ILocationAppService _locationAppService;
+    private readonly IBalanceAppService _balanceAppService;
+
+    public InjectionPlanRequestEventHandler(
+        IInjectionPlanJobAppService injectionJobAppService, IProductionLineAppService productionLineAppService,
+        ILocationAppService locationAppService,
+        IBalanceAppService balanceAppService, IProductionLineItemAppService productionLineItemAppService)
+    {
+        _injectionJobAppService = injectionJobAppService;
+        _productionLineAppService = productionLineAppService;
+        _locationAppService = locationAppService;
+        _balanceAppService = balanceAppService;
+        _productionLineItemAppService = productionLineItemAppService;
+    }
+
+    /// <summary>
+    ///     创建后
+    /// </summary>
+    /// <param name="eventData">Event data</param>
+    public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<InjectionPlanRequest> eventData)
+    {
+        await Task.CompletedTask.ConfigureAwait(false);
+    }
+
+    /// <summary>
+    ///     批量创建后
+    /// </summary>
+    /// <param name="eventData">Event data</param>
+    public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<List<InjectionPlanRequest>> eventData)
+    {
+        await Task.CompletedTask.ConfigureAwait(false);
+    }
+
+    /// <summary>
+    ///     执行后
+    /// </summary>
+    /// <param name="eventData"></param>
+    /// <returns></returns>
+    public virtual async Task HandleEventAsync(SfsHandledEntityEventData<InjectionPlanRequest> eventData)
+    {
+        var entity = eventData.Entity;
+
+        List<InjectionPlanJobEditInput> injectionJobs = new EditableList<InjectionPlanJobEditInput>();
+
+        injectionJobs = await CreateInjectionPlanJobWithBoxQtyTypeAsync(entity).ConfigureAwait(false);
+
+        if (injectionJobs.Any())
+        {
+            await _injectionJobAppService.CreateManyAsync(injectionJobs).ConfigureAwait(false);
+        }
+    }
+
+    /// <summary>
+    ///     驳回后
+    /// </summary>
+    /// <param name="eventData"></param>
+    /// <returns></returns>
+    public virtual async Task HandleEventAsync(SfsAbortedEntityEventData<InjectionPlanRequest> eventData)
+    {
+        await Task.CompletedTask.ConfigureAwait(false);
+    }
+
+    /// <summary>
+    ///     完成后
+    /// </summary>
+    /// <param name="eventData"></param>
+    /// <returns></returns>
+    public virtual async Task HandleEventAsync(SfsCompletedEntityEventData<InjectionPlanRequest> eventData)
+    {
+        _ = eventData.Entity;
+        // await _injectionJobAppService.CompleteByInjectionPlanRequestAsync(entity.Number);
+
+        await Task.CompletedTask.ConfigureAwait(false);
+    }
+
+    #region 私有
+
+    #region 按箱叫料
+
+    /// <summary>
+    ///     创建注塑任务
+    /// </summary>
+    /// <param name="injectionRequest"></param>
+    /// <returns></returns>
+    /// <exception cref="UserFriendlyException"></exception>
+    private async Task<List<InjectionPlanJobEditInput>> CreateInjectionPlanJobWithBoxQtyTypeAsync
+        (InjectionPlanRequest injectionRequest)
+    {
+        var inputJobs = new List<InjectionPlanJobEditInput>();
+        var inputExpectOutEditInput = new ExpectOutEditInput();
+        //已用的库存的箱码集合
+        var useBalanceList = new List<string>();
+
+        var groupByItemCodeAndLocationCode =
+            injectionRequest.Details.GroupBy(p => new { p.ItemCode, p.ToLocationCode });
+
+        foreach (var locationCodeItemCodeGroup in groupByItemCodeAndLocationCode)
+        {
+            var inputDetails = injectionRequest.Details.Where(p =>
+                p.ItemCode == locationCodeItemCodeGroup.Key.ItemCode &&
+                p.ToLocationCode == locationCodeItemCodeGroup.Key.ToLocationCode);
+            var inputDetailTemplate = inputDetails.First();
+            //获取请求下 这个零件和这个库位一个需要多少箱
+            var sumBoxQty = inputDetails.Sum(p => p.BoxQty);
+            //获取生产线
+            var productionLineDto = await _productionLineAppService
+                .GetByLocationCodeAsync(inputDetails.First().ToLocationCode).ConfigureAwait(false);
+            if (productionLineDto == null)
+            {
+                throw new UserFriendlyException($"库位【{inputDetailTemplate.ToLocationCode}】没有对应的【生产线】");
+            }
+
+            var productLineCodeAndItemCode = await _productionLineItemAppService
+                .GetByProductLineCodeAndItemCodeAsync(productionLineDto.Code, inputDetailTemplate.ItemCode)
+                .ConfigureAwait(false);
+            if (productLineCodeAndItemCode == null)
+            {
+                throw new UserFriendlyException(
+                    $"物品代码【{inputDetailTemplate.ItemCode}】在生产线【{productionLineDto.Code}】中没有对应的【生产线物品关系】");
+            }
+
+            //获取可用库存
+            var input = new RecommendBalanceRequestInput
+            {
+                ItemCode = locationCodeItemCodeGroup.Key.ItemCode,
+                Qty = decimal.MaxValue,
+                Statuses = new EditableList<EnumInventoryStatus> { EnumInventoryStatus.OK },
+                Locations = JsonSerializer.Deserialize<List<string>>(productLineCodeAndItemCode
+                    .RawLocationCodeListJson)
+            };
+            var usableList = await _balanceAppService.GetUsableListAsync(input).ConfigureAwait(false);
+            usableList = usableList.Where(p => !useBalanceList.Contains(p.PackingCode) && p.Qty != 0).ToList();
+            if (usableList.Any())
+            {
+                for (var i = 0; i < sumBoxQty; i++)
+                {
+                    if (usableList.Any())
+                    {
+                        var firstUsable = usableList.First();
+                        useBalanceList.Add(firstUsable.PackingCode);
+                        usableList.Remove(firstUsable);
+
+                        var injectionJobEditInput =
+                            await BuildInjectionPlanJobCreateInputWithBoxQtyTypeAsync(injectionRequest,
+                                    inputDetailTemplate,
+                                    firstUsable)
+                                .ConfigureAwait(false);
+
+                        inputJobs.Add(injectionJobEditInput);
+                    }
+                }
+            }
+        }
+
+        return inputJobs;
+    }
+
+    /// <summary>
+    ///     构造注塑任务
+    /// </summary>
+    /// <param name="injectionRequest"></param>
+    /// <param name="injectionRequestDetail"></param>
+    /// <param name="balanceDtos"></param>
+    /// <returns></returns>
+    private async Task<InjectionPlanJobEditInput> BuildInjectionPlanJobCreateInputWithBoxQtyTypeAsync(
+        InjectionPlanRequest injectionRequest,
+        InjectionPlanRequestDetail injectionRequestDetail, BalanceDTO balanceDtos)
+    {
+        var job = ObjectMapper.Map<InjectionPlanRequest, InjectionPlanJobEditInput>(injectionRequest);
+        job.JobType = EnumJobType.IssueJob;
+        job.JobStatus = EnumJobStatus.Open;
+        job.WorkGroupCode = injectionRequestDetail.ToLocationGroup;
+        job.WarehouseCode = injectionRequestDetail.ToWarehouseCode;
+        job.Worker = injectionRequest.Worker;
+        job.InjectionPlanRequestNumber = injectionRequest.Number;
+
+        job.Details.Add(await BuildInjectionPlanJobDetailWithBoxQtyTypeAsync(injectionRequestDetail, balanceDtos)
+            .ConfigureAwait(false));
+
+        await Task.CompletedTask.ConfigureAwait(false);
+
+        return job;
+    }
+
+    /// <summary>
+    ///     构造注塑任务明细
+    /// </summary>
+    /// <param name="injectionRequestDetail"></param>
+    /// <param name="balance"></param>
+    /// <param name="toLocationGroupCode"></param>
+    /// <returns></returns>
+    private async Task<InjectionPlanJobDetailInput> BuildInjectionPlanJobDetailWithBoxQtyTypeAsync(
+        InjectionPlanRequestDetail injectionRequestDetail, BalanceDTO balance)
+    {
+        var detail = new InjectionPlanJobDetailInput();
+        detail.RequestLocationCode = injectionRequestDetail.ToLocationCode;
+        detail.RequestLocationGroup = injectionRequestDetail.ToLocationGroup;
+        detail.RequestLocationArea = injectionRequestDetail.ToLocationArea;
+        detail.RequestLocationErpCode = injectionRequestDetail.ToLocationErpCode;
+        detail.RequestWarehouseCode = injectionRequestDetail.ToWarehouseCode;
+
+        detail.PositionCode = injectionRequestDetail.PositionCode;
+        detail.RecommendType = injectionRequestDetail.RecommendType;
+        detail.ProdLine = injectionRequestDetail.ToLocationCode;
+
+        detail.ItemCode = injectionRequestDetail.ItemCode;
+        detail.ItemName = injectionRequestDetail.ItemName;
+        detail.ItemDesc1 = injectionRequestDetail.ItemDesc1;
+        detail.ItemDesc2 = injectionRequestDetail.ItemDesc2;
+        detail.StdPackQty = injectionRequestDetail.StdPackQty;
+
+        detail.Status = EnumInventoryStatus.OK;
+        detail.Uom = balance.Uom;
+
+        detail.RecommendFromPackingCode = balance.PackingCode;
+        detail.RecommendFromContainerCode = balance.ContainerCode;
+        detail.RecommendFromLot = balance.Lot;
+
+        detail.RecommendFromQty = balance.Qty;
+
+        detail.RecommendFromSupplierBatch = balance.SupplierBatch;
+        detail.RecommendFromProduceDate = balance.ProduceDate;
+        detail.RecommendFromExpireDate = balance.ExpireDate;
+        detail.RecommendFromProduceDate = balance.ProduceDate;
+        detail.RecommendFromArriveDate = balance.ArriveDate;
+
+        detail.RecommendFromLocationArea = balance.LocationArea;
+        detail.RecommendFromLocationCode = balance.LocationCode;
+        detail.RecommendFromLocationErpCode = balance.LocationErpCode;
+        detail.RecommendFromLocationGroup = balance.LocationGroup;
+        detail.RecommendFromWarehouseCode = balance.WarehouseCode;
+
+        detail.RecommendToPackingCode = balance.PackingCode;
+        detail.RecommendToContainerCode = balance.ContainerCode;
+        detail.RecommendToLot = balance.Lot;
+
+        detail.RecommendToQty = balance.Qty;
+
+        detail.RecommendToSupplierBatch = balance.SupplierBatch;
+        detail.RecommendToProduceDate = balance.ProduceDate;
+        detail.RecommendToExpireDate = balance.ExpireDate;
+        detail.RecommendToProduceDate = balance.ProduceDate;
+        detail.RecommendToArriveDate = balance.ArriveDate;
+
+        detail.RecommendToLocationCode = injectionRequestDetail.ToLocationCode;
+        detail.RecommendToLocationErpCode = injectionRequestDetail.ToLocationErpCode;
+        detail.RecommendToLocationArea = injectionRequestDetail.ToLocationArea;
+        detail.RecommendToWarehouseCode = injectionRequestDetail.ToWarehouseCode;
+        detail.RecommendToLocationGroup = injectionRequestDetail.ToLocationGroup;
+
+        await Task.CompletedTask.ConfigureAwait(false);
+        return detail;
+    }
+
+    #endregion
+
+    #endregion
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/InjectionPlanNoteEventHandler.cs

@@ -0,0 +1,88 @@
+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.Shared.Domain.Shared;
+using Win_in.Sfs.Shared.Event;
+using Win_in.Sfs.Wms.Inventory.Application.Contracts;
+using Win_in.Sfs.Wms.Store.Domain;
+using Win_in.Sfs.Wms.Store.Event.Transaction;
+
+namespace Win_in.Sfs.Wms.Store.Event.Transactions;
+
+public class InjectionPlanNoteEventHandler
+    : StoreInventoryEventHandlerBase
+        , ILocalEventHandler<SfsCreatedEntityEventData<InjectionPlanNote>>
+        , ILocalEventHandler<SfsCreatedEntityEventData<List<InjectionPlanNote>>>
+        , ILocalEventHandler<SfsConfirmedEntityEventData<InjectionPlanNote>>
+{
+    private const EnumTransType TransType = EnumTransType.Issue;
+
+    [UnitOfWork]
+    public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<InjectionPlanNote> eventData)
+    {
+        var entity = eventData.Entity;
+        var transferLogs = new List<TransferLogEditInput>();
+        var route = entity.UseOnTheWayLocation
+            ? EnumTransferRoute.SourceToOnTheWay
+            : EnumTransferRoute.SourceToDestination;
+        transferLogs.AddRange(await BuildTransferLogsAsync(entity).ConfigureAwait(false));
+
+        await TransferLogAppService.AddManyAsync(transferLogs).ConfigureAwait(false);
+    }
+
+    [UnitOfWork]
+    public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<List<InjectionPlanNote>> eventData)
+    {
+        var entities = eventData.Entity;
+        var transferLogs = new List<TransferLogEditInput>();
+        //如果要做库存事务汇总，可以修改此处
+        foreach (var issueNote in entities)
+        {
+            transferLogs.AddRange(await BuildTransferLogsAsync(issueNote).ConfigureAwait(false));
+        }
+
+        await TransferLogAppService.AddManyAsync(transferLogs).ConfigureAwait(false);
+    }
+
+    [UnitOfWork]
+    public virtual async Task HandleEventAsync(SfsConfirmedEntityEventData<InjectionPlanNote> eventData)
+    {
+        var entity = eventData.Entity;
+
+        var inputList = await BuildTransferLogsAsync(entity)
+            .ConfigureAwait(false);
+        await AddTransferLogsAsync(inputList).ConfigureAwait(false);
+    }
+
+    private async Task AddTransferLogsAsync(List<TransferLogEditInput> inputList)
+    {
+        var transferLogs = new List<TransferLogEditInput>();
+
+        transferLogs.AddRange(inputList);
+
+        await TransferLogAppService.AddManyAsync(transferLogs).ConfigureAwait(false);
+    }
+
+    private async Task<List<TransferLogEditInput>> BuildTransferLogsAsync(InjectionPlanNote issueNote)
+    {
+        var transferLogs = new List<TransferLogEditInput>();
+        foreach (var detail in issueNote.Details.Where(detail => detail.HandledToQty != 0))
+        {
+            var transferLog = ObjectMapper.Map<InjectionPlanNoteDetail, TransferLogEditInput>(detail);
+
+            transferLog.TransSubType = EnumTransSubType.Issue_WIP;
+            transferLog.TransType = TransType;
+            transferLog.DocNumber = issueNote.Number;
+            transferLog.JobNumber = issueNote.JobNumber;
+
+            transferLogs.Add(transferLog);
+        }
+
+        await Task.CompletedTask.ConfigureAwait(false);
+
+        return transferLogs;
+    }
+}