From 06e1e515fbccd92d40dc3cf0d4aef03534418570 Mon Sep 17 00:00:00 2001 From: gcw_MV9p2JJN Date: Wed, 31 Dec 2025 11:45:08 +0800 Subject: [PATCH] 1 --- MDM/Models/Process/Dto/ProcessOperationDto.cs | 7 +++---- MDM/Models/Recipe/Dto/PfRecipeParametersDto.cs | 2 +- MDM/Services/Process/ProcessOperationService.cs | 7 ++++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/MDM/Models/Process/Dto/ProcessOperationDto.cs b/MDM/Models/Process/Dto/ProcessOperationDto.cs index 1fc4b12..6240a49 100644 --- a/MDM/Models/Process/Dto/ProcessOperationDto.cs +++ b/MDM/Models/Process/Dto/ProcessOperationDto.cs @@ -75,18 +75,17 @@ namespace MDM.Model.Process.Dto /// /// 关联的流程 /// - public List? OperationFlows; - + public List OperationFlows { set; get; } /// /// 关联的配方及其配方参数 /// - public List? OperationRecipeParameters; + public List OperationRecipeParameters { set; get; } /// /// 关联的采集参数 /// - public List? ProcessOperationCollectParameters; + public List ProcessOperationCollectParameters { set; get; } diff --git a/MDM/Models/Recipe/Dto/PfRecipeParametersDto.cs b/MDM/Models/Recipe/Dto/PfRecipeParametersDto.cs index 5c4648c..8aa6eac 100644 --- a/MDM/Models/Recipe/Dto/PfRecipeParametersDto.cs +++ b/MDM/Models/Recipe/Dto/PfRecipeParametersDto.cs @@ -35,7 +35,7 @@ namespace DOAN.Model.MES.recipe.Dto public string Remark { get; set; } - public string CreatedBy { get; set; } + public string CreatedBy { get; set; } public DateTime? CreatedTime { get; set; } diff --git a/MDM/Services/Process/ProcessOperationService.cs b/MDM/Services/Process/ProcessOperationService.cs index 833299a..c7c8c1a 100644 --- a/MDM/Services/Process/ProcessOperationService.cs +++ b/MDM/Services/Process/ProcessOperationService.cs @@ -102,11 +102,12 @@ namespace MDM.Services.Process UpdatedTime = it.UpdatedTime, //绑定的流程信息 OperationFlows = SqlFunc.Subqueryable().Where(s => s.FkRoutingCode == it.FkRoutingCode && s.FkOperationCode == it.OperationCode).ToList(), - //绑定的配方参数信息 + + ////绑定的配方参数信息 OperationRecipeParameters = SqlFunc.Subqueryable() .LeftJoin((refpr, ver) => refpr.RecipeCode == ver.RecipeCode) .LeftJoin((refpr, ver, param) => ver.RecipeCode == param.RecipeCode && ver.Version == param.Version) - .Where((refpr, ver, param) => refpr.FkRoutingCode == it.FkRoutingCode && refpr.FkOperationCode == it.OperationCode) + .Where((refpr, ver, param) => refpr.FkRoutingCode == it.FkRoutingCode && refpr.FkOperationCode == it.OperationCode) .ToList((refpr, ver, param) => new PfRecipeParametersDto { Id = param.Id, @@ -119,7 +120,7 @@ namespace MDM.Services.Process StandardValue = param.StandardValue, Remark = param.Remark }), - //绑定的采集参数 + ////绑定的采集参数 ProcessOperationCollectParameters= SqlFunc.Subqueryable().Where(s => s.FkRoutingCode == it.FkRoutingCode && s.FkOperationCode == it.OperationCode).ToList(),