|
|
@ -80,6 +80,7 @@ namespace ProductionSystem_Service
|
|
|
|
{
|
|
|
|
{
|
|
|
|
try
|
|
|
|
try
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
|
|
|
var temp = db.Queryable<T_ParaConfig>().Where(m => m.ProductType == productType && m.IsActive);
|
|
|
|
return db.Queryable<T_ParaConfig>().Where(m => m.ProductType == productType && m.IsActive);
|
|
|
|
return db.Queryable<T_ParaConfig>().Where(m => m.ProductType == productType && m.IsActive);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
catch (Exception ex)
|
|
|
|
catch (Exception ex)
|
|
|
@ -89,12 +90,8 @@ namespace ProductionSystem_Service
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
|
|
/// 根据参数种类查询有效参数配置项
|
|
|
|
private ISugarQueryable<T_ParaConfig> QueryTargetValWithParaCodeByParaCategery(string paraCategory)
|
|
|
|
/// </summary>
|
|
|
|
|
|
|
|
/// <param name="paraCategory"></param>
|
|
|
|
|
|
|
|
/// <returns></returns>
|
|
|
|
|
|
|
|
public ISugarQueryable<T_ParaConfig> QueryTargetValWithParaCodeByParaCategery(string paraCategory)
|
|
|
|
|
|
|
|
{
|
|
|
|
{
|
|
|
|
try
|
|
|
|
try
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -107,6 +104,56 @@ namespace ProductionSystem_Service
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
|
|
/// 根据参数种类查询有效参数配置项,例如传“BZ1”、“BZ2”
|
|
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
|
|
/// <param name="paraCategory"></param>
|
|
|
|
|
|
|
|
/// <returns></returns>
|
|
|
|
|
|
|
|
public ParaTargetValVM GetParaTargetVal(string paraCategory)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
ParaTargetValVM paraTargetVal = new ParaTargetValVM();
|
|
|
|
|
|
|
|
var paraConfig = QueryTargetValWithParaCodeByParaCategery(paraCategory).ToList();
|
|
|
|
|
|
|
|
for (int i = 0; i < paraConfig.Count; i++)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
if(paraConfig[i].ParaCode == "STF1MS")
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
paraTargetVal.STF1TargetVal = paraConfig[i].TargetVal.ToString();
|
|
|
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else if (paraConfig[i].ParaCode == "STF2MS")
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
paraTargetVal.STF2TargetVal = paraConfig[i].TargetVal.ToString();
|
|
|
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else if (paraConfig[i].ParaCode == "DZPZF1")
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
paraTargetVal.PZF1TargetVal = paraConfig[i].TargetVal.ToString();
|
|
|
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else if (paraConfig[i].ParaCode == "DZPZF2")
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
paraTargetVal.PZF2TargetVal = paraConfig[i].TargetVal.ToString();
|
|
|
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else if (paraConfig[i].ParaCode == "SB1ZS")
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
paraTargetVal.SB1TargetVal = paraConfig[i].TargetVal.ToString();
|
|
|
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else if (paraConfig[i].ParaCode == "SB2ZS")
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
paraTargetVal.SB2TargetVal = paraConfig[i].TargetVal.ToString();
|
|
|
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else if (paraConfig[i].ParaCode == "SB3ZS")
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
paraTargetVal.SB3TargetVal = paraConfig[i].TargetVal.ToString();
|
|
|
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return paraTargetVal;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
/// <summary>
|
|
|
|
/// 根据产品型号查询参数配置项
|
|
|
|
/// 根据产品型号查询参数配置项
|
|
|
|
/// </summary>
|
|
|
|
/// </summary>
|
|
|
|