提交了仪表的模型

CapMachine.Model/ActionLog.cs

@@ -0,0 +1,47 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CapMachine.Model
+{
+    /// <summary>
+    /// ActionLog
+    /// 动作日志
+    /// </summary>
+    [Table(Name = "ActionLog")]
+    public class ActionLog
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        [Column(IsPrimary = true, IsIdentity = true)]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 等级
+        /// </summary>
+        [Column(Name = "Level")]
+        public int Level { get; set; }
+
+        /// <summary>
+        /// 分类
+        /// </summary>
+        [Column(Name = "Category", IsNullable = true, StringLength = 30)]
+        public string? Category { get; set; }
+
+        /// <summary>
+        /// 内容
+        /// </summary>
+        [Column(Name = "Content", IsNullable = true, StringLength = 300)]
+        public string? Content { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column(ServerTime = DateTimeKind.Local, CanUpdate = false)]
+        public DateTime CreateTime { get; set; }
+    }
+}

CapMachine.Model/MeterConfig/MeterCond1Temp.cs

@@ -0,0 +1,70 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CapMachine.Model
+{
+    /// <summary>
+    /// COND1温度 表设置
+    /// </summary>
+    [Table(Name = "MeterCond1Temp")]
+    public class MeterCond1Temp
+    {
+        /// <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; }
+    }
+}

CapMachine.Model/MeterConfig/MeterCond2Temp.cs

@@ -0,0 +1,70 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CapMachine.Model
+{
+    /// <summary>
+    /// COND2温度 表设置
+    /// </summary>
+    [Table(Name = "MeterCond2Temp")]
+    public class MeterCond2Temp
+    {
+        /// <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; }
+    }
+}

CapMachine.Model/MeterConfig/MeterCondPress.cs

@@ -0,0 +1,70 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CapMachine.Model
+{
+    /// <summary>
+    /// COND2压力 表设置
+    /// </summary>
+    [Table(Name = "MeterCondPress")]
+    public class MeterCondPress
+    {
+        /// <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; }
+    }
+}

CapMachine.Model/MeterConfig/MeterEVAPExpTemp.cs

@@ -0,0 +1,70 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CapMachine.Model
+{
+    /// <summary>
+    /// EVAP出口温度(℃) 表设置
+    /// </summary>
+    [Table(Name = "MeterEVAPExpTemp")]
+    public class MeterEVAPExpTemp
+    {
+        /// <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; }
+    }
+}

CapMachine.Model/MeterConfig/MeterExPress.cs

@@ -0,0 +1,71 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CapMachine.Model
+{
+    /// <summary>
+    /// 排气压力设置
+    /// </summary>
+    [Table(Name = "MeterExPress")]
+    public class MeterExPress
+    {
+        /// <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; }
+
+    }
+}

CapMachine.Model/MeterConfig/MeterHVVol.cs

@@ -0,0 +1,70 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CapMachine.Model
+{
+    /// <summary>
+    /// HV电压 表设置
+    /// </summary>
+    [Table(Name = "MeterHVVol")]
+    public class MeterHVVol
+    {
+        /// <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; }
+    }
+}

CapMachine.Model/MeterConfig/MeterInhPress.cs

@@ -0,0 +1,65 @@
+using FreeSql.DataAnnotations;
+
+namespace CapMachine.Model
+{
+    /// <summary>
+    /// 吸气压力 表设置
+    /// </summary>
+    [Table(Name = "MeterInhPress")]
+    public class MeterInhPress
+    {
+        /// <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; }
+    }
+}

CapMachine.Model/MeterConfig/MeterInhTemp.cs

@@ -0,0 +1,66 @@
+using FreeSql.DataAnnotations;
+
+namespace CapMachine.Model
+{
+    /// <summary>
+    /// 吸气温度 设置
+    /// </summary>
+    [Table(Name = "MeterInhTemp")]
+    public class MeterInhTemp
+    {
+        /// <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; }
+
+    }
+}

CapMachine.Model/MeterConfig/MeterLVVol.cs

@@ -0,0 +1,70 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CapMachine.Model
+{
+    /// <summary>
+    /// LV电压 表设置
+    /// </summary>
+    [Table(Name = "MeterLVVol")]
+    public class MeterLVVol
+    {
+        /// <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; }
+    }
+}

CapMachine.Model/MeterConfig/MeterLoPress.cs

@@ -0,0 +1,71 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CapMachine.Model
+{
+    /// <summary>
+    /// 润滑油压力 设置
+    /// </summary>
+    [Table(Name = "MeterLoPress")]
+    public class MeterLoPress
+    {
+        /// <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; }
+
+    }
+}

CapMachine.Model/MeterConfig/MeterOCR.cs

@@ -0,0 +1,70 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CapMachine.Model
+{
+    /// <summary>
+    /// OCR 表设置
+    /// </summary>
+    [Table(Name = "MeterOCR")]
+    public class MeterOCR
+    {
+        /// <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; }
+    }
+}

CapMachine.Model/MeterConfig/MeterOS1Temp.cs

@@ -0,0 +1,70 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CapMachine.Model
+{
+    /// <summary>
+    /// OS1温度 表设置
+    /// </summary>
+    [Table(Name = "MeterOS1Temp")]
+    public class MeterOS1Temp
+    {
+        /// <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; }
+    }
+}

CapMachine.Model/MeterConfig/MeterOS2Temp.cs

@@ -0,0 +1,70 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CapMachine.Model
+{
+    /// <summary>
+    /// OS2温度 表设置
+    /// </summary>
+    [Table(Name = "MeterOS2Temp")]
+    public class MeterOS2Temp
+    {
+        /// <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; }
+    }
+}

CapMachine.Model/MeterConfig/MeterPTCEntTemp.cs

@@ -0,0 +1,70 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CapMachine.Model
+{
+    /// <summary>
+    /// PTC入口温度(℃) 表设置
+    /// </summary>
+    [Table(Name = "MeterPTCEntTemp")]
+    public class MeterPTCEntTemp
+    {
+        /// <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; }
+    }
+}

CapMachine.Model/MeterConfig/MeterPTCFlow.cs

@@ -0,0 +1,70 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CapMachine.Model
+{
+    /// <summary>
+    /// PTC流量 表设置
+    /// </summary>
+    [Table(Name = "MeterPTCFlow")]
+    public class MeterPTCFlow
+    {
+        /// <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; }
+    }
+}

CapMachine.Model/MeterConfig/MeterPTCPw.cs

@@ -0,0 +1,70 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CapMachine.Model
+{
+    /// <summary>
+    /// PTC功率 表设置
+    /// </summary>
+    [Table(Name = "MeterPTCPw")]
+    public class MeterPTCPw
+    {
+        /// <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; }
+    }
+}

CapMachine.Model/MeterConfig/MeterTestBoxRH.cs

@@ -0,0 +1,70 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CapMachine.Model
+{
+    /// <summary>
+    /// 试验箱湿度 表设置
+    /// </summary>
+    [Table(Name = "MeterTestBoxRH")]
+    public class MeterTestBoxRH
+    {
+        /// <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; }
+    }
+}

CapMachine.Model/MeterConfig/MeterTestBoxTemp.cs

@@ -0,0 +1,70 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CapMachine.Model
+{
+    /// <summary>
+    /// 试验箱温度 表设置
+    /// </summary>
+    [Table(Name = "MeterTestBoxTemp")]
+    public class MeterTestBoxTemp
+    {
+        /// <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; }
+    }
+}

CapMachine.Model/ProStep.cs

@@ -53,10 +53,27 @@ namespace CapMachine.Model
         /// </summary>
 
         public ICollection<MeterSpeed>? MeterSpeeds { get; set; }
-        public ICollection<MeterPd>? MeterPds { get; set; }
-        public ICollection<MeterPs>? MeterPss { 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; }
 
         /// <summary>
         /// ///////////////////////////////////////////导航属性///////////////////////////////////////////////////////

CapMachine.Model/ProgramSeg.cs

@@ -4,6 +4,9 @@ using System.Collections.Generic;
 
 namespace CapMachine.Model
 {
+    /// <summary>
+    /// 程序设置
+    /// </summary>
     [Table(Name = "ProgramSeg")]
     public class ProgramSeg
     {
@@ -18,7 +21,7 @@ namespace CapMachine.Model
         /// 工况名称
         /// </summary>
         [Column(Name = "Name", IsNullable = false, StringLength = 50)]
-        public string Name { get; set; }
+        public string? Name { get; set; }
 
         /// <summary>
         /// 程序段反复
@@ -30,13 +33,13 @@ namespace CapMachine.Model
         /// 编辑者
         /// </summary>
         [Column(Name = "UserName", IsNullable = false, StringLength = 20)]
-        public string UserName { get; set; }
+        public string? UserName { get; set; }
 
         /// <summary>
         /// 备注
         /// </summary>
         [Column(Name = "Remark", IsNullable = false, StringLength = 100)]
-        public string Remark { get; set; }
+        public string? Remark { get; set; }
 
         [Column(ServerTime = DateTimeKind.Local, CanUpdate = false)]
         public DateTime CreateTime { get; set; }