修改 注塑发料

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

@@ -30,13 +30,6 @@ public class InjectionJobDTO : SfsJobDTOBase<InjectionJobDetailDTO>
     [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public string InjectionRequestNumber { get; set; }
 
-    /// <summary>
-    /// 车间
-    /// </summary>
-    //[Display(Name = "车间")]
-    //[StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
-    //public string Workshop { get; set; }
-
     /// <summary>
     ///     使用在途库
     /// </summary>

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

@@ -1,112 +1,519 @@
 using System;
 using System.ComponentModel.DataAnnotations;
-using Win_in.Sfs.Shared.Domain;
+using System.ComponentModel.DataAnnotations.Schema;
+using Win_in.Sfs.Shared.Application.Contracts;
 using Win_in.Sfs.Shared.Domain.Shared;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
-public class InjectionJobDetailDTO : SfsJobRecommendFromDetailDTOBase, IHasToLocation
+public class InjectionJobDetailDTO : SfsDetailDTOBase
 {
+    #region 库存基础信息
 
     /// <summary>
-    /// 请求库位
+    ///     物品代码
     /// </summary>
-    [Display(Name = "请求库位")]
+    public string ItemCode { get; set; }
-    public string RequestLocationCode { 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>
-    [Display(Name = "到库位")]
+    public string RequestLocationCode { get; set; }
-    public string ToLocationCode { get; set; }
 
     /// <summary>
     ///     到库区
     /// </summary>
-    [Display(Name = "到库区")]
+    public string RequestLocationArea { get; set; }
-    public string ToLocationArea { get; set; }
 
     /// <summary>
     ///     到库位组
     /// </summary>
-    [Display(Name = "到库位组")]
+    public string RequestLocationGroup { get; set; }
-    public string ToLocationGroup { get; set; }
 
     /// <summary>
     ///     到ERP库位
     /// </summary>
-    [Display(Name = "到ERP库位")]
+    public string RequestLocationErpCode { get; set; }
-    public string ToLocationErpCode { get; set; }
 
     /// <summary>
     ///     到仓库
     /// </summary>
-    [Display(Name = "到仓库")]
+    public string RequestWarehouseCode { get; set; }
-    public string ToWarehouseCode { get; set; }
 
     /// <summary>
     ///     在途库库位
     /// </summary>
-    [Display(Name = "在途库库位")]
     public string OnTheWayLocationCode { get; set; }
 
     /// <summary>
     ///     生产线
     /// </summary>
-    [Display(Name = "生产线")]
     public string ProdLine { get; set; }
 
     /// <summary>
-    /// 工作中心
+    ///     位置码
+    /// </summary>
+    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>
-    [Display(Name = "工作中心")]
+    public string RecommendFromLocationCode { get; set; }
-    public string WorkStation { get; set; }
 
     /// <summary>
-    /// 过期时间
+    ///     推荐来源库区
     /// </summary>
-    [Display(Name = "过期时间")]
+    public string RecommendFromLocationArea { get; set; }
-    public DateTime ExpiredTime { get; set; }
 
     /// <summary>
-    /// 工序
+    ///     推荐来源库位组
     /// </summary>
-    [Display(Name = "工序")]
+    public string RecommendFromLocationGroup { get; set; }
-    public string Operation { get; set; }
 
     /// <summary>
-    /// 配送方式
+    ///     推荐来源ERP库位
     /// </summary>
-    [Display(Name = "配送方式")]
+    public string RecommendFromLocationErpCode { get; set; }
-    public EnumDistributionType DistributionType { get; set; }
+
+    /// <summary>
+    ///     推荐来源仓库
+    /// </summary>
+    public string RecommendFromWarehouseCode { get; set; }
+
+    /// <summary>
+    ///     推荐来源数量
+    /// </summary>
+    public decimal RecommendFromQty { get; set; }
+
+    #endregion
+
+    #region 推荐目标
 
     /// <summary>
-    /// 取整方式
+    ///     推荐目标托标签
     /// </summary>
-    [Display(Name = "取整方式")]
+    public string RecommendToContainerCode { get; set; }
-    public EnumTruncType TruncType { get; set; }
 
     /// <summary>
-    /// 取整后数量
+    ///     推荐目标箱标签
     /// </summary>
-    [Display(Name = "取整后数量")]
+    public string RecommendToPackingCode { get; set; }
-    public decimal RoundedQty { get; set; }
 
     /// <summary>
-    /// 计划拆分规则
+    ///     推荐目标批次供应商批次
     /// </summary>
-    [Display(Name = "计划拆分规则")]
+    public string RecommendToSupplierBatch { get; set; }
-    public EnumPlannedSplitRule PlannedSplitRule { get; set; }
 
     /// <summary>
-    /// 计划开始时间
+    ///     推荐目标批次到货时间
     /// </summary>
-    [Display(Name = "计划开始时间")]
+    public DateTime RecommendToArriveDate { get; set; }
-    public DateTime PlanBeginTime { get; set; }
 
     /// <summary>
-    /// 每次配送数量
+    ///     推荐目标批次生产时间
     /// </summary>
-    [Display(Name = "每次配送数量")]
+    public DateTime RecommendToProduceDate { get; set; }
-    public decimal DeliveryQty { 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/IssueJobs/InjectionJobs/IInjectionJobAppService.cs

@@ -8,18 +8,7 @@ namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 public interface IInjectionJobAppService
     : ISfsJobAppServiceBase<InjectionJobDTO, SfsJobRequestInputBase, InjectionJobCheckInput, InjectionJobEditInput>
 {
-    Task<List<InjectionJobDTO>> CheckJobExistByItemCodeAndLocationCodeAsync(string itemCode, string locationCode);
-
     Task CancelByMaterialRequestAsync(string injectionNumber);
 
-    Task<PagedResultDto<InjectionJobDTO>> GetListByTypeAsync(SfsJobRequestInputBase requestInput, string requestType,
-        bool includeDetails = false, CancellationToken cancellationToken = default);
-
     Task<List<InjectionJobDTO>> GetByRequestNumberAsync(string requestNumber);
-
-    /// <summary>
-    /// 保存拆箱时涉及的明细修改
-    /// </summary>
-    /// <returns></returns>
-    Task<InjectionJobDTO> SaveDetail_SplitPackingAsync(SplitPacking_UpdateJobDetailInput input);
 }

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

@@ -1,134 +1,519 @@
 using System;
 using System.ComponentModel.DataAnnotations;
-using Win_in.Sfs.Shared.Domain;
+using System.ComponentModel.DataAnnotations.Schema;
+using Win_in.Sfs.Shared.Application.Contracts;
 using Win_in.Sfs.Shared.Domain.Shared;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
-public class InjectionJobDetailInput : SfsJobRecommendFromDetailInputBase, IHasToLocation
+public class InjectionJobDetailInput : SfsDetailInputBase
 {
+    #region 库存基础信息
 
     /// <summary>
-    /// 请求库位
+    ///     物品代码
     /// </summary>
-    [Display(Name = "请求库位")]
+    public string ItemCode { get; set; }
-    [Required(ErrorMessage = "{0}是必填项")]
+
-    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    /// <summary>
-    public string RequestLocationCode { get; set; }
+    ///     物品名称
+    /// </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>
-    [Display(Name = "到库位")]
+    public string RequestLocationCode { get; set; }
-    [Required(ErrorMessage = "{0}是必填项")]
-    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
-    public string ToLocationCode { get; set; }
 
     /// <summary>
     ///     到库区
     /// </summary>
-    [Display(Name = "到库区")]
+    public string RequestLocationArea { get; set; }
-    public string ToLocationArea { get; set; }
 
     /// <summary>
     ///     到库位组
     /// </summary>
-    [Display(Name = "到库位组")]
+    public string RequestLocationGroup { get; set; }
-    public string ToLocationGroup { get; set; }
 
     /// <summary>
     ///     到ERP库位
     /// </summary>
-    [Display(Name = "到ERP库位")]
+    public string RequestLocationErpCode { get; set; }
-    [Required(ErrorMessage = "{0}是必填项")]
-    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
-    public string ToLocationErpCode { get; set; }
 
     /// <summary>
     ///     到仓库
     /// </summary>
-    [Display(Name = "到仓库")]
+    public string RequestWarehouseCode { get; set; }
-    [Required(ErrorMessage = "{0}是必填项")]
-    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
-    public string ToWarehouseCode { get; set; }
 
     /// <summary>
     ///     在途库库位
     /// </summary>
-    [Display(Name = "在途库库位")]
     public string OnTheWayLocationCode { get; set; }
 
     /// <summary>
     ///     生产线
     /// </summary>
-    [Display(Name = "生产线")]
-    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public string ProdLine { get; set; }
 
     /// <summary>
-    /// 工作中心
+    ///     位置码
     /// </summary>
-    [Display(Name = "工作中心")]
+    public string PositionCode { get; set; }
-    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
-    public string WorkStation { get; set; }
 
     /// <summary>
-    /// 过期时间
+    ///     推荐的类型
     /// </summary>
-    [Display(Name = "过期时间")]
+    public EnumRecommendType RecommendType { get; set; }
-    [Required(ErrorMessage = "{0}是必填项")]
-    public DateTime ExpiredTime { get; set; }
 
     /// <summary>
-    /// 工序
+    ///     需求数量
     /// </summary>
-    [Display(Name = "工序")]
+    public decimal RequestQty { get; set; }
-    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+
-    public string Operation { get; set; }
+    #endregion
+
+    #region 推荐来源
 
     /// <summary>
-    /// 配送方式
+    ///     推荐来源托标签
     /// </summary>
-    [Display(Name = "配送方式")]
+    public string RecommendFromContainerCode { get; set; }
-    public EnumDistributionType DistributionType { get; set; }
 
     /// <summary>
-    /// 取整方式
+    ///     推荐来源箱标签
     /// </summary>
-    [Display(Name = "取整方式")]
+    public string RecommendFromPackingCode { get; set; }
-    public EnumTruncType TruncType { get; set; }
 
     /// <summary>
-    /// 取整后数量
+    ///     推荐来源批次供应商批次
     /// </summary>
-    [Display(Name = "取整后数量")]
+    public string RecommendFromSupplierBatch { get; set; }
-    public decimal RoundedQty { get; set; }
 
     /// <summary>
-    /// 计划拆分规则
+    ///     推荐来源批次到货时间
     /// </summary>
-    [Display(Name = "计划拆分规则")]
+    public DateTime RecommendFromArriveDate { get; set; }
-    public EnumPlannedSplitRule PlannedSplitRule { get; set; }
 
     /// <summary>
-    /// 计划开始时间
+    ///     推荐来源批次生产时间
     /// </summary>
-    [Display(Name = "计划开始时间")]
+    public DateTime RecommendFromProduceDate { get; set; }
-    public DateTime PlanBeginTime { get; set; }
 
     /// <summary>
-    /// 每次配送数量
+    ///     推荐来源批次过期时间
     /// </summary>
-    [Display(Name = "每次配送数量")]
+    public DateTime RecommendFromExpireDate { get; set; }
-    public decimal DeliveryQty { get; set; }
 
     /// <summary>
-    /// 位置码
+    ///     推荐来源批次排序
     /// </summary>
-    public string PositionCode { get; set; }
+    public string RecommendFromLot { get; set; }
 
     /// <summary>
-    /// 推荐类型
+    ///     推荐来源库位
     /// </summary>
-    public EnumRecommendType RecommendType { get; set; }
+    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/IssueJobs/InjectionJobs/Inputs/InjectionJobEditInput.cs

@@ -60,13 +60,6 @@ public class InjectionJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobCreateI
     [Required(ErrorMessage = "{0}是必填项")]
     public List<InjectionJobDetailInput> Details { get; set; } = new();
 
-    /// <summary>
-    /// 车间
-    /// </summary>
-    //[Display(Name = "车间")]
-    //[StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
-    //public string Workshop { get; set; }
-
     /// <summary>
     /// 生产线
     /// </summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionNotes/DTOs/InjectionNoteDTO.cs

@@ -13,13 +13,6 @@ public class InjectionNoteDTO : SfsStoreDTOBase<InjectionNoteDetailDTO>, IHasJob
     [Display(Name = "任务ID")]
     public string JobNumber { get; set; }
 
-    /// <summary>
-    /// 车间
-    /// </summary>
-    [Display(Name = "车间")]
-    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
-    public string Workshop { get; set; }
-
     /// <summary>
     /// 请求代码
     /// </summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionNotes/DTOs/InjectionNoteDetailDTO.cs

@@ -1,42 +1,519 @@
 using System;
 using System.ComponentModel.DataAnnotations;
-using Win_in.Sfs.Shared.Domain;
+using System.ComponentModel.DataAnnotations.Schema;
+using Win_in.Sfs.Shared.Application.Contracts;
+using Win_in.Sfs.Shared.Domain.Shared;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
-public class InjectionNoteDetailDTO : SfsStoreRecommendFromDetailWithFromToDTOBase
+public class InjectionNoteDetailDTO : SfsDetailDTOBase
 {
+    #region 库存基础信息
 
     /// <summary>
-    /// 发料时间
+    ///     物品代码
     /// </summary>
-    [Display(Name = "发料时间")]
+    public string ItemCode { get; set; }
-    public DateTime IssueTime { get; set; }
 
     /// <summary>
-    /// 过期时间
+    ///     物品名称
     /// </summary>
-    [Display(Name = "过期时间")]
+    public string ItemName { get; set; }
-    public DateTime ExpiredTime { get; set; }
 
     /// <summary>
-    /// 生产线
+    ///     物品描述1
     /// </summary>
-    [Display(Name = "生产线")]
+    public string ItemDesc1 { get; set; }
-    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+
-    public string ProdLine { 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>
-    [Display(Name = "工作中心")]
+    public string RequestWarehouseCode { get; set; }
-    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
-    public string WorkStation { get; set; }
 
     /// <summary>
     ///     在途库库位
     /// </summary>
-    [Display(Name = "在途库库位")]
     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/IssueNotes/InjectionNotes/Inputs/InjectionNoteDetailInput.cs

@@ -1,53 +1,519 @@
 using System;
 using System.ComponentModel.DataAnnotations;
-using Win_in.Sfs.Shared.Domain;
+using System.ComponentModel.DataAnnotations.Schema;
+using Win_in.Sfs.Shared.Application.Contracts;
 using Win_in.Sfs.Shared.Domain.Shared;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
-public class InjectionNoteDetailInput : SfsStoreRecommendFromDetailWithFromToInputBase
+public class InjectionNoteDetailInput : SfsDetailInputBase
 {
+    #region 库存基础信息
 
     /// <summary>
-    /// 发料时间
+    ///     物品代码
     /// </summary>
-    [Display(Name = "发料时间")]
+    public string ItemCode { get; set; }
-    public DateTime IssueTime { get; set; }
 
     /// <summary>
-    /// 过期时间
+    ///     物品名称
     /// </summary>
-    [Display(Name = "过期时间")]
+    public string ItemName { get; set; }
-    public DateTime ExpiredTime { get; set; }
 
     /// <summary>
-    /// 生产线
+    ///     物品描述1
     /// </summary>
-    [Display(Name = "生产线")]
+    public string ItemDesc1 { get; set; }
-    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+
-    public string ProdLine { 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>
-    [Display(Name = "工作中心")]
+    public string RequestWarehouseCode { get; set; }
-    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
-    public string WorkStation { get; set; }
 
     /// <summary>
     ///     在途库库位
     /// </summary>
-    [Display(Name = "在途库库位")]
     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/IssueNotes/InjectionNotes/Inputs/InjectionNoteEditInput.cs

@@ -28,13 +28,6 @@ public class InjectionNoteEditInput : SfsStoreCreateOrUpdateInputBase
     [Required(ErrorMessage = "{0}是必填项")]
     public string JobNumber { get; set; }
 
-    /// <summary>
-    /// 车间
-    /// </summary>
-    [Display(Name = "车间")]
-    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
-    public string Workshop { get; set; }
-
     /// <summary>
     /// 明细列表
     /// </summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionRequests/Inputs/InjectionRequestDetailInput.cs

@@ -49,19 +49,6 @@ public class InjectionRequestDetailInput : SfsStoreDetailWithQtyInputBase
     [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public string ProdLine { get; set; }
 
-    /// <summary>
-    /// 工作中心
-    /// </summary>
-    [Display(Name = "工作中心")]
-    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
-    public string WorkStation { get; set; }
-
-    /// <summary>
-    /// 过期时间
-    /// </summary>
-    [Display(Name = "过期时间")]
-    public DateTime ExpiredTime { get; set; }
-
     /// <summary>
     /// 状态
     /// </summary>

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

@@ -1,14 +1,16 @@
 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 Volo.Abp.ObjectMapping;
+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;
@@ -22,53 +24,65 @@ namespace Win_in.Sfs.Wms.Store.Application;
 [Authorize]
 [Route($"{StoreConsts.RootPath}injection-job")]
 public class InjectionJobAppService
-    : SfsJobAppServiceBase<InjectionJob, InjectionJobDetail, InjectionJobDTO, SfsJobRequestInputBase, InjectionJobCheckInput, InjectionJobEditInput>,
+    : SfsJobAppServiceBase<InjectionJob, InjectionJobDetail, InjectionJobDTO, SfsJobRequestInputBase,
+            InjectionJobCheckInput, InjectionJobEditInput>,
         IInjectionJobAppService, ITransferLibCallback
 {
     private readonly IInjectionJobManager _injectionJobManager;
+    private readonly ILocationAppService _locationAppService;
 
     public InjectionJobAppService(
-        IInjectionJobRepository repository, IInjectionJobManager injectionJobManager
+        IInjectionJobRepository repository, IInjectionJobManager injectionJobManager,
-        ) : base(repository, injectionJobManager)
+        ILocationAppService locationAppService) : base(repository, injectionJobManager)
     {
         _injectionJobManager = injectionJobManager;
+        _locationAppService = locationAppService;
     }
 
-    public override Task<List<InjectionJobDTO>> CreateManyAsync(List<InjectionJobEditInput> inputs)
+    public override async Task<List<InjectionJobDTO>> CreateManyAsync(List<InjectionJobEditInput> inputs)
     {
-        return base.CreateManyAsync(inputs);
+        foreach (var input in inputs)
+        {
+            await CheckMinRowAndSetStatusAsync(input).ConfigureAwait(false);
+        }
+
+        return await base.CreateManyAsync(inputs).ConfigureAwait(false);
     }
 
-    public override Task<InjectionJobDTO> CreateAsync(InjectionJobEditInput input)
+    public override async Task<InjectionJobDTO> CreateAsync(InjectionJobEditInput input)
     {
-        return base.CreateAsync(input);
+        await CheckMinRowAndSetStatusAsync(input).ConfigureAwait(false);
+
+        return await base.CreateAsync(input).ConfigureAwait(false);
     }
 
     /// <summary>
-    /// 根据物品和库位 检查是否存在发料任务
+    ///     判断是不是在最底层 如果不是则把状态变更为等待
     /// </summary>
-    /// <param name="itemCode"></param>
+    /// <param name="input"></param>
-    /// <param name="locationCode"></param>
     /// <returns></returns>
-    /// <exception cref="NotImplementedException"></exception>
+    private async Task CheckMinRowAndSetStatusAsync                                  (InjectionJobEditInput input)
-    [Authorize]
+    {
-    [HttpGet("check-job-exist")]
+        var detail = input.Details.FirstOrDefault();
-    public virtual async Task<List<InjectionJobDTO>> CheckJobExistByItemCodeAndLocationCodeAsync(string itemCode,
+
-        string locationCode)
+        var loctionDto = await _locationAppService.GetByCodeAsync(detail.RecommendFromLocationCode)
+            .ConfigureAwait(false);
+        
+        if (loctionDto.RowCode != 1)
         {
-        var entities = await _repository.GetListAsync(c =>
+            input.JobStatus = EnumJobStatus.Wait;
-            c.Details.Any(p =>
+
-                (p.ItemCode == itemCode && p.RecommendFromLocationCode == locationCode) ||
+            var locationDtos = await _locationAppService.GetListByGroupsAsync(new List<string>() { loctionDto.LocationGroupCode }).ConfigureAwait(false);
-                (p.ItemCode == itemCode && p.ToLocationCode == locationCode))
+            var minLocation = locationDtos.First(p => p.ColumnCode == 1);
-            && (c.JobStatus == EnumJobStatus.Open || c.JobStatus == EnumJobStatus.Doing), true).ConfigureAwait(false);
+            detail.OnTheWayLocationCode = minLocation.Code;
-        var dtos = ObjectMapper.Map<List<InjectionJob>, List<InjectionJobDTO>>(entities);
+        }
-        return dtos;
     }
 
     [HttpPost("cancel-by-request/{injectionNumber}")]
     public virtual async Task CancelByMaterialRequestAsync(string injectionNumber)
     {
-        var entities = await _repository.GetListAsync(p => p.InjectionRequestNumber == injectionNumber).ConfigureAwait(false);
+        var entities = await _repository.GetListAsync(p => p.InjectionRequestNumber == injectionNumber)
+            .ConfigureAwait(false);
         foreach (var entity in entities)
         {
             await _injectionJobManager.CancelAsync(entity).ConfigureAwait(false);
@@ -85,78 +99,23 @@ public class InjectionJobAppService
         }
 
         await _injectionJobManager.CancelAsync(injectionJob).ConfigureAwait(false);
-
-    }
-
-    /// <summary>
-    /// 根据叫料请求类型获取发料任务
-    /// </summary>
-    /// <param name="requestInput"></param>
-    /// <param name="requestType">
-    ///     叫料请求类型:
-    ///     人工拉动:Issue_Manual;
-    ///     线边拉动:Issue_WIP;
-    /// </param>
-    /// <param name="includeDetails"></param>
-    /// <param name="cancellationToken"></param>
-    /// <returns></returns>
-    [HttpPost("by-type/{requestType}")]
-    public virtual async Task<PagedResultDto<InjectionJobDTO>> GetListByTypeAsync(SfsJobRequestInputBase requestInput,
-        string requestType, bool includeDetails = false, CancellationToken cancellationToken = default)
-    {
-        Expression<Func<InjectionJob, bool>> expression = p => p.RequestType == requestType;
-        if (requestInput.Condition.Filters?.Count > 0)
-        {
-            expression = expression.And(requestInput.Condition.Filters.ToLambda<InjectionJob>());
-        }
-
-        return await GetPagedListAsync(expression, requestInput.SkipCount, requestInput.MaxResultCount,
-            requestInput.Sorting, includeDetails, cancellationToken).ConfigureAwait(false);
-
     }
 
     [HttpPost("by-request-number/{requestNumber}")]
     public virtual async Task<List<InjectionJobDTO>> GetByRequestNumberAsync(string requestNumber)
     {
-        var entitys = await _repository.GetListAsync(p => p.InjectionRequestNumber == requestNumber).ConfigureAwait(false);
+        var entitys = await _repository.GetListAsync(p => p.InjectionRequestNumber == requestNumber)
+            .ConfigureAwait(false);
         return ObjectMapper.Map<List<InjectionJob>, List<InjectionJobDTO>>(entitys);
     }
 
-    /// <summary>
-    /// 保存拆箱时涉及的明细修改
-    /// </summary>
-    /// <returns></returns>
-    [HttpPost("save-detail-split-packing")]
-    public virtual async Task<InjectionJobDTO> SaveDetail_SplitPackingAsync(SplitPacking_UpdateJobDetailInput input)
-    {
-        var job = await _repository.FindAsync(p => p.Number == input.Number).ConfigureAwait(false);
-        InjectionJobDetail detail = job.Details.FirstOrDefault(p => p.RecommendPackingCode == input.FromPackingCode ); /*&& p.HandledQty == input.FromQty*/
-        if (detail == null)
-        {
-            //throw new UserFriendlyException($"根据HandledPackingCode={input.FromPackingCode}取InjectionJobDetail表为空！");
-            throw new UserFriendlyException($"根据RecommendPackingCode={input.FromPackingCode}取InjectionJobDetail表为空！");
-        }
-        //插入目标箱
-        var newDetail = CommonHelper.CloneObj(detail);
-        newDetail.SetId(GuidGenerator.Create());
-        newDetail.RecommendPackingCode = input.ToPackingCode;
-        newDetail.RecommendQty = input.ToQty;
-        newDetail.HandledPackingCode = detail.HandledPackingCode.HasValue() ? input.ToPackingCode : null; //源实际实际箱码有值，则新记录实际箱码有值
-        newDetail.HandledQty = detail.HandledQty > 0 ? input.ToQty : 0;
-        //newDetail.CreationTime = CommonHelper.CurTime;
-        job.Details.Add(newDetail);
-        //修改源箱
-        detail.RecommendQty = input.FromQty - input.ToQty;
-        detail.HandledQty = detail.HandledQty > 0 ? input.FromQty - input.ToQty : 0;
-        var entity = await _repository.UpdateAsync(job).ConfigureAwait(false);
-        var ret = ObjectMapper.Map<InjectionJob, InjectionJobDTO>(entity);
-        return ret;
-    }
-
     [HttpPost("Do-Call-Back")]
-    public Tuple<bool?, string> DoTransferLibCallback(string businessType, string requestNum, string jobNum)
+    public async Task<Tuple<bool?, string>> DoTransferLibCallbackAsync(string businessType, string requestNum, string jobNum)
     {
-        throw new NotImplementedException();
+        var job= await _repository.FindAsync(p=>p.Number==jobNum).ConfigureAwait(false);
+        job.JobStatus = EnumJobStatus.Open;
+        await _repository.UpdateAsync(job).ConfigureAwait(false);
+        return Tuple.Create<bool?, string>(true,string.Empty);
     }
 
     [HttpPost("test")]

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/TransferLibJobs/TransferLibJobAppService.cs

@@ -78,7 +78,7 @@ public class TransferLibJobAppService
             {
                 throw new UserFriendlyException($"{methodPrefix}类型为{dto.CallServerName}的对象没有实现ITransferLibCallback接口");
             }
-            Tuple<bool?, string> callbackRet = transferLibCallback.DoTransferLibCallback(dto.CallServerName, dto.CallRequestNumber, dto.CallJobNumber);
+            Tuple<bool?, string> callbackRet = await transferLibCallback.DoTransferLibCallbackAsync(dto.CallServerName, dto.CallRequestNumber, dto.CallJobNumber);
             if (callbackRet != null && callbackRet.Item1 == false)
             {
                 throw new UserFriendlyException($"{methodPrefix}执行回调服务{dto.CallServerName}出错，返回错误信息：{callbackRet.Item2}");

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferLibNotes/ITransferLibCallback.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 namespace Win_in.Sfs.Wms.Store.Notes;
 public interface ITransferLibCallback
 {
-    Tuple<bool?, string> DoTransferLibCallback(string businessType, string requestNum, string jobNum);
+    Task<Tuple<bool?, string>> DoTransferLibCallbackAsync(string businessType, string requestNum, string jobNum);
 }
 
 public class TestTransferLibCallback : ITransferLibCallback
@@ -16,7 +16,7 @@ public class TestTransferLibCallback : ITransferLibCallback
     {
 
     }
-    public Tuple<bool?, string> DoTransferLibCallback(string businessType, string requestNum, string jobNum)
+    public async Task<Tuple<bool?, string>> DoTransferLibCallbackAsync(string businessType, string requestNum, string jobNum)
     {
         return Tuple.Create<bool?, string>(true, "调用新移库回调方法成功！");
 

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/InjectionRequests/InjectionRequestAutoMapperProfile.cs

@@ -47,8 +47,6 @@ public partial class StoreApplicationAutoMapperProfile : Profile
             .Ignore(x => x.ToLocationGroup)
             .Ignore(x => x.ItemName).Ignore(x => x.ItemDesc1).Ignore(x => x.ItemDesc2)
             .Ignore(x => x.ProdLine)
-            .Ignore(x => x.WorkStation)
-            .Ignore(x => x.ExpiredTime)
             .Ignore(x => x.IssuedQty)
             .Ignore(x => x.ReceivedQty)
             .Ignore(x => x.ToBeIssuedQty)

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/TransferLibRequests/TransferLibRequestAppService.cs

@@ -319,14 +319,14 @@ public class TransferLibRequestAppService : SfsStoreRequestAppServiceBase
         var entity = ObjectMapper.Map<TransferLibRequestEditInput, TransferLibRequest>(input);
 
         var subType = Enum.Parse<EnumTransSubType>(input.Type);
-        var tranType = await TransactionTypeAclService.GetByTransTypeAsync(EnumTransType.TransferLib, subType)
+        //var tranType = await TransactionTypeAclService.GetByTransTypeAsync(EnumTransType.TransferLib, subType)
-            .ConfigureAwait(false);
+        //    .ConfigureAwait(false);
-        entity.Type = ((int)subType).ToString();
+        //entity.Type = ((int)subType).ToString();
-        entity.AutoCompleteJob = tranType.AutoCompleteJob;
+        //entity.AutoCompleteJob = tranType.AutoCompleteJob;
-        entity.AutoSubmit = tranType.AutoSubmitRequest;
+        //entity.AutoSubmit = tranType.AutoSubmitRequest;
-        entity.AutoAgree = tranType.AutoAgreeRequest;
+        //entity.AutoAgree = tranType.AutoAgreeRequest;
-        entity.AutoHandle = tranType.AutoHandleRequest;
+        //entity.AutoHandle = tranType.AutoHandleRequest;
-        entity.DirectCreateNote = tranType.DirectCreateNote;
+        //entity.DirectCreateNote = tranType.DirectCreateNote;
 
         await _transferLibRequestManager.CreateAsync(entity).ConfigureAwait(false);
 

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/InjectionJobs/InjectionJob.cs

@@ -25,17 +25,11 @@ public class InjectionJob : SfsJobAggregateRootBase<InjectionJobDetail>
     public string ProdLine { get; set; }
 
     /// <summary>
-    /// 要货单号
+    /// 注塑要料单号
     /// </summary>
     [IgnoreUpdate]
     public string InjectionRequestNumber { get; set; }
 
-    /// <summary>
-    /// 车间
-    /// </summary>
-    [IgnoreUpdate]
-    public string Workshop { get; set; }
-
     /// <summary>
     /// 使用在途库
     /// </summary>
@@ -49,36 +43,5 @@ public class InjectionJob : SfsJobAggregateRootBase<InjectionJobDetail>
     [IgnoreUpdate]
     public override List<InjectionJobDetail> Details { get; set; } = new List<InjectionJobDetail>();
 
-    /// <summary>
-    /// 设置任务明细的实际库位和实际数量
-    /// </summary>
-    /// <param name="id"></param>
-    /// <param name="handledLocationCode"></param>
-    /// <param name="handledLocationErpCode"></param>
-    /// <param name="handledWarehouseCode"></param>
-    /// <param name="handledQty"></param>
-    /// <param name="handledBatch"></param>
-    /// <param name="handledContainerCode"></param>
-    /// <param name="handledLot"></param>
-    /// <param name="handledPackingCode"></param>
-    /// <returns></returns>
-    public virtual async Task BuildDetail(Guid id, string handledLocationCode, string handledLocationErpCode,
-        string handledWarehouseCode, decimal handledQty, string handledSupplierBatch, DateTime handledArriveDate, DateTime handledProduceDate, DateTime handledExpireDate,
-        string handledContainerCode, string handledLot, string handledPackingCode)
-    {
-        var detail = GetDetail(id);
-        detail.HandledFromLocationCode = handledLocationCode;
-        detail.HandledFromLocationErpCode = handledLocationErpCode;
-        detail.HandledFromWarehouseCode = handledWarehouseCode;
-        detail.HandledQty = handledQty;
-        detail.HandledSupplierBatch = handledSupplierBatch;
-        detail.HandledArriveDate = handledArriveDate;
-        detail.HandledProduceDate = handledProduceDate;
-        detail.HandledExpireDate = handledExpireDate;
-        detail.HandledContainerCode = handledContainerCode;
-        detail.HandledLot = handledLot;
-        detail.HandledPackingCode = handledPackingCode;
-        await Task.CompletedTask.ConfigureAwait(false);
-    }
    
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/InjectionJobs/InjectionJobDetail.cs

@@ -1,40 +1,80 @@
 using System;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Shared.Domain.Shared;
 
 namespace Win_in.Sfs.Wms.Store.Domain;
 
-public class InjectionJobDetail : SfsJobRecommendFromDetailEntityBase, IHasToLocation
+public class InjectionJobDetail : SfsDetailEntityBase
 {
+    #region 库存基础信息
+
     /// <summary>
-    /// 请求库位
+    /// 物品代码
     /// </summary>
-    public string RequestLocationCode { get; set; }
+    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 ToLocationCode { get; set; }
+    public string RequestLocationCode { get; set; }
 
     /// <summary>
     /// 到库区
     /// </summary>
-    public string ToLocationArea { get; set; }
+    public string RequestLocationArea { get; set; }
 
     /// <summary>
     /// 到库位组
     /// </summary>
-    public string ToLocationGroup { get; set; }
+    public string RequestLocationGroup { get; set; }
 
     /// <summary>
     /// 到ERP库位
     /// </summary>
-    public string ToLocationErpCode { get; set; }
+    public string RequestLocationErpCode { get; set; }
 
     /// <summary>
     /// 到仓库
     /// </summary>
-    public string ToWarehouseCode { get; set; }
+    public string RequestWarehouseCode { get; set; }
 
     /// <summary>
     /// 在途库库位
@@ -47,59 +87,435 @@ public class InjectionJobDetail : SfsJobRecommendFromDetailEntityBase, IHasToLoc
     public string ProdLine { get; set; }
 
     /// <summary>
-    /// 工作中心
+    /// 位置码
     /// </summary>
-    public string WorkStation { get; set; }
+    public string PositionCode { get; set; }
 
     /// <summary>
-    /// 过期时间
+    /// 推荐的类型
     /// </summary>
-    public DateTime ExpiredTime { get; set; }
+    public EnumRecommendType RecommendType { get; set; }
 
     /// <summary>
-    /// 工序
+    /// 需求数量
     /// </summary>
-    public string Operation { get; set; }
+    public decimal RequestQty { get; set; }
+
+    #endregion
+
+    #region 推荐来源
 
     /// <summary>
-    /// 配送方式
+    /// 推荐来源托标签
     /// </summary>
-    public EnumDistributionType DistributionType { get; set; }
+    public string RecommendFromContainerCode { get; set; }
 
     /// <summary>
-    /// 取整方式
+    /// 推荐来源箱标签
     /// </summary>
-    public EnumTruncType TruncType { get; set; }
+    public string RecommendFromPackingCode { get; set; }
 
     /// <summary>
-    /// 取整后数量
+    /// 推荐来源批次供应商批次
     /// </summary>
-    public decimal RoundedQty { get; set; }
+    public string RecommendFromSupplierBatch { get; set; }
 
     /// <summary>
-    /// 计划拆分规则
+    /// 推荐来源批次到货时间
     /// </summary>
-    public EnumPlannedSplitRule PlannedSplitRule { get; set; }
+    public DateTime RecommendFromArriveDate { get; set; }
 
     /// <summary>
-    /// 计划开始时间
+    /// 推荐来源批次生产时间
     /// </summary>
-    public DateTime PlanBeginTime { get; set; }
+    public DateTime RecommendFromProduceDate { get; set; }
 
     /// <summary>
-    /// 每次配送数量
+    /// 推荐来源批次过期时间
     /// </summary>
-    public decimal DeliveryQty { get; set; }
+    public DateTime RecommendFromExpireDate { get; set; }
 
     /// <summary>
-    /// 位置码
+    /// 推荐来源批次排序
     /// </summary>
-    public string PositionCode { get; set; }
+    public string RecommendFromLot { get; set; }
 
     /// <summary>
-    /// 推荐类型
+    /// 推荐来源库位
     /// </summary>
-    public EnumRecommendType RecommendType { get; set; }
+    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)
     {

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/InjectionJobs/InjectionJobManager.cs

@@ -30,23 +30,6 @@ public class InjectionJobManager : SfsJobManagerBase<InjectionJob, InjectionJobD
     {
         var entity = await Repository.FindAsync(input.Id).ConfigureAwait(false);
 
-        foreach (var detail in input.Details)
-        {
-            //发料子任务 赋值实际转移
-            await entity.BuildDetail(detail.Id,
-                detail.HandledFromLocationCode,
-                detail.HandledFromLocationErpCode,
-                detail.HandledFromWarehouseCode,
-                detail.HandledQty,
-                detail.HandledSupplierBatch,
-                detail.HandledArriveDate,
-                detail.HandledProduceDate,
-                detail.HandledExpireDate,
-                detail.HandledContainerCode,
-                detail.HandledLot,
-                detail.HandledPackingCode).ConfigureAwait(false);
-        }
-
         return await base.CompleteAsync(entity, user).ConfigureAwait(false);
     }
 
@@ -63,20 +46,22 @@ public class InjectionJobManager : SfsJobManagerBase<InjectionJob, InjectionJobD
         }
     }
 
-    public override async Task<List<InjectionJob>> GetWorkingListByPackingAsync(string packingCode)
+    public async Task<InjectionJob> GetAsync(Expression<Func<InjectionJob, bool>> expression)
     {
-        return await Repository.GetListAsync(c => c.Details.Any(p => p.RecommendPackingCode == packingCode) && c.JobStatus != EnumJobStatus.Closed && c.JobStatus != EnumJobStatus.Cancelled, true).ConfigureAwait(false);
+        return await Repository.FindAsync(expression).ConfigureAwait(false);
-
     }
 
-    public override async Task<List<InjectionJob>> GetWorkingListByContainerAsync(string containerCode)
+    #region 无用
-    {
-        return await Repository.GetListAsync(c => c.Details.Any(p => p.RecommendContainerCode == containerCode) && c.JobStatus != EnumJobStatus.Closed && c.JobStatus != EnumJobStatus.Cancelled, true).ConfigureAwait(false);
 
+    public override Task<List<InjectionJob>> GetWorkingListByPackingAsync(string packingCode)
+    {
+        throw new NotImplementedException();
     }
 
-    public async Task<InjectionJob> GetAsync(Expression<Func<InjectionJob, bool>> expression)
+    public override Task<List<InjectionJob>> GetWorkingListByContainerAsync(string containerCode)
     {
-        return await Repository.FindAsync(expression).ConfigureAwait(false);
+        throw new NotImplementedException();
     }
+
+    #endregion
 }

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

@@ -14,6 +14,11 @@ public abstract class SfsJobRecommendToDetailEntityBase
     , IHasStdPack
 {
 
+    /// <summary>
+    /// 物品代码
+    /// </summary>
+    public string ItemCode { get; set; }
+
     /// <summary>
     /// 物品名称
     /// </summary>
@@ -29,11 +34,6 @@ public abstract class SfsJobRecommendToDetailEntityBase
     /// </summary>
     public string ItemDesc2 { get; set; }
 
-    /// <summary>
-    /// 物品代码
-    /// </summary>
-    public string ItemCode { get; set; }
-
     /// <summary>
     /// 标包数量
     /// </summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/InjectionNotes/InjectionNote.cs

@@ -17,12 +17,6 @@ public class InjectionNote : SfsStoreAggregateRootBase<InjectionNoteDetail>, IHa
     [IgnoreUpdate]
     public string JobNumber { get; set; }
 
-    /// <summary>
-    /// 车间
-    /// </summary>
-    [IgnoreUpdate]
-    public string Workshop { get; set; }
-
     /// <summary>
     /// 明细列表 
     /// </summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/InjectionNotes/InjectionNoteDetail.cs

@@ -1,43 +1,519 @@
 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.Domain;
 
-public class InjectionNoteDetail : SfsStoreRecommendFromDetailWithFromToEntityBase
+public class InjectionNoteDetail : SfsStoreDetailEntityBase
 {
+    #region 库存基础信息
 
     /// <summary>
-    /// 发料时间
+    ///     物品代码
     /// </summary>
-    public DateTime IssueTime { get; set; }
+    public string ItemCode { get; set; }
 
     /// <summary>
-    /// 过期时间
+    ///     物品名称
     /// </summary>
-    public DateTime ExpiredTime { get; set; }
+    public string ItemName { get; set; }
 
     /// <summary>
-    /// 生产线
+    ///     物品描述1
     /// </summary>
-    public string ProdLine { get; set; }
+    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 WorkStation { get; set; }
+    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/Requests/MaterialRequests/InjectionRequests/InjectionRequestDetail.cs

@@ -56,16 +56,6 @@ public class InjectionRequestDetail : SfsStoreDetailWithQtyEntityBase, IHasToLoc
     /// </summary>
     public string ProdLine { get; set; }
 
-    /// <summary>
-    /// 工作中心
-    /// </summary>
-    public string WorkStation { get; set; }
-
-    /// <summary>
-    /// 过期时间
-    /// </summary>
-    public DateTime ExpiredTime { get; set; }
-
     /// <summary>
     /// 已发数量
     /// </summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/InjectionJobs/InjectionJobDbContextModelCreatingExtensions.cs

@@ -23,7 +23,6 @@ public static class InjectionJobDbContextModelCreatingExtensions
             //Properties
             b.Property(q => q.RequestType).HasMaxLength(SfsPropertyConst.CodeLength);
             b.Property(q => q.InjectionRequestNumber).HasMaxLength(SfsPropertyConst.CodeLength);
-            b.Property(q => q.Workshop).HasMaxLength(SfsPropertyConst.CodeLength);
             b.Property(q => q.ProdLine).HasMaxLength(SfsPropertyConst.CodeLength);
             //Relations
             b.HasMany(q => q.Details).WithOne().HasForeignKey(d => d.MasterID).IsRequired();
@@ -40,21 +39,11 @@ public static class InjectionJobDbContextModelCreatingExtensions
             //Configure Sfs base properties
             b.ConfigureSfsBase();
             //Configure Job base properties
-            b.ConfigureJobRecommendFromDetail();
+            //b.ConfigureJobRecommendFromDetail();
             //Properties
-            b.Property(q => q.ExpiredTime).IsRequired();
+            
-            b.Property(q => q.ToLocationCode).HasMaxLength(SfsPropertyConst.CodeLength);
-            b.Property(q => q.ToLocationErpCode).HasMaxLength(SfsPropertyConst.CodeLength);
-            b.Property(q => q.ToWarehouseCode).HasMaxLength(SfsPropertyConst.CodeLength);
-            b.Property(q => q.ToLocationArea).HasMaxLength(SfsPropertyConst.CodeLength);
-            b.Property(q => q.ToLocationGroup).HasMaxLength(SfsPropertyConst.CodeLength);
             b.Property(q => q.RequestLocationCode).HasMaxLength(SfsPropertyConst.CodeLength);
             b.Property(q => q.ProdLine).HasMaxLength(SfsPropertyConst.CodeLength);
-            b.Property(q => q.WorkStation).HasMaxLength(SfsPropertyConst.CodeLength);
-            b.Property(q => q.Operation).HasMaxLength(SfsPropertyConst.CodeLength);
-            b.Property(q => q.DistributionType).HasMaxLength(SfsPropertyConst.NameLength).HasConversion<string>();
-            b.Property(q => q.TruncType).HasMaxLength(SfsPropertyConst.NameLength).HasConversion<string>();
-            b.Property(q => q.PlannedSplitRule).HasMaxLength(SfsPropertyConst.NameLength).HasConversion<string>();
             b.Property(q => q.OnTheWayLocationCode).HasMaxLength(SfsPropertyConst.CodeLength);
             b.Property(q => q.PositionCode).HasMaxLength(SfsPropertyConst.CodeLength);
             b.Property(q => q.RecommendType).HasMaxLength(SfsPropertyConst.CodeLength).HasConversion<string>();

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

@@ -6545,10 +6545,6 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                     b.Property<string>("Worker")
                         .HasColumnType("nvarchar(max)");
 
-                    b.Property<string>("Workshop")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
                     b.HasKey("Id");
 
                     b.HasIndex("Number")
@@ -6570,94 +6566,95 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasColumnType("uniqueidentifier")
                         .HasColumnName("CreatorId");
 
-                    b.Property<decimal>("DeliveryQty")
+                    b.Property<DateTime>("HandledFromArriveDate")
-                        .HasColumnType("decimal(18,6)");
-
-                    b.Property<string>("DistributionType")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("ExpiredTime")
-                        .HasColumnType("datetime2");
-
-                    b.Property<DateTime>("HandledArriveDate")
                         .HasColumnType("datetime2");
 
-                    b.Property<string>("HandledContainerCode")
+                    b.Property<string>("HandledFromContainerCode")
-                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(max)");
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("HandledContainerCode");
 
-                    b.Property<DateTime>("HandledExpireDate")
+                    b.Property<DateTime>("HandledFromExpireDate")
                         .HasColumnType("datetime2");
 
                     b.Property<string>("HandledFromLocationArea")
-                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(max)");
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("HandledFromLocationArea");
 
                     b.Property<string>("HandledFromLocationCode")
-                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(max)");
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("HandledFromLocationCode");
 
                     b.Property<string>("HandledFromLocationErpCode")
-                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(max)");
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("HandledFromLocationErpCode");
 
                     b.Property<string>("HandledFromLocationGroup")
-                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(max)");
-                        .HasColumnType("nvarchar(64)")
+
-                        .HasColumnName("HandledFromLocationGroup");
+                    b.Property<string>("HandledFromLot")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("HandledFromPackingCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime>("HandledFromProduceDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<decimal>("HandledFromQty")
+                        .HasColumnType("decimal(18,6)");
+
+                    b.Property<string>("HandledFromSupplierBatch")
+                        .HasColumnType("nvarchar(max)");
 
                     b.Property<string>("HandledFromWarehouseCode")
-                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(max)");
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("HandledFromWarehouseCode");
 
-                    b.Property<string>("HandledLot")
+                    b.Property<DateTime>("HandledToArriveDate")
-                        .HasMaxLength(64)
+                        .HasColumnType("datetime2");
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("HandledLot");
 
-                    b.Property<string>("HandledPackingCode")
+                    b.Property<string>("HandledToContainerCode")
-                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(max)");
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("HandledPackingCode");
 
-                    b.Property<DateTime>("HandledProduceDate")
+                    b.Property<DateTime>("HandledToExpireDate")
                         .HasColumnType("datetime2");
 
-                    b.Property<decimal>("HandledQty")
+                    b.Property<string>("HandledToLocationArea")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("HandledToLocationCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("HandledToLocationErpCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("HandledToLocationGroup")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("HandledToLot")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("HandledToPackingCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime>("HandledToProduceDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<decimal>("HandledToQty")
                         .HasColumnType("decimal(18,6)");
 
-                    b.Property<string>("HandledSupplierBatch")
+                    b.Property<string>("HandledToSupplierBatch")
-                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(max)");
-                        .HasColumnType("nvarchar(64)")
+
-                        .HasColumnName("HandledSupplierBatch");
+                    b.Property<string>("HandledToWarehouseCode")
+                        .HasColumnType("nvarchar(max)");
 
                     b.Property<string>("ItemCode")
-                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("ItemCode");
 
                     b.Property<string>("ItemDesc1")
-                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(max)");
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("ItemDesc1");
 
                     b.Property<string>("ItemDesc2")
-                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(max)");
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("ItemDesc2");
 
                     b.Property<string>("ItemName")
-                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(max)");
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("ItemName");
 
                     b.Property<DateTime?>("LastModificationTime")
                         .HasColumnType("datetime2")
@@ -6671,26 +6668,12 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("Number")
-                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
 
                     b.Property<string>("OnTheWayLocationCode")
                         .HasMaxLength(64)
                         .HasColumnType("nvarchar(64)");
 
-                    b.Property<string>("Operation")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("PlanBeginTime")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("PlannedSplitRule")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
                     b.Property<string>("PositionCode")
                         .HasMaxLength(64)
                         .HasColumnType("nvarchar(64)");
@@ -6699,62 +6682,83 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasMaxLength(64)
                         .HasColumnType("nvarchar(64)");
 
-                    b.Property<DateTime>("RecommendArriveDate")
+                    b.Property<DateTime>("RecommendFromArriveDate")
                         .HasColumnType("datetime2");
 
-                    b.Property<string>("RecommendContainerCode")
+                    b.Property<string>("RecommendFromContainerCode")
-                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(max)");
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("RecommendContainerCode");
 
-                    b.Property<DateTime>("RecommendExpireDate")
+                    b.Property<DateTime>("RecommendFromExpireDate")
                         .HasColumnType("datetime2");
 
                     b.Property<string>("RecommendFromLocationArea")
-                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(max)");
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("RecommendFromLocationArea");
 
                     b.Property<string>("RecommendFromLocationCode")
-                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(max)");
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("RecommendFromLocationCode");
 
                     b.Property<string>("RecommendFromLocationErpCode")
-                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(max)");
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("RecommendFromLocationErpCode");
 
                     b.Property<string>("RecommendFromLocationGroup")
-                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(max)");
-                        .HasColumnType("nvarchar(64)")
+
-                        .HasColumnName("RecommendFromLocationGroup");
+                    b.Property<string>("RecommendFromLot")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("RecommendFromPackingCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime>("RecommendFromProduceDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<decimal>("RecommendFromQty")
+                        .HasColumnType("decimal(18,6)");
+
+                    b.Property<string>("RecommendFromSupplierBatch")
+                        .HasColumnType("nvarchar(max)");
 
                     b.Property<string>("RecommendFromWarehouseCode")
-                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(max)");
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("RecommendFromWarehouseCode");
 
-                    b.Property<string>("RecommendLot")
+                    b.Property<DateTime>("RecommendToArriveDate")
-                        .HasMaxLength(64)
+                        .HasColumnType("datetime2");
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("RecommendLot");
 
-                    b.Property<string>("RecommendPackingCode")
+                    b.Property<string>("RecommendToContainerCode")
-                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(max)");
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("RecommendPackingCode");
 
-                    b.Property<DateTime>("RecommendProduceDate")
+                    b.Property<DateTime>("RecommendToExpireDate")
                         .HasColumnType("datetime2");
 
-                    b.Property<decimal>("RecommendQty")
+                    b.Property<string>("RecommendToLocationArea")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("RecommendToLocationCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("RecommendToLocationErpCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("RecommendToLocationGroup")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("RecommendToLot")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("RecommendToPackingCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime>("RecommendToProduceDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<decimal>("RecommendToQty")
                         .HasColumnType("decimal(18,6)");
 
-                    b.Property<string>("RecommendSupplierBatch")
+                    b.Property<string>("RecommendToSupplierBatch")
-                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(max)");
-                        .HasColumnType("nvarchar(64)")
+
-                        .HasColumnName("RecommendSupplierBatch");
+                    b.Property<string>("RecommendToWarehouseCode")
+                        .HasColumnType("nvarchar(max)");
 
                     b.Property<string>("RecommendType")
                         .IsRequired()
@@ -6766,17 +6770,27 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasColumnType("nvarchar(3072)")
                         .HasColumnName("Remark");
 
+                    b.Property<string>("RequestLocationArea")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<string>("RequestLocationCode")
                         .HasMaxLength(64)
                         .HasColumnType("nvarchar(64)");
 
-                    b.Property<decimal>("RoundedQty")
+                    b.Property<string>("RequestLocationErpCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("RequestLocationGroup")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<decimal>("RequestQty")
                         .HasColumnType("decimal(18,6)");
 
-                    b.Property<string>("Status")
+                    b.Property<string>("RequestWarehouseCode")
-                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
-                        .HasMaxLength(64)
+
-                        .HasColumnType("nvarchar(64)");
+                    b.Property<int>("Status")
+                        .HasColumnType("int");
 
                     b.Property<decimal>("StdPackQty")
                         .HasColumnType("decimal(18,6)");
@@ -6785,37 +6799,86 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasColumnType("uniqueidentifier")
                         .HasColumnName("TenantId");
 
-                    b.Property<string>("ToLocationArea")
+                    b.Property<DateTime>("TransferLibFromArriveDate")
-                        .HasMaxLength(64)
+                        .HasColumnType("datetime2");
-                        .HasColumnType("nvarchar(64)");
 
-                    b.Property<string>("ToLocationCode")
+                    b.Property<string>("TransferLibFromContainerCode")
-                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(max)");
-                        .HasColumnType("nvarchar(64)");
 
-                    b.Property<string>("ToLocationErpCode")
+                    b.Property<DateTime>("TransferLibFromExpireDate")
-                        .HasMaxLength(64)
+                        .HasColumnType("datetime2");
-                        .HasColumnType("nvarchar(64)");
 
-                    b.Property<string>("ToLocationGroup")
+                    b.Property<string>("TransferLibFromLocationArea")
-                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(max)");
-                        .HasColumnType("nvarchar(64)");
 
-                    b.Property<string>("ToWarehouseCode")
+                    b.Property<string>("TransferLibFromLocationCode")
-                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(max)");
-                        .HasColumnType("nvarchar(64)");
 
-                    b.Property<string>("TruncType")
+                    b.Property<string>("TransferLibFromLocationErpCode")
-                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
 
-                    b.Property<string>("Uom")
+                    b.Property<string>("TransferLibFromLocationGroup")
                         .HasColumnType("nvarchar(max)");
 
-                    b.Property<string>("WorkStation")
+                    b.Property<string>("TransferLibFromLot")
-                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(max)");
-                        .HasColumnType("nvarchar(64)");
+
+                    b.Property<string>("TransferLibFromPackingCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime>("TransferLibFromProduceDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<decimal>("TransferLibFromQty")
+                        .HasColumnType("decimal(18,6)");
+
+                    b.Property<string>("TransferLibFromSupplierBatch")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("TransferLibFromWarehouseCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime>("TransferLibToArriveDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("TransferLibToContainerCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime>("TransferLibToExpireDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("TransferLibToLocationArea")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("TransferLibToLocationCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("TransferLibToLocationErpCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("TransferLibToLocationGroup")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("TransferLibToLot")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("TransferLibToPackingCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime>("TransferLibToProduceDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<decimal>("TransferLibToQty")
+                        .HasColumnType("decimal(18,6)");
+
+                    b.Property<string>("TransferLibToSupplierBatch")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("TransferLibToWarehouseCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Uom")
+                        .HasColumnType("nvarchar(max)");
 
                     b.HasKey("Id");
 
@@ -6898,10 +6961,6 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                     b.Property<string>("Worker")
                         .HasColumnType("nvarchar(max)");
 
-                    b.Property<string>("Workshop")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
                     b.HasKey("Id");
 
                     b.HasIndex("Number")
@@ -6915,9 +6974,6 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                     b.Property<Guid>("Id")
                         .HasColumnType("uniqueidentifier");
 
-                    b.Property<DateTime>("ArriveDate")
-                        .HasColumnType("datetime2");
-
                     b.Property<DateTime>("CreationTime")
                         .HasColumnType("datetime2")
                         .HasColumnName("CreationTime");
@@ -6926,113 +6982,83 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasColumnType("uniqueidentifier")
                         .HasColumnName("CreatorId");
 
-                    b.Property<DateTime>("ExpireDate")
+                    b.Property<DateTime>("HandledFromArriveDate")
                         .HasColumnType("datetime2");
 
-                    b.Property<DateTime>("ExpiredTime")
+                    b.Property<string>("HandledFromContainerCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime>("HandledFromExpireDate")
                         .HasColumnType("datetime2");
 
-                    b.Property<string>("FromContainerCode")
+                    b.Property<string>("HandledFromLocationArea")
                         .HasColumnType("nvarchar(max)");
 
-                    b.Property<string>("FromLocationArea")
+                    b.Property<string>("HandledFromLocationCode")
-                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(450)");
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("FromLocationArea");
-
-                    b.Property<string>("FromLocationCode")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("FromLocationCode");
 
-                    b.Property<string>("FromLocationErpCode")
+                    b.Property<string>("HandledFromLocationErpCode")
-                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("FromLocationErpCode");
 
-                    b.Property<string>("FromLocationGroup")
+                    b.Property<string>("HandledFromLocationGroup")
-                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(max)");
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("FromLocationGroup");
 
-                    b.Property<string>("FromLot")
+                    b.Property<string>("HandledFromLot")
                         .HasColumnType("nvarchar(max)");
 
-                    b.Property<string>("FromPackingCode")
+                    b.Property<string>("HandledFromPackingCode")
                         .HasColumnType("nvarchar(450)");
 
-                    b.Property<string>("FromStatus")
+                    b.Property<DateTime>("HandledFromProduceDate")
-                        .IsRequired()
+                        .HasColumnType("datetime2");
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
 
-                    b.Property<string>("FromWarehouseCode")
+                    b.Property<decimal>("HandledFromQty")
-                        .IsRequired()
+                        .HasColumnType("decimal(18,6)");
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("FromWarehouseCode");
 
-                    b.Property<DateTime>("HandledArriveDate")
+                    b.Property<string>("HandledFromSupplierBatch")
-                        .HasColumnType("datetime2");
+                        .HasColumnType("nvarchar(max)");
 
-                    b.Property<string>("HandledContainerCode")
+                    b.Property<string>("HandledFromWarehouseCode")
-                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(max)");
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("HandledContainerCode");
 
-                    b.Property<DateTime>("HandledExpireDate")
+                    b.Property<DateTime>("HandledToArriveDate")
                         .HasColumnType("datetime2");
 
-                    b.Property<string>("HandledFromLocationArea")
+                    b.Property<string>("HandledToContainerCode")
-                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(max)");
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("HandledFromLocationArea");
 
-                    b.Property<string>("HandledFromLocationCode")
+                    b.Property<DateTime>("HandledToExpireDate")
-                        .HasMaxLength(64)
+                        .HasColumnType("datetime2");
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("HandledFromLocationCode");
 
-                    b.Property<string>("HandledFromLocationErpCode")
+                    b.Property<string>("HandledToLocationArea")
-                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(max)");
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("HandledFromLocationErpCode");
 
-                    b.Property<string>("HandledFromLocationGroup")
+                    b.Property<string>("HandledToLocationCode")
-                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(450)");
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("HandledFromLocationGroup");
 
-                    b.Property<string>("HandledFromWarehouseCode")
+                    b.Property<string>("HandledToLocationErpCode")
-                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(max)");
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("HandledFromWarehouseCode");
 
-                    b.Property<string>("HandledLot")
+                    b.Property<string>("HandledToLocationGroup")
-                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(max)");
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("HandledLot");
 
-                    b.Property<string>("HandledPackingCode")
+                    b.Property<string>("HandledToLot")
-                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(max)");
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("HandledPackingCode");
 
-                    b.Property<DateTime>("HandledProduceDate")
+                    b.Property<string>("HandledToPackingCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime>("HandledToProduceDate")
                         .HasColumnType("datetime2");
 
-                    b.Property<decimal>("HandledQty")
+                    b.Property<decimal>("HandledToQty")
                         .HasColumnType("decimal(18,6)");
 
-                    b.Property<string>("HandledSupplierBatch")
+                    b.Property<string>("HandledToSupplierBatch")
-                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(max)");
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("HandledSupplierBatch");
 
-                    b.Property<DateTime>("IssueTime")
+                    b.Property<string>("HandledToWarehouseCode")
-                        .HasColumnType("datetime2");
+                        .HasColumnType("nvarchar(max)");
 
                     b.Property<string>("ItemCode")
                         .IsRequired()
@@ -7084,70 +7110,83 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasMaxLength(64)
                         .HasColumnType("nvarchar(64)");
 
-                    b.Property<DateTime>("ProduceDate")
+                    b.Property<DateTime>("RecommendFromArriveDate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<decimal>("Qty")
-                        .HasPrecision(18, 6)
-                        .HasColumnType("decimal(18,6)")
-                        .HasColumnName("Qty");
-
-                    b.Property<DateTime>("RecommendArriveDate")
                         .HasColumnType("datetime2");
 
-                    b.Property<string>("RecommendContainerCode")
+                    b.Property<string>("RecommendFromContainerCode")
-                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(max)");
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("RecommendContainerCode");
 
-                    b.Property<DateTime>("RecommendExpireDate")
+                    b.Property<DateTime>("RecommendFromExpireDate")
                         .HasColumnType("datetime2");
 
                     b.Property<string>("RecommendFromLocationArea")
-                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(max)");
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("RecommendFromLocationArea");
 
                     b.Property<string>("RecommendFromLocationCode")
-                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(max)");
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("RecommendFromLocationCode");
 
                     b.Property<string>("RecommendFromLocationErpCode")
-                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(max)");
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("RecommendFromLocationErpCode");
 
                     b.Property<string>("RecommendFromLocationGroup")
-                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(max)");
-                        .HasColumnType("nvarchar(64)")
+
-                        .HasColumnName("RecommendFromLocationGroup");
+                    b.Property<string>("RecommendFromLot")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("RecommendFromPackingCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime>("RecommendFromProduceDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<decimal>("RecommendFromQty")
+                        .HasColumnType("decimal(18,6)");
+
+                    b.Property<string>("RecommendFromSupplierBatch")
+                        .HasColumnType("nvarchar(max)");
 
                     b.Property<string>("RecommendFromWarehouseCode")
-                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(max)");
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("RecommendFromWarehouseCode");
 
-                    b.Property<string>("RecommendLot")
+                    b.Property<DateTime>("RecommendToArriveDate")
-                        .HasMaxLength(64)
+                        .HasColumnType("datetime2");
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("RecommendLot");
 
-                    b.Property<string>("RecommendPackingCode")
+                    b.Property<string>("RecommendToContainerCode")
-                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(max)");
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("RecommendPackingCode");
 
-                    b.Property<DateTime>("RecommendProduceDate")
+                    b.Property<DateTime>("RecommendToExpireDate")
                         .HasColumnType("datetime2");
 
-                    b.Property<decimal>("RecommendQty")
+                    b.Property<string>("RecommendToLocationArea")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("RecommendToLocationCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("RecommendToLocationErpCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("RecommendToLocationGroup")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("RecommendToLot")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("RecommendToPackingCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime>("RecommendToProduceDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<decimal>("RecommendToQty")
                         .HasColumnType("decimal(18,6)");
 
-                    b.Property<string>("RecommendSupplierBatch")
+                    b.Property<string>("RecommendToSupplierBatch")
-                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(max)");
-                        .HasColumnType("nvarchar(64)")
+
-                        .HasColumnName("RecommendSupplierBatch");
+                    b.Property<string>("RecommendToWarehouseCode")
+                        .HasColumnType("nvarchar(max)");
 
                     b.Property<string>("RecommendType")
                         .IsRequired()
@@ -7159,79 +7198,124 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasColumnType("nvarchar(3072)")
                         .HasColumnName("Remark");
 
-                    b.Property<decimal>("StdPackQty")
+                    b.Property<string>("RequestLocationArea")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("RequestLocationCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("RequestLocationErpCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("RequestLocationGroup")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<decimal>("RequestQty")
                         .HasColumnType("decimal(18,6)");
 
-                    b.Property<string>("SupplierBatch")
+                    b.Property<string>("RequestWarehouseCode")
-                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(max)");
-                        .HasColumnType("nvarchar(64)")
+
-                        .HasColumnName("SupplierBatch");
+                    b.Property<int>("Status")
+                        .HasColumnType("int");
+
+                    b.Property<decimal>("StdPackQty")
+                        .HasColumnType("decimal(18,6)");
 
                     b.Property<Guid?>("TenantId")
                         .HasColumnType("uniqueidentifier")
                         .HasColumnName("TenantId");
 
-                    b.Property<string>("ToContainerCode")
+                    b.Property<DateTime>("TransferLibFromArriveDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("TransferLibFromContainerCode")
                         .HasColumnType("nvarchar(max)");
 
-                    b.Property<string>("ToLocationArea")
+                    b.Property<DateTime>("TransferLibFromExpireDate")
-                        .HasMaxLength(64)
+                        .HasColumnType("datetime2");
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("ToLocationArea");
 
-                    b.Property<string>("ToLocationCode")
+                    b.Property<string>("TransferLibFromLocationArea")
-                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("ToLocationCode");
 
-                    b.Property<string>("ToLocationErpCode")
+                    b.Property<string>("TransferLibFromLocationCode")
-                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("ToLocationErpCode");
 
-                    b.Property<string>("ToLocationGroup")
+                    b.Property<string>("TransferLibFromLocationErpCode")
-                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(max)");
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("ToLocationGroup");
 
-                    b.Property<string>("ToLot")
+                    b.Property<string>("TransferLibFromLocationGroup")
                         .HasColumnType("nvarchar(max)");
 
-                    b.Property<string>("ToPackingCode")
+                    b.Property<string>("TransferLibFromLot")
                         .HasColumnType("nvarchar(max)");
 
-                    b.Property<string>("ToStatus")
+                    b.Property<string>("TransferLibFromPackingCode")
-                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
 
-                    b.Property<string>("ToWarehouseCode")
+                    b.Property<DateTime>("TransferLibFromProduceDate")
-                        .IsRequired()
+                        .HasColumnType("datetime2");
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("ToWarehouseCode");
 
-                    b.Property<string>("Uom")
+                    b.Property<decimal>("TransferLibFromQty")
-                        .IsRequired()
+                        .HasColumnType("decimal(18,6)");
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("Uom");
 
-                    b.Property<string>("WorkStation")
+                    b.Property<string>("TransferLibFromSupplierBatch")
-                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(max)");
-                        .HasColumnType("nvarchar(64)");
+
+                    b.Property<string>("TransferLibFromWarehouseCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime>("TransferLibToArriveDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("TransferLibToContainerCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime>("TransferLibToExpireDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("TransferLibToLocationArea")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("TransferLibToLocationCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("TransferLibToLocationErpCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("TransferLibToLocationGroup")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("TransferLibToLot")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("TransferLibToPackingCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime>("TransferLibToProduceDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<decimal>("TransferLibToQty")
+                        .HasColumnType("decimal(18,6)");
+
+                    b.Property<string>("TransferLibToSupplierBatch")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("TransferLibToWarehouseCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Uom")
+                        .HasColumnType("nvarchar(max)");
 
                     b.HasKey("Id");
 
-                    b.HasIndex("FromPackingCode");
+                    b.HasIndex("HandledFromPackingCode");
 
                     b.HasIndex("MasterID");
 
-                    b.HasIndex("Number", "FromPackingCode", "FromLocationCode", "ToLocationCode")
+                    b.HasIndex("Number", "HandledFromPackingCode", "HandledFromLocationCode", "HandledToLocationCode")
                         .IsUnique()
-                        .HasFilter("[FromPackingCode] IS NOT NULL");
+                        .HasFilter("[HandledFromPackingCode] IS NOT NULL AND [HandledFromLocationCode] IS NOT NULL AND [HandledToLocationCode] IS NOT NULL");
 
                     b.ToTable("Store_InjectionNoteDetail", (string)null);
                 });
@@ -7343,9 +7427,6 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasColumnType("uniqueidentifier")
                         .HasColumnName("CreatorId");
 
-                    b.Property<DateTime>("ExpiredTime")
-                        .HasColumnType("datetime2");
-
                     b.Property<decimal>("IssuedQty")
                         .HasPrecision(18, 6)
                         .HasColumnType("decimal(18,6)");
@@ -7458,10 +7539,6 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasColumnType("nvarchar(64)")
                         .HasColumnName("Uom");
 
-                    b.Property<string>("WorkStation")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
                     b.HasKey("Id");
 
                     b.HasIndex("ItemCode");
@@ -21755,6 +21832,14 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                     b.Property<DateTime>("ExpiredTime")
                         .HasColumnType("datetime2");
 
+                    b.Property<string>("FromLocationArea")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.Property<string>("FromLocationCode")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
                     b.Property<DateTime>("HandledArriveDate")
                         .HasColumnType("datetime2");
 
@@ -21940,10 +22025,6 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasColumnType("nvarchar(3072)")
                         .HasColumnName("Remark");
 
-                    b.Property<string>("RequestLocationCode")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
                     b.Property<decimal>("RoundedQty")
                         .HasColumnType("decimal(18,6)");
 
@@ -22518,7 +22599,14 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasColumnType("datetime2");
 
                     b.Property<string>("FromLocationArea")
-                        .HasColumnType("nvarchar(max)");
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.Property<string>("FromLocationCode")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
 
                     b.Property<decimal>("IssuedQty")
                         .HasPrecision(18, 6)

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/InjectionNotes/InjectionNoteDbContextModelCreatingExtensions.cs

@@ -21,7 +21,6 @@ public static class InjectionNoteDbContextModelCreatingExtensions
             //Properties
             b.Property(q => q.RequestNumber).HasMaxLength(SfsPropertyConst.CodeLength);
             b.Property(q => q.RequestType).HasMaxLength(SfsPropertyConst.CodeLength);
-            b.Property(q => q.Workshop).HasMaxLength(SfsPropertyConst.NameLength);
             b.Property(q => q.Remark).HasMaxLength(SfsPropertyConst.RemarkLength);
 
             //Relations
@@ -43,21 +42,16 @@ public static class InjectionNoteDbContextModelCreatingExtensions
            b.ConfigureSfsStoreDetailBase();
 
            //Properties
-           b.Property(q => q.IssueTime).IsRequired();
-           b.Property(q => q.ExpiredTime).IsRequired();
            b.Property(q => q.ProdLine).HasMaxLength(SfsPropertyConst.NameLength);
-           b.Property(q => q.WorkStation).HasMaxLength(SfsPropertyConst.NameLength);
            b.Property(q => q.OnTheWayLocationCode).HasMaxLength(SfsPropertyConst.CodeLength);
-           b.Property(q => q.FromStatus).HasMaxLength(SfsPropertyConst.NameLength).HasConversion<string>();
-           b.Property(q => q.ToStatus).HasMaxLength(SfsPropertyConst.NameLength).HasConversion<string>();
            b.Property(q => q.PositionCode).HasMaxLength(SfsPropertyConst.CodeLength);
            b.Property(q => q.RecommendType).HasMaxLength(SfsPropertyConst.NameLength).HasConversion<string>();
 
            //Relations
 
            //Indexes
-           b.HasIndex(q => new { q.Number, q.FromPackingCode, q.FromLocationCode, q.ToLocationCode }).IsUnique();
+           b.HasIndex(q => new { q.Number, q.HandledFromPackingCode, q.HandledFromLocationCode, q.HandledToLocationCode }).IsUnique();
-           b.HasIndex(q => new { q.FromPackingCode });
+           b.HasIndex(q => new { q.HandledFromPackingCode });
        });
     }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/MaterialRequests/InjectionRequests/InjectionRequestDbContextModelCreatingExtensions.cs

@@ -46,9 +46,7 @@ public static class InjectionRequestDbContextModelCreatingExtensions
             b.Property(q => q.ToWarehouseCode).IsRequired().HasMaxLength(SfsPropertyConst.CodeLength);
             b.Property(q => q.ToLocationArea).IsRequired().HasMaxLength(SfsPropertyConst.CodeLength);
             b.Property(q => q.ToLocationGroup).IsRequired().HasMaxLength(SfsPropertyConst.CodeLength);
-            b.Property(q => q.ExpiredTime).IsRequired();
             b.Property(q => q.ProdLine).HasMaxLength(SfsPropertyConst.CodeLength);
-            b.Property(q => q.WorkStation).HasMaxLength(SfsPropertyConst.CodeLength);
             b.Property(q => q.IssuedQty).HasPrecision(18, 6);
             b.Property(q => q.ReceivedQty).HasPrecision(18, 6);
             b.Property(q => q.Status).HasMaxLength(SfsPropertyConst.NameLength).HasConversion<string>();

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

@@ -23,44 +23,8 @@ public partial class StoreEventAutoMapperProfile : Profile
             .Ignore(x => x.ConfirmTime);
 
         CreateMap<InjectionJobDetail, InjectionNoteDetail>()
-            .ForMember(x => x.FromPackingCode, y => y.MapFrom(d => d.HandledPackingCode))
-            .ForMember(x => x.ToPackingCode, y => y.MapFrom(d => d.HandledPackingCode))
-            .ForMember(x => x.SupplierBatch, y => y.MapFrom(d => d.HandledSupplierBatch))
-            .ForMember(x => x.ArriveDate, y => y.MapFrom(d => d.HandledArriveDate))
-            .ForMember(x => x.ProduceDate, y => y.MapFrom(d => d.HandledProduceDate))
-            .ForMember(x => x.ExpireDate, y => y.MapFrom(d => d.HandledExpireDate))
-            .ForMember(x => x.FromLot, y => y.MapFrom(d => d.HandledLot))
-            .ForMember(x => x.ToLot, y => y.MapFrom(d => d.HandledLot))
-            .ForMember(x => x.ToContainerCode, y => y.MapFrom(d => d.HandledContainerCode))
-            .ForMember(x => x.FromContainerCode, y => y.MapFrom(d => d.HandledContainerCode))
-            .ForMember(x => x.FromStatus, y => y.MapFrom(d => d.Status))
-            .ForMember(x => x.ToStatus, y => y.MapFrom(d => d.Status))
-            .ForMember(x => x.Qty, y => y.MapFrom(d => d.HandledQty))
-            .ForMember(x => x.IssueTime, y => y.MapFrom(d => DateTime.Now))
-            .ForMember(x => x.FromLocationCode, y => y.MapFrom(d => d.HandledFromLocationCode))
-            .ForMember(x => x.FromLocationArea, y => y.MapFrom(d => d.HandledFromLocationArea))
-            .ForMember(x => x.FromLocationGroup, y => y.MapFrom(d => d.HandledFromLocationGroup))
-            .ForMember(x => x.FromLocationErpCode, y => y.MapFrom(d => d.HandledFromLocationErpCode))
-            .ForMember(x => x.FromWarehouseCode, y => y.MapFrom(d => d.HandledFromWarehouseCode))
-            .ForMember(x => x.ToLocationCode, y => y.MapFrom(d => d.ToLocationCode))
-            .Ignore(x => x.ToLocationArea)
-            .Ignore(x => x.ToLocationGroup)
-            .Ignore(x => x.ToLocationErpCode)
             ;
 
-        CreateMap<InjectionJobDetail, ExpectInEditInput>()
-            .MapExpectInOutFrom()
-            .Ignore(x => x.Worker)
-            .Ignore(x => x.SerialNumber)
-            .Ignore(x => x.ExtraProperties)
-            ;
-
-        CreateMap<InjectionJobDetail, ExpectOutEditInput>()
-            .MapExpectInOutFrom()
-            .Ignore(x => x.Worker)
-            .Ignore(x => x.SerialNumber)
-            .Ignore(x => x.ExtraProperties);
-
         CreateMap<InjectionJob, InjectionNoteEditInput>()
             .ForMember(x => x.RequestNumber, y => y.MapFrom(d => d.InjectionRequestNumber))
             .Ignore(x => x.Confirmed)
@@ -68,25 +32,6 @@ public partial class StoreEventAutoMapperProfile : Profile
             .Ignore(x => x.ActiveDate)
             ;
         CreateMap<InjectionJobDetail, InjectionNoteDetailInput>()
-            .ForMember(x => x.Qty, y => y.MapFrom(d => d.HandledQty))
-            .ForMember(x => x.IssueTime, y => y.MapFrom(d => DateTime.Now))
-            .ForMember(x => x.FromPackingCode, y => y.MapFrom(d => d.HandledPackingCode))
-            .ForMember(x => x.ToPackingCode, y => y.MapFrom(d => d.HandledPackingCode))
-            .ForMember(x => x.FromContainerCode, y => y.MapFrom(d => d.HandledContainerCode))
-            .ForMember(x => x.ToContainerCode, y => y.MapFrom(d => d.HandledContainerCode))
-            .ForMember(x => x.FromLot, y => y.MapFrom(d => d.HandledLot))
-            .ForMember(x => x.ToLot, y => y.MapFrom(d => d.HandledLot))
-            .ForMember(x => x.SupplierBatch, y => y.MapFrom(d => d.HandledSupplierBatch))
-            .ForMember(x => x.ArriveDate, y => y.MapFrom(d => d.HandledArriveDate))
-            .ForMember(x => x.ProduceDate, y => y.MapFrom(d => d.HandledProduceDate))
-            .ForMember(x => x.ExpireDate, y => y.MapFrom(d => d.ExpiredTime))
-            .ForMember(x => x.FromLocationCode, y => y.MapFrom(d => d.HandledFromLocationCode))
-            .ForMember(x => x.FromLocationArea, y => y.MapFrom(d => d.HandledFromLocationArea))
-            .ForMember(x => x.FromLocationGroup, y => y.MapFrom(d => d.HandledFromLocationGroup))
-            .ForMember(x => x.FromLocationErpCode, y => y.MapFrom(d => d.HandledFromLocationErpCode))
-            .ForMember(x => x.FromWarehouseCode, y => y.MapFrom(d => d.HandledFromWarehouseCode))
-            .ForMember(x => x.FromStatus, y => y.MapFrom(d => d.Status))
-            .ForMember(x => x.ToStatus, y => y.MapFrom(d => d.Status))
             ;
     }
 }

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

@@ -9,14 +9,7 @@ public partial class StoreEventAutoMapperProfile : Profile
 {
     private void InjectionNoteAutoMapperProfile()
     {
-        CreateMap<InjectionNoteDetail, TransferLogEditInput>()
+        
-            .Ignore(x => x.DocNumber)
-            .Ignore(x => x.JobNumber)
-            .Ignore(x => x.Worker)
-            .Ignore(x => x.TransType)
-            .Ignore(x => x.ExtraProperties)
-            .Ignore(x => x.TransSubType)
-            ;
     }
 
 }

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

@@ -32,103 +32,5 @@ public partial class StoreEventAutoMapperProfile : Profile
             .Ignore(x => x.CompleteTime)
             .Ignore(x => x.Details)
             ;
-
-        CreateMap<InjectionRequestDetail, InjectionJobDetailInput>()
-            .ForMember(x => x.RequestLocationCode, y => y.MapFrom(d => d.ToLocationCode))
-            .Ignore(x => x.RecommendFromLocationArea)
-            .Ignore(x => x.RecommendFromLocationGroup)
-            .Ignore(x => x.HandledFromLocationArea)
-            .Ignore(x => x.HandledFromLocationGroup)
-            .Ignore(x => x.RecommendFromWarehouseCode)
-            .Ignore(x => x.HandledFromWarehouseCode)
-            .Ignore(x => x.OnTheWayLocationCode)
-            .Ignore(x => x.DistributionType)
-            .Ignore(x => x.RoundedQty)
-            .Ignore(x => x.Operation)
-            .Ignore(x => x.ExpiredTime)
-            .Ignore(x => x.TruncType)
-            .Ignore(x => x.PlanBeginTime)
-            .Ignore(x => x.PlannedSplitRule)
-            .Ignore(x => x.DeliveryQty)
-            .Ignore(x => x.Status)
-            .Ignore(x => x.RecommendContainerCode)
-            .Ignore(x => x.StdPackQty)
-            .Ignore(x => x.RecommendPackingCode)
-            .Ignore(x => x.HandledContainerCode)
-            .Ignore(x => x.HandledPackingCode)
-            .Ignore(x => x.RecommendSupplierBatch)
-            .Ignore(x => x.RecommendProduceDate)
-            .Ignore(x => x.RecommendArriveDate)
-            .Ignore(x => x.RecommendExpireDate)
-            .Ignore(x => x.HandledFromLocationCode)
-            .Ignore(x => x.HandledFromLocationErpCode)
-            .Ignore(x => x.HandledUom)
-            .Ignore(x => x.RecommendFromLocationErpCode)
-            .Ignore(x => x.HandledExpireDate)
-            .Ignore(x => x.HandledLot)
-            .Ignore(x => x.HandledArriveDate)
-            .Ignore(x => x.HandledProduceDate)
-            .Ignore(x => x.HandledQty)
-            .Ignore(x => x.RecommendQty)
-            .Ignore(x => x.Uom)
-            .Ignore(x => x.HandledSupplierBatch)
-            .Ignore(x => x.RecommendFromLocationCode)
-            .Ignore(x => x.RecommendLot)
-            .IgnoreIHasRecommendAndHandledFrom();
-
-        CreateMap<BalanceDTO, InjectionJobDetailInput>()
-            .ForMember(x => x.RecommendArriveDate, y => y.MapFrom(d => d.ArriveDate))
-            .ForMember(x => x.RecommendContainerCode, y => y.MapFrom(d => d.ContainerCode))
-            .ForMember(x => x.RecommendExpireDate, y => y.MapFrom(d => d.ExpireDate))
-            .ForMember(x => x.RecommendFromLocationCode, y => y.MapFrom(d => d.LocationCode))
-            .ForMember(x => x.RecommendFromLocationErpCode, y => y.MapFrom(d => d.LocationErpCode))
-            .ForMember(x => x.RecommendFromWarehouseCode, y => y.MapFrom(d => d.WarehouseCode))
-            .ForMember(x => x.RecommendFromLocationArea, y => y.MapFrom(d => d.LocationArea))
-            .ForMember(x => x.RecommendFromLocationGroup, y => y.MapFrom(d => d.LocationGroup))
-            .ForMember(x => x.RecommendLot, y => y.MapFrom(d => d.Lot))
-            .ForMember(x => x.RecommendPackingCode, y => y.MapFrom(d => d.PackingCode))
-            .ForMember(x => x.RecommendProduceDate, y => y.MapFrom(d => d.ProduceDate))
-            .ForMember(x => x.RecommendQty, y => y.MapFrom(d => d.Qty))
-            .ForMember(x => x.RecommendSupplierBatch, y => y.MapFrom(d => d.SupplierBatch))
-            .ForMember(x => x.Uom, y => y.MapFrom(d => d.Uom)).Ignore(x => x.HandledArriveDate)
-            .Ignore(x => x.HandledFromLocationArea)
-            .Ignore(x => x.HandledFromLocationGroup)
-            .Ignore(x => x.ToLocationErpCode)
-            .Ignore(x => x.ToWarehouseCode)
-            .Ignore(x => x.ToLocationArea)
-            .Ignore(x => x.ToLocationGroup)
-            .Ignore(x => x.HandledFromWarehouseCode)
-            .Ignore(x => x.RequestLocationCode)
-            .Ignore(x => x.ToLocationCode)
-            .Ignore(x => x.ProdLine)
-            .Ignore(x => x.WorkStation)
-            .Ignore(x => x.HandledContainerCode)
-            .Ignore(x => x.HandledExpireDate)
-            .Ignore(x => x.HandledFromLocationCode)
-            .Ignore(x => x.HandledFromLocationErpCode)
-            .Ignore(x => x.HandledLot)
-            .Ignore(x => x.HandledPackingCode)
-            .Ignore(x => x.HandledProduceDate)
-            .Ignore(x => x.HandledQty)
-            .Ignore(x => x.HandledSupplierBatch)
-            .Ignore(x => x.HandledUom)
-            .Ignore(x => x.Remark)
-            .Ignore(x => x.OnTheWayLocationCode)
-            .Ignore(x => x.DistributionType)
-            .Ignore(x => x.RoundedQty)
-            .Ignore(x => x.Operation)
-            .Ignore(x => x.ExpiredTime)
-            .Ignore(x => x.TruncType)
-            .Ignore(x => x.PlanBeginTime)
-            .Ignore(x => x.PlannedSplitRule)
-            .Ignore(x => x.DeliveryQty)
-            .Ignore(x => x.RequestLocationCode)
-            .Ignore(x => x.ToLocationCode)
-            .Ignore(x => x.ProdLine)
-            .Ignore(x => x.WorkStation)
-            .Ignore(x => x.PositionCode)
-            .Ignore(x => x.RecommendType)
-            .IgnoreIHasRecommendAndHandledFrom();
-
     }
 }

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

@@ -5,7 +5,6 @@ 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.Domain.Shared.Enums.Store;
 using Win_in.Sfs.Shared.Event;
 using Win_in.Sfs.Wms.Inventory.Application.Contracts;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
@@ -96,7 +95,7 @@ public class InjectionJobEventHandler :
         foreach (var detail in entity.Details)
         {
             var balanceDto = await _balanceAppService
-                .GetRealQtyByPackingCodeAndItemCodeAndLocationCodeAndStatusAsync(detail.RecommendPackingCode,
+                .GetRealQtyByPackingCodeAndItemCodeAndLocationCodeAndStatusAsync(detail.RecommendFromPackingCode,
                     detail.ItemCode, detail.RecommendFromLocationCode, EnumInventoryStatus.OK).ConfigureAwait(false);
 
             var inputoExpectOutEditInput = new ExpectOutEditInput();
@@ -132,6 +131,8 @@ public class InjectionJobEventHandler :
     /// </summary>
     /// <returns></returns>
     private async Task CreateTransferLibAsync(InjectionJob injectionJob)
+    {
+        if (!await IsMinRowAsync(injectionJob).ConfigureAwait(false))
         {
             foreach (var detail in injectionJob.Details)
             {
@@ -142,6 +143,7 @@ public class InjectionJobEventHandler :
                 input.CallServerName = "Win_in.Sfs.Wms.Store.Application.InjectionJobAppService";
                 input.Type = "Transfer_Warehouse";
                 input.UseOnTheWayLocation = true;
+
                 var detailInput = new TransferLibRequestDetailInput();
                 detailInput.CallBusinessType = nameof(IInjectionJobAppService);
                 detailInput.CallRequestNumber = injectionJob.InjectionRequestNumber;
@@ -150,16 +152,16 @@ public class InjectionJobEventHandler :
 
                 detailInput.JobStatus = EnumJobStatus.Open;
                 detailInput.ItemCode = detail.ItemCode;
-            detailInput.Qty = detail.RecommendQty;
+                detailInput.Qty = detail.RecommendFromQty;
                 detailInput.ArriveDate = detailInput.ArriveDate;
                 detailInput.ExpireDate = detailInput.ExpireDate;
-            detailInput.ProduceDate = detail.RecommendProduceDate;
+                detailInput.ProduceDate = detail.RecommendFromProduceDate;
 
-            detailInput.ToLocationCode = detail.ToLocationCode;
+                detailInput.ToLocationCode = detail.RecommendToLocationCode;
-            detailInput.ToWarehouseCode=detail.ToWarehouseCode;
+                detailInput.ToWarehouseCode = detail.RecommendToWarehouseCode;
-            detailInput.ToLocationErpCode=detail.ToLocationErpCode;
+                detailInput.ToLocationErpCode = detail.RecommendToLocationErpCode;
-            detailInput.ToLocationGroup=detail.ToLocationGroup;
+                detailInput.ToLocationGroup = detail.RecommendToLocationGroup;
-            detailInput.ToLocationArea= detail.ToLocationArea;
+                detailInput.ToLocationArea = detail.RecommendToLocationArea;
 
                 detailInput.FromLocationCode = detail.RecommendFromLocationCode;
                 detailInput.FromLocationArea = detail.RecommendFromLocationArea;
@@ -167,16 +169,16 @@ public class InjectionJobEventHandler :
                 detailInput.FromLocationErpCode = detail.RecommendFromLocationErpCode;
                 detailInput.FromWarehouseCode = detail.RecommendFromWarehouseCode;
 
-            detailInput.FromLot = detail.RecommendLot;
+                detailInput.FromLot = detail.RecommendFromLot;
-            detailInput.ToLot=detail.RecommendLot;
+                detailInput.ToLot = detail.RecommendToLot;
-            detailInput.Qty=detail.RecommendQty;
+                detailInput.Qty = detail.RecommendFromQty;
                 detailInput.StdPackQty = detail.StdPackQty;
                 detailInput.Uom = detail.Uom;
-            detailInput.SupplierBatch = detail.RecommendSupplierBatch;
+                detailInput.SupplierBatch = detail.RecommendFromSupplierBatch;
 
                 await _transferLibRequestAppService.CreateAsync(input).ConfigureAwait(false);
             }
-        
+        }
     }
 
     /// <summary>
@@ -187,79 +189,43 @@ public class InjectionJobEventHandler :
     private async Task<InjectionNoteEditInput> BuildInjectionNoteAsync(InjectionJob entity)
     {
         var injectionNoteCreateInput = ObjectMapper.Map<InjectionJob, InjectionNoteEditInput>(entity);
-        injectionNoteCreateInput.JobNumber = entity.Number;
+        //injectionNoteCreateInput.JobNumber = entity.Number;
-        var locationCodes = injectionNoteCreateInput.Details.Select(p => p.ToLocationCode).Distinct().ToList();
+        //var locationCodes = injectionNoteCreateInput.Details.Select(p => p.ToLocationCode).Distinct().ToList();
-        var locations = await _locationAppService.GetByCodesAsync(locationCodes).ConfigureAwait(false);
+        //var locations = await _locationAppService.GetByCodesAsync(locationCodes).ConfigureAwait(false);
 
-        injectionNoteCreateInput.Details.RemoveAll(p => p.Qty == 0);
+        //injectionNoteCreateInput.Details.RemoveAll(p => p.Qty == 0);
 
-        foreach (var detail in injectionNoteCreateInput.Details)
+        //foreach (var detail in injectionNoteCreateInput.Details)
-        {
+        //{
-            var location = locations.First(p => p.Code == detail.ToLocationCode);
+        //    var location = locations.First(p => p.Code == detail.ToLocationCode);
-            await RemovePackingCodeAndContainerCodeAndLotAsync(detail, location.Type).ConfigureAwait(false); //去箱 去托 去批
+        //    await RemovePackingCodeAndContainerCodeAndLotAsync(detail, location.Type).ConfigureAwait(false); //去箱 去托 去批
 
-            detail.ToLocationArea = location.AreaCode;
+        //    detail.ToLocationArea = location.AreaCode;
-            detail.ToLocationGroup = location.LocationGroupCode;
+        //    detail.ToLocationGroup = location.LocationGroupCode;
-            detail.ToLocationErpCode = location.ErpLocationCode;
+        //    detail.ToLocationErpCode = location.ErpLocationCode;
-            detail.ToWarehouseCode = location.WarehouseCode;
+        //    detail.ToWarehouseCode = location.WarehouseCode;
-        }
+        //}
 
         return injectionNoteCreateInput;
     }
 
     /// <summary>
-    ///     去除箱码 托码 批次
+    ///     判断是不是在最底层 如果不是则把状态变更为等待
     /// </summary>
-    private async Task RemovePackingCodeAndContainerCodeAndLotAsync(InjectionNoteDetailInput injectionNoteDetail,
+    /// <param name="injectionJob"></param>
-        EnumLocationType locationType)
+    /// <returns></returns>
-    {
+    private async Task<bool> IsMinRowAsync(InjectionJob injectionJob)
-        switch (locationType)
-        {
-            case EnumLocationType.WIP:
-            {
-                //用开关控制 发料到线边后去除箱码和托码   ???
-                if (await SettingManager.IsTrueAsync(StoreSettings.Issue.ToWip.IsRemovePackingCode)
-                        .ConfigureAwait(false))
-                {
-                    injectionNoteDetail.ToPackingCode = "";
-                }
-
-                if (await SettingManager.IsTrueAsync(StoreSettings.Issue.ToWip.IsRemoveContainerCode)
-                        .ConfigureAwait(false))
-                {
-                    injectionNoteDetail.ToContainerCode = "";
-                }
-
-                if (await SettingManager.IsTrueAsync(StoreSettings.Issue.ToWip.IsRemoveLot).ConfigureAwait(false))
-                {
-                    injectionNoteDetail.ToLot = "";
-                }
-
-                break;
-            }
-            case EnumLocationType.SEMI:
-            {
-                //用开关控制 发料到后去除箱码和托码   ???
-                if (await SettingManager.IsTrueAsync(StoreSettings.Issue.ToSemi.IsRemovePackingCode)
-                        .ConfigureAwait(false))
-                {
-                    injectionNoteDetail.ToPackingCode = "";
-                }
-
-                if (await SettingManager.IsTrueAsync(StoreSettings.Issue.ToSemi.IsRemoveContainerCode)
-                        .ConfigureAwait(false))
     {
-                    injectionNoteDetail.ToContainerCode = "";
+        var detail = injectionJob.Details.FirstOrDefault();
-                }
 
-                if (await SettingManager.IsTrueAsync(StoreSettings.Issue.ToSemi.IsRemoveLot).ConfigureAwait(false))
+        var loctionDto = await _locationAppService.GetByCodeAsync(detail.RecommendFromLocationCode)
+            .ConfigureAwait(false);
+        if (loctionDto.ColumnCode != 1)
         {
-                    injectionNoteDetail.ToLot = "";
+            return true;
         }
 
-                break;
+        return false;
-            }
-        }
     }
 
     #endregion

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

@@ -148,7 +148,7 @@ public class InjectionRequestEventHandler
             var fromLocationCode = jobDetails[0].RecommendFromLocationCode;
             var fromLocation = await _locationAppService.GetByCodeAsync(fromLocationCode).ConfigureAwait(false);
             var job = jobs.FirstOrDefault(p => p.WorkGroupCode == fromLocation?.WorkGroupCode);
-            if (job == null || job.Details.Any(p => p.ToLocationCode != injectionRequestDetail.ToLocationCode))
+            if (job == null || job.Details.Any(p => p.RecommendToLocationCode != injectionRequestDetail.ToLocationCode))
             {
                 job = await BuildInjectionJobCreateInputWithQtyTypeAsync(injectionRequest, fromLocation)
                     .ConfigureAwait(false);
@@ -303,31 +303,29 @@ public class InjectionRequestEventHandler
 
         var detail = ObjectMapper.Map<BalanceDTO, InjectionJobDetailInput>(balance);
         detail.RequestLocationCode = injectionRequestDetail.ToLocationCode;
-        detail.WorkStation = injectionRequestDetail.WorkStation;
-        detail.ExpiredTime = injectionRequestDetail.ExpiredTime;
         detail.PositionCode = injectionRequestDetail.PositionCode;
         detail.RecommendType = injectionRequestDetail.RecommendType;
 
-        detail.RecommendPackingCode = balance.PackingCode;
+        detail.RecommendFromPackingCode = balance.PackingCode;
-        detail.RecommendContainerCode = balance.ContainerCode;
+        detail.RecommendFromContainerCode = balance.ContainerCode;
-        detail.RecommendSupplierBatch = balance.SupplierBatch;
+        detail.RecommendFromSupplierBatch = balance.SupplierBatch;
-        detail.RecommendProduceDate = balance.ProduceDate;
+        detail.RecommendFromProduceDate = balance.ProduceDate;
-        detail.RecommendExpireDate = balance.ExpireDate;
+        detail.RecommendFromExpireDate = balance.ExpireDate;
-        detail.RecommendLot = balance.Lot;
+        detail.RecommendFromLot = balance.Lot;
-        detail.RecommendProduceDate = balance.ProduceDate;
+        detail.RecommendFromProduceDate = balance.ProduceDate;
-        detail.RecommendArriveDate = balance.ArriveDate;
+        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.RecommendQty = balance.Qty;
+        detail.RecommendFromQty = balance.Qty;
         detail.Uom = balance.Uom;
 
-        detail.ToLocationCode = injectionRequestDetail.ToLocationCode;
+        detail.RecommendToLocationCode = injectionRequestDetail.ToLocationCode;
-        detail.ToLocationErpCode = injectionRequestDetail.ToLocationErpCode;
+        detail.RecommendToLocationErpCode = injectionRequestDetail.ToLocationErpCode;
-        detail.ToLocationArea = injectionRequestDetail.ToLocationArea;
+        detail.RecommendToLocationArea = injectionRequestDetail.ToLocationArea;
-        detail.ToWarehouseCode = injectionRequestDetail.ToWarehouseCode;
+        detail.RecommendToWarehouseCode = injectionRequestDetail.ToWarehouseCode;
 
         //detail.ProdLine = prodLine == null ? toLocationGroupCode : prodLine.Code;
         detail.ProdLine = toLocationGroupCode;
@@ -392,7 +390,8 @@ public class InjectionRequestEventHandler
             };
             var usableList = await _balanceAppService.GetUsableListAsync(input).ConfigureAwait(false);
             usableList = usableList.Where(p => !useBalanceList.Contains(p.PackingCode)).ToList();
-
+            if (usableList.Any())
+            {
                 for (var i = 0; i < sumBoxQty; i++)
                 {
                     var firstUsable = usableList.First();
@@ -407,6 +406,7 @@ public class InjectionRequestEventHandler
                     inputJobs.Add(injectionJobEditInput);
                 }
             }
+        }
 
         return inputJobs;
     }
@@ -422,8 +422,7 @@ public class InjectionRequestEventHandler
         InjectionRequest injectionRequest,
         InjectionRequestDetail injectionRequestDetail, BalanceDTO balanceDtos)
     {
-        InjectionJobEditInput job;
+        InjectionJobEditInput job = ObjectMapper.Map<InjectionRequest, InjectionJobEditInput>(injectionRequest);
-        job = ObjectMapper.Map<InjectionRequest, InjectionJobEditInput>(injectionRequest);
         job.JobType = EnumJobType.IssueJob;
         job.JobStatus = EnumJobStatus.Open;
         job.WorkGroupCode = injectionRequestDetail.ToLocationGroup;
@@ -450,36 +449,56 @@ public class InjectionRequestEventHandler
     private async Task<InjectionJobDetailInput> BuildInjectionJobDetailWithBoxQtyTypeAsync(
         InjectionRequestDetail injectionRequestDetail, BalanceDTO balance)
     {
-        var detail = ObjectMapper.Map<BalanceDTO, InjectionJobDetailInput>(balance);
+        var detail = new InjectionJobDetailInput();
         detail.RequestLocationCode = injectionRequestDetail.ToLocationCode;
-        detail.WorkStation = injectionRequestDetail.WorkStation;
-        detail.ExpiredTime = injectionRequestDetail.ExpiredTime;
         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.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.RecommendPackingCode = balance.PackingCode;
-        detail.RecommendContainerCode = balance.ContainerCode;
-        detail.RecommendSupplierBatch = balance.SupplierBatch;
-        detail.RecommendProduceDate = balance.ProduceDate;
-        detail.RecommendExpireDate = balance.ExpireDate;
-        detail.RecommendLot = balance.Lot;
-        detail.RecommendProduceDate = balance.ProduceDate;
-        detail.RecommendArriveDate = balance.ArriveDate;
         detail.RecommendFromLocationArea = balance.LocationArea;
         detail.RecommendFromLocationCode = balance.LocationCode;
         detail.RecommendFromLocationErpCode = balance.LocationErpCode;
         detail.RecommendFromLocationGroup = balance.LocationGroup;
         detail.RecommendFromWarehouseCode = balance.WarehouseCode;
-        detail.RecommendQty = balance.Qty;
-        detail.Uom = balance.Uom;
 
-        detail.ToLocationCode = injectionRequestDetail.ToLocationCode;
+        detail.RecommendToPackingCode = balance.PackingCode;
-        detail.ToLocationErpCode = injectionRequestDetail.ToLocationErpCode;
+        detail.RecommendToContainerCode = balance.ContainerCode;
-        detail.ToLocationArea = injectionRequestDetail.ToLocationArea;
+        detail.RecommendToLot = balance.Lot;
-        detail.ToWarehouseCode = injectionRequestDetail.ToWarehouseCode;
+
-        detail.ToLocationGroup= injectionRequestDetail.ToLocationGroup;
+        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;
 
-        detail.ProdLine = injectionRequestDetail.ToLocationCode;
         await Task.CompletedTask.ConfigureAwait(false);
         return detail;
     }