V1.2
This commit is contained in:
@@ -6,6 +6,6 @@
|
||||
<Nullable>enable</Nullable>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="FreeSql" Version="3.2.808" />
|
||||
<PackageReference Include="FreeSql" Version="3.2.833" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
45
CapMachine.Model/MeterConfig/MeterCom.cs
Normal file
45
CapMachine.Model/MeterConfig/MeterCom.cs
Normal file
@@ -0,0 +1,45 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace CapMachine.Model.MeterConfig
|
||||
{
|
||||
/// <summary>
|
||||
/// 公共部分
|
||||
/// </summary>
|
||||
public class MeterCom
|
||||
{
|
||||
/// <summary>
|
||||
/// 程序步骤序号
|
||||
/// </summary>
|
||||
public int StepNo { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 开始值
|
||||
/// </summary>
|
||||
public double StartValue { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 结束值
|
||||
/// </summary>
|
||||
public double EndValue { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 维持时间
|
||||
/// </summary>
|
||||
public int KeepTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 配置值类型
|
||||
/// </summary>
|
||||
public ConfigValueType ValueType { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 常值
|
||||
/// 在ValueType为常值时会使用
|
||||
/// </summary>
|
||||
public double Constant { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -41,7 +41,7 @@ namespace CapMachine.Model
|
||||
/// 维持时间
|
||||
/// </summary>
|
||||
[Column(Name = "KeepTime")]
|
||||
public double KeepTime { get; set; }
|
||||
public int KeepTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 配置值类型
|
||||
|
||||
@@ -10,8 +10,8 @@ namespace CapMachine.Model
|
||||
/// <summary>
|
||||
/// COND2压力 表设置
|
||||
/// </summary>
|
||||
[Table(Name = "MeterCondPress")]
|
||||
public class MeterCondPress
|
||||
[Table(Name = "MeterCond2Press")]
|
||||
public class MeterCond2Press
|
||||
{
|
||||
/// <summary>
|
||||
/// 主键
|
||||
@@ -41,7 +41,7 @@ namespace CapMachine.Model
|
||||
/// 维持时间
|
||||
/// </summary>
|
||||
[Column(Name = "KeepTime")]
|
||||
public double KeepTime { get; set; }
|
||||
public int KeepTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 配置值类型
|
||||
@@ -41,7 +41,7 @@ namespace CapMachine.Model
|
||||
/// 维持时间
|
||||
/// </summary>
|
||||
[Column(Name = "KeepTime")]
|
||||
public double KeepTime { get; set; }
|
||||
public int KeepTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 配置值类型
|
||||
|
||||
@@ -41,7 +41,7 @@ namespace CapMachine.Model
|
||||
/// 维持时间
|
||||
/// </summary>
|
||||
[Column(Name = "KeepTime")]
|
||||
public double KeepTime { get; set; }
|
||||
public int KeepTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 配置值类型
|
||||
|
||||
@@ -10,8 +10,8 @@ namespace CapMachine.Model
|
||||
/// <summary>
|
||||
/// 试验箱湿度 表设置
|
||||
/// </summary>
|
||||
[Table(Name = "MeterTestBoxRH")]
|
||||
public class MeterTestBoxRH
|
||||
[Table(Name = "MeterEnvRH")]
|
||||
public class MeterEnvRH
|
||||
{
|
||||
/// <summary>
|
||||
/// 主键
|
||||
@@ -41,7 +41,7 @@ namespace CapMachine.Model
|
||||
/// 维持时间
|
||||
/// </summary>
|
||||
[Column(Name = "KeepTime")]
|
||||
public double KeepTime { get; set; }
|
||||
public int KeepTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 配置值类型
|
||||
@@ -10,8 +10,8 @@ namespace CapMachine.Model
|
||||
/// <summary>
|
||||
/// 试验箱温度 表设置
|
||||
/// </summary>
|
||||
[Table(Name = "MeterTestBoxTemp")]
|
||||
public class MeterTestBoxTemp
|
||||
[Table(Name = "MeterEnvTemp")]
|
||||
public class MeterEnvTemp
|
||||
{
|
||||
/// <summary>
|
||||
/// 主键
|
||||
@@ -41,7 +41,7 @@ namespace CapMachine.Model
|
||||
/// 维持时间
|
||||
/// </summary>
|
||||
[Column(Name = "KeepTime")]
|
||||
public double KeepTime { get; set; }
|
||||
public int KeepTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 配置值类型
|
||||
@@ -8,7 +8,7 @@ using System.Threading.Tasks;
|
||||
namespace CapMachine.Model
|
||||
{
|
||||
/// <summary>
|
||||
/// 排气压力设置
|
||||
/// 排气压力 设置
|
||||
/// </summary>
|
||||
[Table(Name = "MeterExPress")]
|
||||
public class MeterExPress
|
||||
@@ -41,7 +41,7 @@ namespace CapMachine.Model
|
||||
/// 维持时间
|
||||
/// </summary>
|
||||
[Column(Name = "KeepTime")]
|
||||
public double KeepTime { get; set; }
|
||||
public int KeepTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 配置值类型
|
||||
|
||||
@@ -41,7 +41,7 @@ namespace CapMachine.Model
|
||||
/// 维持时间
|
||||
/// </summary>
|
||||
[Column(Name = "KeepTime")]
|
||||
public double KeepTime { get; set; }
|
||||
public int KeepTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 配置值类型
|
||||
|
||||
@@ -36,7 +36,7 @@ namespace CapMachine.Model
|
||||
/// 维持时间
|
||||
/// </summary>
|
||||
[Column(Name = "KeepTime")]
|
||||
public double KeepTime { get; set; }
|
||||
public int KeepTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 配置值类型
|
||||
|
||||
@@ -36,7 +36,7 @@ namespace CapMachine.Model
|
||||
/// 维持时间
|
||||
/// </summary>
|
||||
[Column(Name = "KeepTime")]
|
||||
public double KeepTime { get; set; }
|
||||
public int KeepTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 配置值类型
|
||||
|
||||
@@ -41,7 +41,7 @@ namespace CapMachine.Model
|
||||
/// 维持时间
|
||||
/// </summary>
|
||||
[Column(Name = "KeepTime")]
|
||||
public double KeepTime { get; set; }
|
||||
public int KeepTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 配置值类型
|
||||
|
||||
@@ -10,8 +10,8 @@ namespace CapMachine.Model
|
||||
/// <summary>
|
||||
/// 润滑油压力 设置
|
||||
/// </summary>
|
||||
[Table(Name = "MeterLoPress")]
|
||||
public class MeterLoPress
|
||||
[Table(Name = "MeterLubePress")]
|
||||
public class MeterLubePress
|
||||
{
|
||||
/// <summary>
|
||||
/// 主键
|
||||
@@ -41,7 +41,7 @@ namespace CapMachine.Model
|
||||
/// 维持时间
|
||||
/// </summary>
|
||||
[Column(Name = "KeepTime")]
|
||||
public double KeepTime { get; set; }
|
||||
public int KeepTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 配置值类型
|
||||
@@ -41,7 +41,7 @@ namespace CapMachine.Model
|
||||
/// 维持时间
|
||||
/// </summary>
|
||||
[Column(Name = "KeepTime")]
|
||||
public double KeepTime { get; set; }
|
||||
public int KeepTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 配置值类型
|
||||
|
||||
@@ -41,7 +41,7 @@ namespace CapMachine.Model
|
||||
/// 维持时间
|
||||
/// </summary>
|
||||
[Column(Name = "KeepTime")]
|
||||
public double KeepTime { get; set; }
|
||||
public int KeepTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 配置值类型
|
||||
|
||||
@@ -41,7 +41,7 @@ namespace CapMachine.Model
|
||||
/// 维持时间
|
||||
/// </summary>
|
||||
[Column(Name = "KeepTime")]
|
||||
public double KeepTime { get; set; }
|
||||
public int KeepTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 配置值类型
|
||||
|
||||
@@ -41,7 +41,7 @@ namespace CapMachine.Model
|
||||
/// 维持时间
|
||||
/// </summary>
|
||||
[Column(Name = "KeepTime")]
|
||||
public double KeepTime { get; set; }
|
||||
public int KeepTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 配置值类型
|
||||
|
||||
@@ -41,7 +41,7 @@ namespace CapMachine.Model
|
||||
/// 维持时间
|
||||
/// </summary>
|
||||
[Column(Name = "KeepTime")]
|
||||
public double KeepTime { get; set; }
|
||||
public int KeepTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 配置值类型
|
||||
|
||||
@@ -41,7 +41,7 @@ namespace CapMachine.Model
|
||||
/// 维持时间
|
||||
/// </summary>
|
||||
[Column(Name = "KeepTime")]
|
||||
public double KeepTime { get; set; }
|
||||
public int KeepTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 配置值类型
|
||||
|
||||
@@ -1,70 +0,0 @@
|
||||
using FreeSql.DataAnnotations;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace CapMachine.Model
|
||||
{
|
||||
/// <summary>
|
||||
/// Pd表设置
|
||||
/// </summary>
|
||||
[Table(Name = "MeterPd")]
|
||||
public class MeterPd
|
||||
{
|
||||
/// <summary>
|
||||
/// 主键
|
||||
/// </summary>
|
||||
[Column(IsPrimary = true, IsIdentity = true)]
|
||||
public long Id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 程序步骤序号
|
||||
/// </summary>
|
||||
[Column(Name = "StepNo")]
|
||||
public int StepNo { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 开始值
|
||||
/// </summary>
|
||||
[Column(Name = "StartValue")]
|
||||
public double StartValue { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 结束值
|
||||
/// </summary>
|
||||
[Column(Name = "EndValue")]
|
||||
public double EndValue { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 维持时间
|
||||
/// </summary>
|
||||
[Column(Name = "KeepTime")]
|
||||
public double KeepTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 配置值类型
|
||||
/// </summary>
|
||||
[Column(MapType = typeof(int))]
|
||||
public ConfigValueType ValueType { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 常值
|
||||
/// 在ValueType为常值时会使用
|
||||
/// </summary>
|
||||
[Column(Name = "Constant")]
|
||||
public double Constant { get; set; }
|
||||
|
||||
|
||||
[Column(ServerTime = DateTimeKind.Local, CanUpdate = false)]
|
||||
public DateTime CreateTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// ///////////////////////////////////////////导航属性///////////////////////////////////////////////////////
|
||||
/// </summary>
|
||||
|
||||
public long ProStepId { get; set; }
|
||||
public ProStep? ProStep { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -1,70 +0,0 @@
|
||||
using FreeSql.DataAnnotations;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace CapMachine.Model
|
||||
{
|
||||
/// <summary>
|
||||
/// Ps表设置
|
||||
/// </summary>
|
||||
[Table(Name = "MeterPs")]
|
||||
public class MeterPs
|
||||
{
|
||||
/// <summary>
|
||||
/// 主键
|
||||
/// </summary>
|
||||
[Column(IsPrimary = true, IsIdentity = true)]
|
||||
public long Id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 程序步骤序号
|
||||
/// </summary>
|
||||
[Column(Name = "StepNo")]
|
||||
public int StepNo { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 开始值
|
||||
/// </summary>
|
||||
[Column(Name = "StartValue")]
|
||||
public double StartValue { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 结束值
|
||||
/// </summary>
|
||||
[Column(Name = "EndValue")]
|
||||
public double EndValue { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 维持时间
|
||||
/// </summary>
|
||||
[Column(Name = "KeepTime")]
|
||||
public double KeepTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 配置值类型
|
||||
/// </summary>
|
||||
[Column(MapType = typeof(int))]
|
||||
public ConfigValueType ValueType { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 常值
|
||||
/// 在ValueType为常值时会使用
|
||||
/// </summary>
|
||||
[Column(Name = "Constant")]
|
||||
public double Constant { get; set; }
|
||||
|
||||
|
||||
[Column(ServerTime = DateTimeKind.Local, CanUpdate = false)]
|
||||
public DateTime CreateTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// ///////////////////////////////////////////导航属性///////////////////////////////////////////////////////
|
||||
/// </summary>
|
||||
|
||||
public long ProStepId { get; set; }
|
||||
public ProStep? ProStep { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -41,7 +41,7 @@ namespace CapMachine.Model
|
||||
/// 维持时间
|
||||
/// </summary>
|
||||
[Column(Name = "KeepTime")]
|
||||
public double KeepTime { get; set; }
|
||||
public int KeepTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 配置值类型
|
||||
@@ -56,7 +56,54 @@ namespace CapMachine.Model
|
||||
[Column(Name = "Constant")]
|
||||
public double Constant { get; set; }
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// ///////////////////////////////////////////跟随速度小步骤的常量数据///////////////////////////////////////////////////////
|
||||
/// </summary>
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 输出锁定(0/1)
|
||||
/// 跟随速度步骤的常值数据
|
||||
/// </summary>
|
||||
[Column(Name = "OutLock")]
|
||||
public bool OutLock { get; set; }
|
||||
|
||||
/// <summary>
|
||||
///参数编号(1~16)
|
||||
/// 跟随速度步骤的常值数据
|
||||
/// </summary>
|
||||
[Column(Name = "ParNo")]
|
||||
public int ParNo { get; set; }
|
||||
|
||||
/// <summary>
|
||||
///EV(1~4)
|
||||
/// 跟随速度步骤的常值数据
|
||||
/// </summary>
|
||||
[Column(Name = "Ev")]
|
||||
public int Ev { get; set; }
|
||||
|
||||
// <summary>
|
||||
/// 压缩机使能(0/1)
|
||||
/// 跟随速度步骤的常值数据
|
||||
/// </summary>
|
||||
[Column(Name = "CapEnable")]
|
||||
public bool CapEnable { get; set; }
|
||||
|
||||
// <summary>
|
||||
/// 吸排气阀(0/1)
|
||||
/// 跟随速度步骤的常值数据
|
||||
/// </summary>
|
||||
[Column(Name = "InhExhValve")]
|
||||
public bool InhExhValve { get; set; }
|
||||
|
||||
// <summary>
|
||||
/// 加热器使能(0/1)
|
||||
/// 跟随速度步骤的常值数据
|
||||
/// </summary>
|
||||
[Column(Name = "HeatEnable")]
|
||||
public bool HeatEnable { get; set; }
|
||||
|
||||
|
||||
[Column(ServerTime = DateTimeKind.Local, CanUpdate = false)]
|
||||
public DateTime CreateTime { get; set; }
|
||||
|
||||
|
||||
21
CapMachine.Model/PLCParsModel/PlcBlockData.cs
Normal file
21
CapMachine.Model/PLCParsModel/PlcBlockData.cs
Normal file
@@ -0,0 +1,21 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace CapMachine.Model
|
||||
{
|
||||
public class PlcBlockData
|
||||
{
|
||||
/// <summary>
|
||||
/// 开始地址
|
||||
/// </summary>
|
||||
public string? StartAddress { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 值集合
|
||||
/// </summary>
|
||||
public short[]? ArrValue { get; set; }
|
||||
}
|
||||
}
|
||||
67
CapMachine.Model/PLCParsModel/PlcMeterStepCell.cs
Normal file
67
CapMachine.Model/PLCParsModel/PlcMeterStepCell.cs
Normal file
@@ -0,0 +1,67 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace CapMachine.Model
|
||||
{
|
||||
/// <summary>
|
||||
/// 步骤的PLC数据单元
|
||||
/// </summary>
|
||||
public class PlcMeterStepCell
|
||||
{
|
||||
/// <summary>
|
||||
/// 步骤序号
|
||||
/// 从1开始
|
||||
/// </summary>
|
||||
public int Step { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 时间-分
|
||||
/// </summary>
|
||||
public int TimeMin { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 时间-秒
|
||||
/// </summary>
|
||||
public int TimeSec { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 循环
|
||||
/// </summary>
|
||||
public int Cycle { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 值
|
||||
/// </summary>
|
||||
public double? Value { get; set; }
|
||||
|
||||
///// <summary>
|
||||
///// 地址
|
||||
///// </summary>
|
||||
//public string? Address { get; set; }
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 值地址
|
||||
/// </summary>
|
||||
public string? ValueAddress { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 分钟地址
|
||||
/// </summary>
|
||||
public string? MinAddress { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 秒地址
|
||||
/// </summary>
|
||||
public string? SecAddress { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 循环地址
|
||||
/// </summary>
|
||||
public string? CycleAddress { get; set; }
|
||||
|
||||
}
|
||||
}
|
||||
68
CapMachine.Model/PLCParsModel/PlcParsData.cs
Normal file
68
CapMachine.Model/PLCParsModel/PlcParsData.cs
Normal file
@@ -0,0 +1,68 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace CapMachine.Model
|
||||
{
|
||||
/// <summary>
|
||||
/// PLC 解析信息数据
|
||||
/// </summary>
|
||||
public class PlcParsData
|
||||
{
|
||||
public PlcParsData()
|
||||
{
|
||||
|
||||
Steps=new List<PlcMeterStepCell> ();
|
||||
Unit = "";
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 名称
|
||||
/// </summary>
|
||||
public string? Name { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Model 名称/英文名称
|
||||
/// </summary>
|
||||
public string? EnName { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 单位
|
||||
/// </summary>
|
||||
public string? Unit { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 分辨率
|
||||
/// </summary>
|
||||
public int? Ratio { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 步骤集合信息
|
||||
/// </summary>
|
||||
public List<PlcMeterStepCell> Steps { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 值首地址
|
||||
/// </summary>
|
||||
public int? ValueStartAddress { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 分钟首地址
|
||||
/// </summary>
|
||||
public int? MinStartAddress { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 秒首地址
|
||||
/// </summary>
|
||||
public int? SecStartAddress { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 循环首地址
|
||||
/// </summary>
|
||||
public int? CycleStartAddress { get; set; }
|
||||
|
||||
}
|
||||
}
|
||||
36
CapMachine.Model/ProSegRun.cs
Normal file
36
CapMachine.Model/ProSegRun.cs
Normal file
@@ -0,0 +1,36 @@
|
||||
using FreeSql.DataAnnotations;
|
||||
|
||||
namespace CapMachine.Model
|
||||
{
|
||||
/// <summary>
|
||||
/// 选中运行的程序名称
|
||||
/// </summary>
|
||||
[Table(Name = "ProSegRun")]
|
||||
public class ProSegRun
|
||||
{
|
||||
/// <summary>
|
||||
/// 主键
|
||||
/// </summary>
|
||||
[Column(IsPrimary = true, IsIdentity = true)]
|
||||
public long Id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 运行程序序号
|
||||
/// </summary>
|
||||
[Column(Name = "StepNo")]
|
||||
public int StepNo { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 程序名称
|
||||
/// 工况名称
|
||||
/// </summary>
|
||||
[Column(Name = "Name", IsNullable = false, StringLength = 50)]
|
||||
public string? Name { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// ///////////////////////////////////////////导航属性///////////////////////////////////////////////////////
|
||||
/// </summary>
|
||||
public long ProgramSegId { get; set; }
|
||||
public ProgramSeg? ProgramSeg { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -12,7 +12,7 @@ namespace CapMachine.Model
|
||||
/// 步骤
|
||||
/// </summary>
|
||||
[Table(Name = "ProStep")]
|
||||
public class ProStep
|
||||
public class ProStep
|
||||
{
|
||||
/// <summary>
|
||||
/// 主键
|
||||
@@ -47,33 +47,35 @@ namespace CapMachine.Model
|
||||
[Column(ServerTime = DateTimeKind.Local, CanUpdate = false)]
|
||||
public DateTime CreateTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 速度内部步骤的循环次数
|
||||
/// </summary>
|
||||
[Column(Name = "SpeedCycle")]
|
||||
public int SpeedCycle { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// ///////////////////////////////////////////导航属性///////////////////////////////////////////////////////
|
||||
/// </summary>
|
||||
|
||||
public ICollection<MeterSpeed>? MeterSpeeds { get; set; }
|
||||
public ICollection<MeterCond1Temp>? MeterCond1Temps { get; set; }
|
||||
public ICollection<MeterCond2Temp>? MeterCond2Temps { get; set; }
|
||||
public ICollection<MeterCondPress>? MeterCondPresss { get; set; }
|
||||
public ICollection<MeterEVAPExpTemp>? MeterEVAPExpTemps { get; set; }
|
||||
public ICollection<MeterExPress>? MeterExPresss { get; set; }
|
||||
public ICollection<MeterHVVol>? MeterHVVols { get; set; }
|
||||
public ICollection<MeterInhPress>? MeterInhPresss { get; set; }
|
||||
public ICollection<MeterInhTemp>? MeterInhTemps { get; set; }
|
||||
public ICollection<MeterLoPress>? MeterLoPresss { get; set; }
|
||||
public ICollection<MeterLVVol>? MeterLVVols { get; set; }
|
||||
public ICollection<MeterOCR>? MeterOCRs { get; set; }
|
||||
public ICollection<MeterOS1Temp>? MeterOS1Temps { get; set; }
|
||||
public ICollection<MeterOS2Temp>? MeterOS2Temps { get; set; }
|
||||
public ICollection<MeterPTCEntTemp>? MeterPTCEntTemps { get; set; }
|
||||
public ICollection<MeterPTCFlow>? MeterPTCFlows { get; set; }
|
||||
public ICollection<MeterPTCPw>? MeterPTCPws { get; set; }
|
||||
public ICollection<MeterTestBoxRH>? MeterTestBoxRHs { get; set; }
|
||||
public ICollection<MeterTestBoxTemp>? MeterTestBoxTemps { get; set; }
|
||||
|
||||
//public ICollection<MeterPd>? MeterPds { get; set; }
|
||||
//public ICollection<MeterPs>? MeterPss { get; set; }
|
||||
public List<MeterSpeed>? MeterSpeeds { get; set; }=new List<MeterSpeed>();
|
||||
public List<MeterCond1Temp>? MeterCond1Temps { get; set; }=new List<MeterCond1Temp>();
|
||||
public List<MeterCond2Temp>? MeterCond2Temps { get; set; }= new List<MeterCond2Temp>();
|
||||
public List<MeterCond2Press>? MeterCond2Presss { get; set; } = new List<MeterCond2Press>();
|
||||
public List<MeterEVAPExpTemp>? MeterEVAPExpTemps { get; set; }=new List<MeterEVAPExpTemp>();
|
||||
public List<MeterExPress>? MeterExPresss { get; set; }=new List<MeterExPress>();
|
||||
public List<MeterHVVol>? MeterHVVols { get; set; } = new List<MeterHVVol>();
|
||||
public List<MeterInhPress>? MeterInhPresss { get; set; } = new List<MeterInhPress>();
|
||||
public List<MeterInhTemp>? MeterInhTemps { get; set; } = new List<MeterInhTemp>();
|
||||
public List<MeterLubePress>? MeterLubePresss { get; set; } = new List<MeterLubePress>();
|
||||
public List<MeterLVVol>? MeterLVVols { get; set; } = new List<MeterLVVol>();
|
||||
public List<MeterOCR>? MeterOCRs { get; set; }=new List<MeterOCR>();
|
||||
public List<MeterOS1Temp>? MeterOS1Temps { get; set; }=new List<MeterOS1Temp>();
|
||||
public List<MeterOS2Temp>? MeterOS2Temps { get; set; }=new List<MeterOS2Temp>();
|
||||
public List<MeterPTCEntTemp>? MeterPTCEntTemps { get; set; }=new List<MeterPTCEntTemp>();
|
||||
public List<MeterPTCFlow>? MeterPTCFlows { get; set; }=new List<MeterPTCFlow>();
|
||||
public List<MeterPTCPw>? MeterPTCPws { get; set; } = new List<MeterPTCPw>();
|
||||
public List<MeterEnvRH>? MeterEnvRHs { get; set; }=new List<MeterEnvRH>();
|
||||
public List<MeterEnvTemp>? MeterEnvTemps { get; set; }=new List<MeterEnvTemp>();
|
||||
|
||||
/// <summary>
|
||||
/// ///////////////////////////////////////////导航属性///////////////////////////////////////////////////////
|
||||
|
||||
@@ -1,51 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace CapMachine.Model
|
||||
{
|
||||
public class ProStepDto
|
||||
{
|
||||
/// <summary>
|
||||
/// 主键
|
||||
/// </summary>
|
||||
public long Id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 程序步骤序号
|
||||
/// </summary>
|
||||
public int StepNo { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 程序循环次数
|
||||
/// </summary>
|
||||
public int StepRepeat { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 压缩机转速信息
|
||||
/// </summary>
|
||||
public string? SpeedInfo { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// PID信息
|
||||
/// </summary>
|
||||
public string? PID { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// PID输出限幅信息
|
||||
/// </summary>
|
||||
public string? PIDOutLimit { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Ps信息
|
||||
/// </summary>
|
||||
public string? Ps { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Pd信息
|
||||
/// </summary>
|
||||
public string? PdInfo{ get; set; }
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,4 @@
|
||||
using FreeSql.DataAnnotations;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace CapMachine.Model
|
||||
{
|
||||
@@ -23,6 +21,13 @@ namespace CapMachine.Model
|
||||
[Column(Name = "Name", IsNullable = false, StringLength = 50)]
|
||||
public string? Name { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 程序名称
|
||||
/// 分类
|
||||
/// </summary>
|
||||
[Column(Name = "Category", IsNullable = true, StringLength = 50)]
|
||||
public string? Category { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 程序段反复
|
||||
/// </summary>
|
||||
@@ -49,7 +54,7 @@ namespace CapMachine.Model
|
||||
/// ///////////////////////////////////////////导航属性///////////////////////////////////////////////////////
|
||||
/// </summary>
|
||||
|
||||
public ICollection<ProStep>? ProSteps { get; set; }
|
||||
public List<ProStep>? ProSteps { get; set; }
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
161
CapMachine.Model/QuickMeterConfig/QuickMeterStep.cs
Normal file
161
CapMachine.Model/QuickMeterConfig/QuickMeterStep.cs
Normal file
@@ -0,0 +1,161 @@
|
||||
using FreeSql.DataAnnotations;
|
||||
|
||||
namespace CapMachine.Model.QuickMeterConfig
|
||||
{
|
||||
/// <summary>
|
||||
/// 快速的步骤信息 QuickMeterStep
|
||||
/// </summary>
|
||||
[Table(Name = "QuickMeterStep")]
|
||||
public class QuickMeterStep
|
||||
{
|
||||
/// <summary>
|
||||
/// 主键
|
||||
/// </summary>
|
||||
[Column(IsPrimary = true, IsIdentity = true)]
|
||||
public long Id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 步骤序号
|
||||
/// </summary>
|
||||
[Column(Name = "StepNo")]
|
||||
public int StepNo { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 时间-分钟
|
||||
/// </summary>
|
||||
[Column(Name = "TimeMin")]
|
||||
public int TimeMin { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 时间-秒
|
||||
/// </summary>
|
||||
[Column(Name = "TimeSec")]
|
||||
public int TimeSec { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 时间-循环
|
||||
/// </summary>
|
||||
[Column(Name = "Cycle")]
|
||||
public int Cycle { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 速度
|
||||
/// </summary>
|
||||
[Column(Name = "Speed")]
|
||||
public double Speed { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 排气压力
|
||||
/// </summary>
|
||||
[Column(Name = "ExPress")]
|
||||
public double ExPress { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 吸气压力
|
||||
/// </summary>
|
||||
[Column(Name = "InhPress")]
|
||||
public double InhPress { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 吸气温度
|
||||
/// </summary>
|
||||
[Column(Name = "InhTemp")]
|
||||
public double InhTemp { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// COND1温度
|
||||
/// </summary>
|
||||
[Column(Name = "Cond1Temp")]
|
||||
public double Cond1Temp { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 润滑油压力
|
||||
/// </summary>
|
||||
[Column(Name = "LubePress")]
|
||||
public double LubePress { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// COND2压力
|
||||
/// </summary>
|
||||
[Column(Name = "Cond2Press")]
|
||||
public double Cond2Press { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// OCR
|
||||
/// </summary>
|
||||
[Column(Name = "OCR")]
|
||||
public double OCR { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// HV电压
|
||||
/// </summary>
|
||||
[Column(Name = "HVVol")]
|
||||
public double HVVol { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// LV电压
|
||||
/// </summary>
|
||||
[Column(Name = "LVVol")]
|
||||
public double LVVol { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 环境湿度
|
||||
/// </summary>
|
||||
[Column(Name = "EnvRH")]
|
||||
public double EnvRH { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 环境温度
|
||||
/// </summary>
|
||||
[Column(Name = "EnvTemp")]
|
||||
public double EnvTemp { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// OS1温度
|
||||
/// </summary>
|
||||
[Column(Name = "OS1Temp")]
|
||||
public double OS1Temp { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// OS2温度
|
||||
/// </summary>
|
||||
[Column(Name = "OS2Temp")]
|
||||
public double OS2Temp { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// PTC入口温度
|
||||
/// </summary>
|
||||
[Column(Name = "PTCEntTemp")]
|
||||
public double PTCEntTemp { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// PTC流量
|
||||
/// </summary>
|
||||
[Column(Name = "PTCFlow")]
|
||||
public double PTCFlow { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// PTC功率
|
||||
/// </summary>
|
||||
[Column(Name = "PTCPw")]
|
||||
public double PTCPw { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// EVAP出口温度
|
||||
/// </summary>
|
||||
[Column(Name = "EVAPExpTemp")]
|
||||
public double EVAPExpTemp { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// COND2温度
|
||||
/// </summary>
|
||||
[Column(Name = "Cond2Temp")]
|
||||
public double Cond2Temp { get; set; }
|
||||
|
||||
///// <summary>
|
||||
///// xxxx
|
||||
///// </summary>
|
||||
//[Column(Name = "xxxx")]
|
||||
//public double xxxx { get; set; }
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user