1
This commit is contained in:
parent
ad964ab636
commit
3c07442a4e
@ -253,7 +253,7 @@ namespace MDM.Controllers.Process
|
||||
|
||||
|
||||
//TODO 分页查询配方参数
|
||||
|
||||
[HttpPost("operation_search_recipe")]
|
||||
public IActionResult QueryProcessOperationRecipe([FromQuery] ProcessOperationQuery2Dto query)
|
||||
{
|
||||
var response = _ProcessOperationService.QueryProcessOperationRecipe(query);
|
||||
|
||||
@ -121,15 +121,15 @@ 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(),
|
||||
ProcessOperationCollectParameters = SqlFunc.Subqueryable<ProcessOperationCollectParameter>().Where(s => s.FkRoutingCode == it.FkRoutingCode && s.FkOperationCode == it.OperationCode).ToList(),
|
||||
|
||||
// 绑定的物料参数
|
||||
ProcessOperationFlowMaterialParamters= SqlFunc.Subqueryable<ProcessOperationFlowMaterialParamter>().Where(s => s.FkRoutingCode == it.FkRoutingCode && s.FkOperationCode == it.OperationCode).ToList(),
|
||||
ProcessOperationFlowMaterialParamters = SqlFunc.Subqueryable<ProcessOperationFlowMaterialParamter>().Where(s => s.FkRoutingCode == it.FkRoutingCode && s.FkOperationCode == it.OperationCode).ToList(),
|
||||
|
||||
|
||||
})
|
||||
.First();
|
||||
}).First();
|
||||
|
||||
|
||||
return response;
|
||||
|
||||
@ -72,22 +72,22 @@ namespace MDM.Services.Process
|
||||
OperationFlows = SqlFunc.Subqueryable<ProcessOperationFlow>().Where(s => s.FkRoutingCode == it.FkRoutingCode && s.FkOperationCode == it.FkOperationCode).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.FkOperationCode)
|
||||
.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
|
||||
}),
|
||||
//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.FkOperationCode)
|
||||
//.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
|
||||
//}),
|
||||
////绑定的工序工位采集参数
|
||||
ProcessOperationWorkstationCollectParameters = SqlFunc.Subqueryable<ProcessOperationWorkstationFlowCollectParameter>().Where(s => s.FkRoutingCode == it.FkRoutingCode && s.FkOperationCode == it.FkOperationCode&&s.FkProductlinebodyCode==it.FkProductlinebodyCode&&s.FkWorkstationCode==it.FkWorkstationCode).ToList(),
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user