From fa042421f931bc45d4d56f93a399efad099eb2f8 Mon Sep 17 00:00:00 2001 From: zhouhongjun <565221961@qq.com> Date: Tue, 16 Apr 2024 10:25:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ContainerNotePermissions.cs | 15 +++--- .../DTOs/AssembleRequestDTO.cs | 6 --- .../DTOs/AssembleRequestDetailDTO.cs | 6 +++ .../Inputs/AssembleRequestDetailInput.cs | 50 +++++++++++-------- .../Inputs/AssembleRequestEditInput.cs | 43 ++++------------ .../Inputs/AssembleRequestImportInput.cs | 1 + .../CoatingMaterialRequestDTO.cs | 25 ++++------ .../CoatingMaterialRequestDetailDTO.cs | 49 +++--------------- .../CoatingMaterialRequestDetailInput.cs | 50 +++++++++++-------- .../CoatingMaterialRequestEditInput.cs | 43 ++++------------ .../CoatingMaterialRequestImportInput.cs | 1 + .../ICoatingMaterialRequestAppService.cs | 7 +-- .../Inputs/InjectionRequestEditInput.cs | 19 +++---- .../CoatingMaterialRequestAppService.cs | 38 ++------------ 14 files changed, 120 insertions(+), 233 deletions(-) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ContainerNotes/ContainerNotePermissions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ContainerNotes/ContainerNotePermissions.cs index 6b08a7689..7ffc5db5c 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ContainerNotes/ContainerNotePermissions.cs +++ b/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))); - ContainerNotePermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr)); - ContainerNotePermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr)); - ContainerNotePermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr)); - - permissionGroup.AddPermission(ContainerNote, StorePermissionDefinitionProvider.L(nameof(ContainerNote))); + var containerNotePermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(ContainerNote))); + containerNotePermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr)); + containerNotePermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr)); + containerNotePermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr)); + + permissionGroup.AddPermission(AutoContainerNote, StorePermissionDefinitionProvider.L(nameof(AutoContainerNote))); } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/DTOs/AssembleRequestDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/DTOs/AssembleRequestDTO.cs index 7582d35a7..75aa1d02d 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/DTOs/AssembleRequestDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/DTOs/AssembleRequestDTO.cs @@ -10,12 +10,6 @@ public class AssembleRequestDTO : SfsStoreRequestDTOBase - /// 生产线 - /// - [Display(Name = "生产线")] - public string ProdLine { get; set; } - /// /// 是否使用在途库 /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/DTOs/AssembleRequestDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/DTOs/AssembleRequestDetailDTO.cs index 71a9dbcf0..a0931f6e2 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/DTOs/AssembleRequestDetailDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/DTOs/AssembleRequestDetailDTO.cs @@ -47,4 +47,10 @@ public class AssembleRequestDetailDTO : SfsStoreDetailWithQtyDTOBase [NotMapped] public decimal NotFinishQty => Qty - ReceivedQty; + /// + /// 需求箱数量 + /// + [Display(Name = "需求箱数量")] + public decimal BoxQty { get; set; } + } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/Inputs/AssembleRequestDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/Inputs/AssembleRequestDetailInput.cs index befe44e2f..1e859f910 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/Inputs/AssembleRequestDetailInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/Inputs/AssembleRequestDetailInput.cs @@ -7,6 +7,8 @@ namespace Win_in.Sfs.Wms.Store.Application.Contracts; public class AssembleRequestDetailInput : SfsStoreDetailWithQtyInputBase { + #region 目标库位信息 + /// /// 目标库位 /// @@ -15,43 +17,43 @@ public class AssembleRequestDetailInput : SfsStoreDetailWithQtyInputBase public string ToLocationCode { get; set; } /// - /// 来源库区 + /// 目标库区 /// - [Display(Name = "来源库区")] - [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] - public string FromLocationArea { get; set; } + [Display(Name = "目标库区")] + public string ToLocationArea { get; set; } /// - /// 生产线 + /// 目标库位组 /// - [Display(Name = "生产线")] - [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] - public string ProdLine { get; set; } + [Display(Name = "目标库位组")] + public string ToLocationGroup { get; set; } /// - /// 工作中心 + /// 目标ERP储位 /// - [Display(Name = "工作中心")] - [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] - public string WorkStation { get; set; } + [Display(Name = "目标ERP储位")] + public string ToLocationErpCode { get; set; } /// - /// 过期时间 + /// 目标仓库 /// - [Display(Name = "过期时间")] - public DateTime ExpiredTime { get; set; } + [Display(Name = "目标仓库")] + public string ToWarehouseCode { get; set; } + + #endregion /// - /// 状态 + /// 生产线 /// - [Display(Name = "状态")] - public EnumRequestStatus RequestStatus { get; set; } = EnumRequestStatus.New; + [Display(Name = "生产线")] + [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] + public string ProdLine { get; set; } /// - /// ERP储位 + /// 状态 /// - [Display(Name = "ERP储位")] - public string ToLocationErpCode { get; set; } + [Display(Name = "状态")] + public EnumRequestStatus RequestStatus { get; set; } = EnumRequestStatus.New; /// /// 已发数量 @@ -81,5 +83,9 @@ public class AssembleRequestDetailInput : SfsStoreDetailWithQtyInputBase /// public EnumRecommendType RecommendType { get; set; } - + /// + /// 需求箱数量 + /// + [Display(Name = "需求箱数量")] + public decimal BoxQty { get; set; } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/Inputs/AssembleRequestEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/Inputs/AssembleRequestEditInput.cs index 2dbba1a36..c89acfc30 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/Inputs/AssembleRequestEditInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/Inputs/AssembleRequestEditInput.cs @@ -6,35 +6,7 @@ namespace Win_in.Sfs.Wms.Store.Application.Contracts; public class AssembleRequestEditInput : SfsStoreRequestCreateOrUpdateInputBase { - #region Base - /// - /// 车间 - /// - [Display(Name = "车间")] - [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] - public string Workshop { get; set; } - - /// - /// 生产线 - /// - [Display(Name = "生产线")] - [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] - public string ProdLine { get; set; } - - /// - /// 使用在途库 - /// - [Display(Name = "使用在途库")] - public bool UseOnTheWayLocation { get; set; } - #endregion - - #region Create - /// - /// 要货单号 - /// - [Display(Name = "要货单号")] - [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] - public string Number { get; set; } + #region Base /// /// 叫料类型 @@ -43,16 +15,19 @@ public class AssembleRequestEditInput : SfsStoreRequestCreateOrUpdateInputBase public string Type { get; set; } /// - /// 备料计划单号 + /// 使用在途库 /// - [Display(Name = "备料计划单号")] - [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] - public string PreparationPlanNumber { get; set; } + [Display(Name = "使用在途库")] + public bool UseOnTheWayLocation { get; set; } /// /// 明细列表 /// [Display(Name = "明细列表")] - public List Details { get; set; } = new List(); + public List Details { get; set; } = new List(); + #endregion + + #region Create + #endregion } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/Inputs/AssembleRequestImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/Inputs/AssembleRequestImportInput.cs index d5fe8bc84..3d637b4f5 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/Inputs/AssembleRequestImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/Inputs/AssembleRequestImportInput.cs @@ -7,6 +7,7 @@ namespace Win_in.Sfs.Wms.Store.Application.Contracts; [Display(Name = "叫料申请")] public class AssembleRequestImportInput : SfsStoreImportInputBase { + /// /// 叫料类型 /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestDTO.cs index 8417f1a70..6926849da 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestDTO.cs +++ b/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, IHasNumber { /// - /// 叫料类型 + /// 叫料类型 /// [Display(Name = "叫料类型")] public string Type { get; set; } /// - /// 备料计划单号 + /// 是否使用在途库 /// - [Display(Name = "备料计划单号")] - public string PreparationPlanNumber { get; set; } + [Display(Name = "是否使用在途库")] + public bool IsUseOnTheWayLocation { get; set; } /// - /// 生产线 + /// 可用来源库位Json集合 /// - [Display(Name = "生产线")] - public string ProdLine { get; set; } + public string FromLocationCodeJsonList { get; set; } /// - /// 车间 + /// 叫料库位 /// - [Display(Name = "车间")] - public string Workshop { get; set; } + public string ToLocationCode { get; set; } /// - /// 使用在途库 + /// 目标ERP储位 /// - [Display(Name = "使用在途库")] - public bool UseOnTheWayLocation { get; set; } - + [Display(Name = "目标ERP储位")] + public string ToLocationErpCode { get; set; } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestDetailDTO.cs index 578944333..f1caa1b83 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestDetailDTO.cs +++ b/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 { - - /// - /// 目标库位 - /// - [Display(Name = "目标库位")] - public string ToLocationCode { get; set; } - - /// - /// 来源库区 - /// - [Display(Name = "来源库区")] - [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] - public string FromLocationArea { get; set; } - - // /// - // /// 在途库库位 - // /// - // public string OnTheWayLocationCode { get; set; } - - /// - /// 生产线 - /// - [Display(Name = "生产线")] - public string ProdLine { get; set; } - - /// - /// 工作中心 - /// - [Display(Name = "工作中心")] - public string WorkStation { get; set; } - - /// - /// 过期时间 - /// - [Display(Name = "过期时间")] - public DateTime ExpiredTime { get; set; } - - /// - /// 目标ERP储位 - /// - [Display(Name = "目标ERP储位")] - public string ToLocationErpCode { get; set; } - /// /// 已发数量 /// @@ -92,4 +49,10 @@ public class CoatingMaterialRequestDetailDTO : SfsStoreDetailWithQtyDTOBase [NotMapped] public decimal NotFinishQty => Qty - ReceivedQty; + /// + /// 需求箱数量 + /// + [Display(Name = "需求箱数量")] + public decimal BoxQty { get; set; } + } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestDetailInput.cs index ffdffd63b..9ffc4ca40 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestDetailInput.cs +++ b/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 目标库位信息 + /// /// 目标库位 /// @@ -16,43 +18,43 @@ public class CoatingMaterialRequestDetailInput : SfsStoreDetailWithQtyInputBase public string ToLocationCode { get; set; } /// - /// 来源库区 + /// 目标库区 /// - [Display(Name = "来源库区")] - [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] - public string FromLocationArea { get; set; } + [Display(Name = "目标库区")] + public string ToLocationArea { get; set; } /// - /// 生产线 + /// 目标库位组 /// - [Display(Name = "生产线")] - [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] - public string ProdLine { get; set; } + [Display(Name = "目标库位组")] + public string ToLocationGroup { get; set; } /// - /// 工作中心 + /// 目标ERP储位 /// - [Display(Name = "工作中心")] - [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] - public string WorkStation { get; set; } + [Display(Name = "目标ERP储位")] + public string ToLocationErpCode { get; set; } /// - /// 过期时间 + /// 目标仓库 /// - [Display(Name = "过期时间")] - public DateTime ExpiredTime { get; set; } + [Display(Name = "目标仓库")] + public string ToWarehouseCode { get; set; } + + #endregion /// - /// 状态 + /// 生产线 /// - [Display(Name = "状态")] - public EnumRequestStatus RequestStatus { get; set; } = EnumRequestStatus.New; + [Display(Name = "生产线")] + [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] + public string ProdLine { get; set; } /// - /// ERP储位 + /// 状态 /// - [Display(Name = "ERP储位")] - public string ToLocationErpCode { get; set; } + [Display(Name = "状态")] + public EnumRequestStatus RequestStatus { get; set; } = EnumRequestStatus.New; /// /// 已发数量 @@ -82,5 +84,9 @@ public class CoatingMaterialRequestDetailInput : SfsStoreDetailWithQtyInputBase /// public EnumRecommendType RecommendType { get; set; } - + /// + /// 需求箱数量 + /// + [Display(Name = "需求箱数量")] + public decimal BoxQty { get; set; } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestEditInput.cs index cd9a306fe..94578eb49 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestEditInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestEditInput.cs @@ -7,35 +7,7 @@ namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests; public class CoatingMaterialRequestEditInput : SfsStoreRequestCreateOrUpdateInputBase { - #region Base - /// - /// 车间 - /// - [Display(Name = "车间")] - [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] - public string Workshop { get; set; } - - /// - /// 生产线 - /// - [Display(Name = "生产线")] - [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] - public string ProdLine { get; set; } - - /// - /// 使用在途库 - /// - [Display(Name = "使用在途库")] - public bool UseOnTheWayLocation { get; set; } - #endregion - - #region Create - /// - /// 要货单号 - /// - [Display(Name = "要货单号")] - [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] - public string Number { get; set; } + #region Base /// /// 叫料类型 @@ -44,16 +16,19 @@ public class CoatingMaterialRequestEditInput : SfsStoreRequestCreateOrUpdateInpu public string Type { get; set; } /// - /// 备料计划单号 + /// 使用在途库 /// - [Display(Name = "备料计划单号")] - [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] - public string PreparationPlanNumber { get; set; } + [Display(Name = "使用在途库")] + public bool UseOnTheWayLocation { get; set; } /// /// 明细列表 /// [Display(Name = "明细列表")] - public List Details { get; set; } = new List(); + public List Details { get; set; } = new List(); + #endregion + + #region Create + #endregion } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestImportInput.cs index 53b7a3da1..345975e85 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestImportInput.cs +++ b/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 { + /// /// 叫料类型 /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/ICoatingMaterialRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/ICoatingMaterialRequestAppService.cs index 5caa7b60c..c34757dc4 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/ICoatingMaterialRequestAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/ICoatingMaterialRequestAppService.cs @@ -11,12 +11,7 @@ public interface ICoatingMaterialRequestAppService { Task CreateAndHandleAsync(CoatingMaterialRequestEditInput input); - - /// - /// 根据备料计划生成 叫料请求 - /// - /// - Task CreateAndHandleByPreparationPlan(string productionPlanNumber); + Task CreateAndHandleByAPIAsync(CoatingMaterialRequestEditInput input); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionRequests/Inputs/InjectionRequestEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionRequests/Inputs/InjectionRequestEditInput.cs index 7df467797..9228ec8ea 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionRequests/Inputs/InjectionRequestEditInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionRequests/Inputs/InjectionRequestEditInput.cs @@ -9,19 +9,16 @@ public class InjectionRequestEditInput : SfsStoreRequestCreateOrUpdateInputBase #region Base /// - /// 使用在途库 + /// 叫料类型 /// - [Display(Name = "使用在途库")] - public bool UseOnTheWayLocation { get; set; } - #endregion - - #region Create + [Display(Name = "叫料类型")] + public string Type { get; set; } /// - /// 叫料类型 + /// 使用在途库 /// - [Display(Name = "叫料类型")] - public string Type { get; set; } + [Display(Name = "使用在途库")] + public bool UseOnTheWayLocation { get; set; } /// /// 明细列表 @@ -29,4 +26,8 @@ public class InjectionRequestEditInput : SfsStoreRequestCreateOrUpdateInputBase [Display(Name = "明细列表")] public List Details { get; set; } = new List(); #endregion + + #region Create + + #endregion } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestAppService.cs index a36dc70e0..eb0fd7ac0 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestAppService.cs @@ -166,7 +166,7 @@ public class CoatingMaterialRequestAppService : SfsStoreRequestAppServiceBase(input); @@ -270,7 +270,7 @@ public class CoatingMaterialRequestAppService : SfsStoreRequestAppServiceBase - /// 根据备料计划生成 叫料请求 - /// - /// - [HttpPost("create-and-handle-by-preparation-plan/{number}")] - public virtual async Task 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; - } - + /// /// 根据类型获取叫料请求 ///