From 1e07f2650631b81c865f6d46a0cdf5b5f9b3020f Mon Sep 17 00:00:00 2001 From: gcw_MV9p2JJN Date: Wed, 31 Dec 2025 18:37:16 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E7=9A=84=E7=89=A9=E6=96=99?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MDM/Controllers/Process/ProcessOperationController.cs | 2 +- MDM/Models/Process/Dto/ProcessOperationDto.cs | 5 +++++ MDM/Services/Process/ProcessOperationService.cs | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) 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(), })