V1.2
This commit is contained in:
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; }
|
||||
|
||||
|
||||
Reference in New Issue
Block a user