更新

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ContainerNotes/ContainerNotePermissions.cs

@@ -10,18 +10,17 @@ public static class ContainerNotePermissions
     public const string Update = Default + "." + StorePermissions.UpdateStr;
     public const string Delete = Default + "." + StorePermissions.DeleteStr;
 
-    
     //器具呼叫记录
-    public const string ContainerNote = StorePermissions.GroupName + "." + nameof(ContainerNote);
+    public const string AutoContainerNote = StorePermissions.GroupName + "." + nameof(AutoContainerNote);
 
     public static void AddContainerNotePermission(this PermissionGroupDefinition permissionGroup)
     {
-        var ContainerNotePermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(ContainerNote)));
+        var containerNotePermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(ContainerNote)));
-        ContainerNotePermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr));
+        containerNotePermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr));
-        ContainerNotePermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr));
+        containerNotePermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr));
-        ContainerNotePermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr));
+        containerNotePermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr));
 
-        permissionGroup.AddPermission(ContainerNote, StorePermissionDefinitionProvider.L(nameof(ContainerNote)));
+        permissionGroup.AddPermission(AutoContainerNote, StorePermissionDefinitionProvider.L(nameof(AutoContainerNote)));
 
     }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/DTOs/AssembleRequestDTO.cs

@@ -10,12 +10,6 @@ public class AssembleRequestDTO : SfsStoreRequestDTOBase<AssembleRequestDetailDT
     [Display(Name = "叫料类型")]
     public string Type { get; set; }
 
-    /// <summary>
-    ///     生产线
-    /// </summary>
-    [Display(Name = "生产线")]
-    public string ProdLine { get; set; }
-
     /// <summary>
     ///     是否使用在途库
     /// </summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/DTOs/AssembleRequestDetailDTO.cs

@@ -47,4 +47,10 @@ public class AssembleRequestDetailDTO : SfsStoreDetailWithQtyDTOBase
     [NotMapped]
     public decimal NotFinishQty => Qty - ReceivedQty;
 
+    /// <summary>
+    /// 需求箱数量
+    /// </summary>
+    [Display(Name = "需求箱数量")]
+    public decimal BoxQty { get; set; }
+
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/Inputs/AssembleRequestDetailInput.cs

@@ -7,6 +7,8 @@ namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
 public class AssembleRequestDetailInput : SfsStoreDetailWithQtyInputBase
 {
+    #region 目标库位信息
+
     /// <summary>
     /// 目标库位
     /// </summary>
@@ -15,43 +17,43 @@ public class AssembleRequestDetailInput : SfsStoreDetailWithQtyInputBase
     public string ToLocationCode { get; set; }
 
     /// <summary>
-    /// 来源库区
+    /// 目标库区
     /// </summary>
-    [Display(Name = "来源库区")]
+    [Display(Name = "目标库区")]
-    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string ToLocationArea { get; set; }
-    public string FromLocationArea { get; set; }
 
     /// <summary>
-    /// 生产线
+    /// 目标库位组
     /// </summary>
-    [Display(Name = "生产线")]
+    [Display(Name = "目标库位组")]
-    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string ToLocationGroup { get; set; }
-    public string ProdLine { get; set; }
 
     /// <summary>
-    /// 工作中心
+    /// 目标ERP储位
     /// </summary>
-    [Display(Name = "工作中心")]
+    [Display(Name = "目标ERP储位")]
-    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string ToLocationErpCode { get; set; }
-    public string WorkStation { get; set; }
 
     /// <summary>
-    /// 过期时间
+    /// 目标仓库
     /// </summary>
-    [Display(Name = "过期时间")]
+    [Display(Name = "目标仓库")]
-    public DateTime ExpiredTime { get; set; }
+    public string ToWarehouseCode { get; set; }
+
+    #endregion
 
     /// <summary>
-    /// 状态
+    /// 生产线
     /// </summary>
-    [Display(Name = "状态")]
+    [Display(Name = "生产线")]
-    public EnumRequestStatus RequestStatus { get; set; } = EnumRequestStatus.New;
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string ProdLine { get; set; }
 
     /// <summary>
-    /// ERP储位
+    /// 状态
     /// </summary>
-    [Display(Name = "ERP储位")]
+    [Display(Name = "状态")]
-    public string ToLocationErpCode { get; set; }
+    public EnumRequestStatus RequestStatus { get; set; } = EnumRequestStatus.New;
 
     /// <summary>
     /// 已发数量
@@ -81,5 +83,9 @@ public class AssembleRequestDetailInput : SfsStoreDetailWithQtyInputBase
     /// </summary>
     public EnumRecommendType RecommendType { get; set; }
 
-
+    /// <summary>
+    /// 需求箱数量
+    /// </summary>
+    [Display(Name = "需求箱数量")]
+    public decimal BoxQty { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/Inputs/AssembleRequestEditInput.cs

@@ -7,34 +7,6 @@ namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 public class AssembleRequestEditInput : SfsStoreRequestCreateOrUpdateInputBase
 {
     #region Base   
-    /// <summary>
-    /// 车间
-    /// </summary>
-    [Display(Name = "车间")]
-    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
-    public string Workshop { get; set; }
-
-    /// <summary>
-    /// 生产线
-    /// </summary>
-    [Display(Name = "生产线")]
-    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
-    public string ProdLine { get; set; }
-
-    /// <summary>
-    /// 使用在途库
-    /// </summary>
-    [Display(Name = "使用在途库")]
-    public bool UseOnTheWayLocation { get; set; }
-    #endregion
-
-    #region Create
-    /// <summary>
-    /// 要货单号
-    /// </summary>
-    [Display(Name = "要货单号")]
-    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
-    public string Number { get; set; }
 
     /// <summary>
     /// 叫料类型
@@ -43,16 +15,19 @@ public class AssembleRequestEditInput : SfsStoreRequestCreateOrUpdateInputBase
     public string Type { get; set; }
 
     /// <summary>
-    /// 备料计划单号
+    /// 使用在途库
     /// </summary>
-    [Display(Name = "备料计划单号")]
+    [Display(Name = "使用在途库")]
-    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public bool UseOnTheWayLocation { get; set; }
-    public string PreparationPlanNumber { get; set; }
 
     /// <summary>
     /// 明细列表
     /// </summary>
     [Display(Name = "明细列表")]
-    public List<AssembleRequestDetailInput> Details { get; set; } = new List<AssembleRequestDetailInput>();
+    public List<InjectionRequestDetailInput> Details { get; set; } = new List<InjectionRequestDetailInput>();
+    #endregion
+
+    #region Create  
+
     #endregion
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/Inputs/AssembleRequestImportInput.cs

@@ -7,6 +7,7 @@ namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 [Display(Name = "叫料申请")]
 public class AssembleRequestImportInput : SfsStoreImportInputBase
 {
+
     /// <summary>
     /// 叫料类型
     /// </summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestDTO.cs

@@ -6,33 +6,30 @@ namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests;
 public class CoatingMaterialRequestDTO : SfsStoreRequestDTOBase<CoatingMaterialRequestDetailDTO>, IHasNumber
 {
     /// <summary>
-    /// 叫料类型
+    ///     叫料类型
     /// </summary>
     [Display(Name = "叫料类型")]
     public string Type { get; set; }
 
     /// <summary>
-    /// 备料计划单号
+    ///     是否使用在途库
     /// </summary>
-    [Display(Name = "备料计划单号")]
+    [Display(Name = "是否使用在途库")]
-    public string PreparationPlanNumber { get; set; }
+    public bool IsUseOnTheWayLocation { get; set; }
 
     /// <summary>
-    /// 生产线
+    ///     可用来源库位Json集合
     /// </summary>
-    [Display(Name = "生产线")]
+    public string FromLocationCodeJsonList { get; set; }
-    public string ProdLine { get; set; }
 
     /// <summary>
-    /// 车间
+    ///     叫料库位
     /// </summary>
-    [Display(Name = "车间")]
+    public string ToLocationCode { get; set; }
-    public string Workshop { get; set; }
 
     /// <summary>
-    /// 使用在途库
+    ///     目标ERP储位
     /// </summary>
-    [Display(Name = "使用在途库")]
+    [Display(Name = "目标ERP储位")]
-    public bool UseOnTheWayLocation { get; set; }
+    public string ToLocationErpCode { get; set; }
-
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestDetailDTO.cs

@@ -10,49 +10,6 @@ namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests;
 public class CoatingMaterialRequestDetailDTO : SfsStoreDetailWithQtyDTOBase
 
 {
-
-    /// <summary>
-    /// 目标库位
-    /// </summary>
-    [Display(Name = "目标库位")]
-    public string ToLocationCode { get; set; }
-
-    /// <summary>
-    /// 来源库区
-    /// </summary>
-    [Display(Name = "来源库区")]
-    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
-    public string FromLocationArea { get; set; }
-
-    // /// <summary>
-    // /// 在途库库位
-    // /// </summary>
-    // public string OnTheWayLocationCode { get; set; }
-
-    /// <summary>
-    /// 生产线
-    /// </summary>
-    [Display(Name = "生产线")]
-    public string ProdLine { get; set; }
-
-    /// <summary>
-    /// 工作中心
-    /// </summary>
-    [Display(Name = "工作中心")]
-    public string WorkStation { get; set; }
-
-    /// <summary>
-    /// 过期时间
-    /// </summary>
-    [Display(Name = "过期时间")]
-    public DateTime ExpiredTime { get; set; }
-
-    /// <summary>
-    /// 目标ERP储位
-    /// </summary>
-    [Display(Name = "目标ERP储位")]
-    public string ToLocationErpCode { get; set; }
-
     /// <summary>
     /// 已发数量
     /// </summary>
@@ -92,4 +49,10 @@ public class CoatingMaterialRequestDetailDTO : SfsStoreDetailWithQtyDTOBase
     [NotMapped]
     public decimal NotFinishQty => Qty - ReceivedQty;
 
+    /// <summary>
+    /// 需求箱数量
+    /// </summary>
+    [Display(Name = "需求箱数量")]
+    public decimal BoxQty { get; set; }
+
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestDetailInput.cs

@@ -8,6 +8,8 @@ namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests;
 
 public class CoatingMaterialRequestDetailInput : SfsStoreDetailWithQtyInputBase
 {
+    #region 目标库位信息
+
     /// <summary>
     /// 目标库位
     /// </summary>
@@ -16,43 +18,43 @@ public class CoatingMaterialRequestDetailInput : SfsStoreDetailWithQtyInputBase
     public string ToLocationCode { get; set; }
 
     /// <summary>
-    /// 来源库区
+    /// 目标库区
     /// </summary>
-    [Display(Name = "来源库区")]
+    [Display(Name = "目标库区")]
-    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string ToLocationArea { get; set; }
-    public string FromLocationArea { get; set; }
 
     /// <summary>
-    /// 生产线
+    /// 目标库位组
     /// </summary>
-    [Display(Name = "生产线")]
+    [Display(Name = "目标库位组")]
-    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string ToLocationGroup { get; set; }
-    public string ProdLine { get; set; }
 
     /// <summary>
-    /// 工作中心
+    /// 目标ERP储位
     /// </summary>
-    [Display(Name = "工作中心")]
+    [Display(Name = "目标ERP储位")]
-    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string ToLocationErpCode { get; set; }
-    public string WorkStation { get; set; }
 
     /// <summary>
-    /// 过期时间
+    /// 目标仓库
     /// </summary>
-    [Display(Name = "过期时间")]
+    [Display(Name = "目标仓库")]
-    public DateTime ExpiredTime { get; set; }
+    public string ToWarehouseCode { get; set; }
+
+    #endregion
 
     /// <summary>
-    /// 状态
+    /// 生产线
     /// </summary>
-    [Display(Name = "状态")]
+    [Display(Name = "生产线")]
-    public EnumRequestStatus RequestStatus { get; set; } = EnumRequestStatus.New;
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string ProdLine { get; set; }
 
     /// <summary>
-    /// ERP储位
+    /// 状态
     /// </summary>
-    [Display(Name = "ERP储位")]
+    [Display(Name = "状态")]
-    public string ToLocationErpCode { get; set; }
+    public EnumRequestStatus RequestStatus { get; set; } = EnumRequestStatus.New;
 
     /// <summary>
     /// 已发数量
@@ -82,5 +84,9 @@ public class CoatingMaterialRequestDetailInput : SfsStoreDetailWithQtyInputBase
     /// </summary>
     public EnumRecommendType RecommendType { get; set; }
 
-
+    /// <summary>
+    /// 需求箱数量
+    /// </summary>
+    [Display(Name = "需求箱数量")]
+    public decimal BoxQty { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestEditInput.cs

@@ -8,34 +8,6 @@ namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests;
 public class CoatingMaterialRequestEditInput : SfsStoreRequestCreateOrUpdateInputBase
 {
     #region Base   
-    /// <summary>
-    /// 车间
-    /// </summary>
-    [Display(Name = "车间")]
-    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
-    public string Workshop { get; set; }
-
-    /// <summary>
-    /// 生产线
-    /// </summary>
-    [Display(Name = "生产线")]
-    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
-    public string ProdLine { get; set; }
-
-    /// <summary>
-    /// 使用在途库
-    /// </summary>
-    [Display(Name = "使用在途库")]
-    public bool UseOnTheWayLocation { get; set; }
-    #endregion
-
-    #region Create
-    /// <summary>
-    /// 要货单号
-    /// </summary>
-    [Display(Name = "要货单号")]
-    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
-    public string Number { get; set; }
 
     /// <summary>
     /// 叫料类型
@@ -44,16 +16,19 @@ public class CoatingMaterialRequestEditInput : SfsStoreRequestCreateOrUpdateInpu
     public string Type { get; set; }
 
     /// <summary>
-    /// 备料计划单号
+    /// 使用在途库
     /// </summary>
-    [Display(Name = "备料计划单号")]
+    [Display(Name = "使用在途库")]
-    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public bool UseOnTheWayLocation { get; set; }
-    public string PreparationPlanNumber { get; set; }
 
     /// <summary>
     /// 明细列表
     /// </summary>
     [Display(Name = "明细列表")]
-    public List<CoatingMaterialRequestDetailInput> Details { get; set; } = new List<CoatingMaterialRequestDetailInput>();
+    public List<InjectionRequestDetailInput> Details { get; set; } = new List<InjectionRequestDetailInput>();
+    #endregion
+
+    #region Create  
+
     #endregion
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestImportInput.cs

@@ -8,6 +8,7 @@ namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests;
 [Display(Name = "叫料申请")]
 public class CoatingMaterialRequestImportInput : SfsStoreImportInputBase
 {
+
     /// <summary>
     /// 叫料类型
     /// </summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/ICoatingMaterialRequestAppService.cs

@@ -12,11 +12,6 @@ public interface ICoatingMaterialRequestAppService
 {
     Task<CoatingMaterialRequestDTO> CreateAndHandleAsync(CoatingMaterialRequestEditInput input);
        
-    /// <summary>
-    /// 根据备料计划生成 叫料请求
-    /// </summary>
-    /// <returns></returns>
-    Task<CoatingMaterialRequestDTO> CreateAndHandleByPreparationPlan(string productionPlanNumber);
 
     Task<CoatingMaterialRequestDTO> CreateAndHandleByAPIAsync(CoatingMaterialRequestEditInput input);
 

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

@@ -8,25 +8,26 @@ public class InjectionRequestEditInput : SfsStoreRequestCreateOrUpdateInputBase
 {
     #region Base   
 
-    /// <summary>
-    /// 使用在途库
-    /// </summary>
-    [Display(Name = "使用在途库")]
-    public bool UseOnTheWayLocation { get; set; }
-    #endregion
-
-    #region Create   
-
     /// <summary>
     /// 叫料类型
     /// </summary>
     [Display(Name = "叫料类型")]
     public string Type { get; set; }
 
+    /// <summary>
+    /// 使用在途库
+    /// </summary>
+    [Display(Name = "使用在途库")]
+    public bool UseOnTheWayLocation { get; set; }    
+
     /// <summary>
     /// 明细列表
     /// </summary>
     [Display(Name = "明细列表")]
     public List<InjectionRequestDetailInput> Details { get; set; } = new List<InjectionRequestDetailInput>();
     #endregion
+
+    #region Create  
+
+    #endregion
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestAppService.cs

@@ -166,7 +166,7 @@ public class CoatingMaterialRequestAppService : SfsStoreRequestAppServiceBase<Co
         {
             var location = await LocationAclService.GetByCodeAsync(item.ToLocationCode).ConfigureAwait(false);
             item.ProdLine = location.LocationGroupCode;
-            input.ProdLine = location.LocationGroupCode;
+           
         }
 
         var entity = ObjectMapper.Map<CoatingMaterialRequestEditInput, CoatingMaterialRequest>(input);
@@ -270,7 +270,7 @@ public class CoatingMaterialRequestAppService : SfsStoreRequestAppServiceBase<Co
 
             var location = await LocationAclService.GetByCodeAsync(detailInput.ToLocationCode).ConfigureAwait(false);
             detailInput.ProdLine = location.LocationGroupCode;
-            input.ProdLine = location.LocationGroupCode;
+            
             input.Worker = input.Worker;
         }
 
@@ -289,38 +289,6 @@ public class CoatingMaterialRequestAppService : SfsStoreRequestAppServiceBase<Co
         return dto;
     }
 
-    /// <summary>
-    ///     根据备料计划生成 叫料请求
-    /// </summary>
-    /// <returns></returns>
-    [HttpPost("create-and-handle-by-preparation-plan/{number}")]
-    public virtual async Task<CoatingMaterialRequestDTO> CreateAndHandleByPreparationPlan(string number)
-    {
-        var prodPreparationPlan = await _preparationPlanManager.GetByNumberAsync(number).ConfigureAwait(false);
-
-        var materialRequestCreateInput = new CoatingMaterialRequestEditInput { Worker = CurrentUser.GetUserName() };
-
-        foreach (var preparationPlanDetail in prodPreparationPlan.Details)
-        {
-            var detail = new CoatingMaterialRequestDetailInput
-            {
-                ItemCode = preparationPlanDetail.ItemCode,
-                ItemName = preparationPlanDetail.ItemName,
-                ItemDesc1 = preparationPlanDetail.ItemDesc1,
-                ItemDesc2 = preparationPlanDetail.ItemDesc2,
-                Uom = preparationPlanDetail.Uom,
-                Qty = preparationPlanDetail.Qty,
-                StdPackQty = preparationPlanDetail.StdPackQty,
-                ToLocationCode = preparationPlanDetail.ToLocationCode
-            };
-
-            materialRequestCreateInput.Details.Add(detail);
-        }
-
-        var dto = await CreateAndHandleAsync(materialRequestCreateInput).ConfigureAwait(false);
-
-        return dto;
-    }      
     
     /// <summary>
     ///     根据类型获取叫料请求