RIZO/zhuangpei-mesbackend
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
gcw_MV9p2JJN 2025-12-31 11:45:08 +08:00
parent 8d48c0abb6
commit 06e1e515fb
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
MDM/Models/Process/Dto/ProcessOperationDto.cs
View File

@ -75,18 +75,17 @@ namespace MDM.Model.Process.Dto
/// <summary>
/// 关联的流程
/// </summary>
public List<ProcessOperationFlow>? OperationFlows;
public List<ProcessOperationFlow> OperationFlows { set; get; }
/// <summary>
/// 关联的配方及其配方参数
/// </summary>
public List<PfRecipeParametersDto>? OperationRecipeParameters;
public List<PfRecipeParametersDto> OperationRecipeParameters { set; get; }
/// <summary>
/// 关联的采集参数
/// </summary>
public List<ProcessOperationCollectParameter>? ProcessOperationCollectParameters;
public List<ProcessOperationCollectParameter> ProcessOperationCollectParameters { set; get; }

2
MDM/Models/Recipe/Dto/PfRecipeParametersDto.cs
View File

@ -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; }

7
MDM/Services/Process/ProcessOperationService.cs
View File

@ -102,11 +102,12 @@ namespace MDM.Services.Process
UpdatedTime = it.UpdatedTime,
//绑定的流程信息
OperationFlows = SqlFunc.Subqueryable<ProcessOperationFlow>().Where(s => s.FkRoutingCode == it.FkRoutingCode && s.FkOperationCode == it.OperationCode).ToList(),
//绑定的配方参数信息
////绑定的配方参数信息
OperationRecipeParameters = SqlFunc.Subqueryable<PfRefProductRecipe>()
.LeftJoin<PfRecipeVersion>((refpr, ver) => refpr.RecipeCode == ver.RecipeCode)
.LeftJoin<PfRecipeParameters>((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<ProcessOperationCollectParameter>().Where(s => s.FkRoutingCode == it.FkRoutingCode && s.FkOperationCode == it.OperationCode).ToList(),