change -进一步封装根据参数种类查询有效参数配置项方法,可直接取值

dep
frankiecao 11 months ago
commit c3851a5f4f

@ -9,6 +9,7 @@ using ProductionSystem.Common;
using ProductionSystem.Untils;
using ProductionSystem.Untils.System;
using ProductionSystem_Log;
using ProductionSystem_Model.DbModel.Para;
using ProductionSystem_Model.Enum;
using ProductionSystem_Model.ViewModel.Response.Para;
using ProductionSystem_Service;
@ -192,6 +193,7 @@ namespace ProductionSystem.Forms
var paraConfig = _paraConfigService.QueryActiveParaConfigsByProductType(Program.ProductType)
.First(m => m.ParaCategory == "BZ1" && m.ProductType == $"{Program.ProductType}");
if (paraConfig == null)
{
LogHelper.Error(null, $"根据机型[{Program.ProductType}],在参数项配置表未查询到通讯协议的相关配置!");

@ -1,4 +1,6 @@
using SqlSugar;
using System;
using System.Collections.Generic;
namespace ProductionSystem_Model.DbModel.Para
{

@ -133,6 +133,7 @@
<Compile Include="ViewModel\Request\Test\TestStepVM.cs" />
<Compile Include="ViewModel\Response\Para\ParaColVM.cs" />
<Compile Include="ViewModel\Response\Para\ParaConfigVM.cs" />
<Compile Include="ViewModel\Response\Para\ParaTargetValVM.cs" />
<Compile Include="ViewModel\Response\Para\PointKeyValue.cs" />
<Compile Include="ViewModel\Response\Protocol\ProtocolDetailInfo.cs" />
<Compile Include="ViewModel\Response\Protocol\ProtocolDetailParaVM.cs" />

@ -0,0 +1,19 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ProductionSystem_Model.ViewModel.Response.Para
{
public class ParaTargetValVM
{
public string STF1TargetVal { get; set; }
public string STF2TargetVal { get; set; }
public string PZF1TargetVal { get; set; }
public string PZF2TargetVal { get; set; }
public string SB1TargetVal { get; set; }
public string SB2TargetVal { get; set; }
public string SB3TargetVal { get; set; }
}
}

@ -80,6 +80,7 @@ namespace ProductionSystem_Service
{
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);
}
catch (Exception ex)
@ -89,12 +90,8 @@ namespace ProductionSystem_Service
}
}
/// <summary>
/// 根据参数种类查询有效参数配置项
/// </summary>
/// <param name="paraCategory"></param>
/// <returns></returns>
public ISugarQueryable<T_ParaConfig> QueryTargetValWithParaCodeByParaCategery(string paraCategory)
private ISugarQueryable<T_ParaConfig> QueryTargetValWithParaCodeByParaCategery(string paraCategory)
{
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>

Loading…
Cancel
Save