diff --git a/MDM/Controllers/Process/ProcessOperationController.cs b/MDM/Controllers/Process/ProcessOperationController.cs index 22f2239..70bba3a 100644 --- a/MDM/Controllers/Process/ProcessOperationController.cs +++ b/MDM/Controllers/Process/ProcessOperationController.cs @@ -51,7 +51,7 @@ namespace MDM.Controllers.Process /// - /// 查询工序详情 + /// 查询工序详情 包括工序绑定的流程和工艺参数数采等 /// /// /// diff --git a/MDM/Models/Process/Dto/ProcessOperationDto.cs b/MDM/Models/Process/Dto/ProcessOperationDto.cs index 6240a49..7046738 100644 --- a/MDM/Models/Process/Dto/ProcessOperationDto.cs +++ b/MDM/Models/Process/Dto/ProcessOperationDto.cs @@ -1,5 +1,6 @@ using DOAN.Model.MES.recipe.Dto; using MDM.Models.Process; +using MDM.Models.Process.Dto; using System.ComponentModel.DataAnnotations; namespace MDM.Model.Process.Dto @@ -88,6 +89,10 @@ namespace MDM.Model.Process.Dto public List ProcessOperationCollectParameters { set; get; } + /// + /// 关联的物料参数 + /// + public List ProcessOperationFlowMaterialParamters { set; get; } } diff --git a/MDM/Services/Process/ProcessOperationService.cs b/MDM/Services/Process/ProcessOperationService.cs index 767c214..83b9a9e 100644 --- a/MDM/Services/Process/ProcessOperationService.cs +++ b/MDM/Services/Process/ProcessOperationService.cs @@ -124,7 +124,8 @@ namespace MDM.Services.Process ////绑定的采集参数 ProcessOperationCollectParameters= SqlFunc.Subqueryable().Where(s => s.FkRoutingCode == it.FkRoutingCode && s.FkOperationCode == it.OperationCode).ToList(), - + // 绑定的物料参数 + ProcessOperationFlowMaterialParamters= SqlFunc.Subqueryable().Where(s => s.FkRoutingCode == it.FkRoutingCode && s.FkOperationCode == it.OperationCode).ToList(), })