diff --git a/MDM/Services/Process/ProcessOperationService.cs b/MDM/Services/Process/ProcessOperationService.cs index 171be3f..09e2ba5 100644 --- a/MDM/Services/Process/ProcessOperationService.cs +++ b/MDM/Services/Process/ProcessOperationService.cs @@ -106,20 +106,19 @@ namespace MDM.Services.Process 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) - - .Select((refpr, ver, param) => new PfRecipeParametersDto + .Where((refpr, ver, param) => refpr.FkRoutingCode == it.FkRoutingCode && refpr.FkOperationCode == it.OperationCode) + .ToList((refpr, ver, param) => new PfRecipeParametersDto { - //Id = param.Id, - //RecipeCode = param.RecipeCode, - //Version = param.Version, - //ParamName = param.ParamName, - //Unit = param.Unit, - //UpperLimit = param.UpperLimit, - //LowerLimit = param.LowerLimit, - //StandardValue = param.StandardValue, - //Remark = param.Remark - }).ToList(), + Id = param.Id, + RecipeCode = param.RecipeCode, + Version = param.Version, + ParamName = param.ParamName, + Unit = param.Unit, + UpperLimit = param.UpperLimit, + LowerLimit = param.LowerLimit, + StandardValue = param.StandardValue, + Remark = param.Remark + }), //绑定的采集参数 ProcessOperationCollectParameters= SqlFunc.Subqueryable().Where(s => s.FkRoutingCode == it.FkRoutingCode && s.FkOperationCode == it.OperationCode).ToList(),