diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdVulcAlarmStandard.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdVulcAlarmStandard.java index d761896..fbbabe5 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdVulcAlarmStandard.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdVulcAlarmStandard.java @@ -72,6 +72,21 @@ public class ProdVulcAlarmStandard extends TenantEntity { */ private String remark; + /** + * 数据类型 + */ + private String dataType; + + /** + * 地址 + */ + private String pointAddress; + + /** + * 频率(毫秒) + */ + private Long stepTime; + /** * 删除标志(0代表存在 2代表删除) */ diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdVulcAlarmStandardBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdVulcAlarmStandardBo.java index adab39c..97348ba 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdVulcAlarmStandardBo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdVulcAlarmStandardBo.java @@ -91,4 +91,19 @@ public class ProdVulcAlarmStandardBo extends BaseEntity { * 工艺步序名称 */ private String stepName; + + /** + * 数据类型 + */ + private String dataType; + + /** + * 地址 + */ + private String pointAddress; + + /** + * 频率(毫秒) + */ + private Long stepTime; } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdVulcAlarmStandardVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdVulcAlarmStandardVo.java index c26000e..a0c7bac 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdVulcAlarmStandardVo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdVulcAlarmStandardVo.java @@ -96,6 +96,25 @@ public class ProdVulcAlarmStandardVo implements Serializable { @ExcelProperty(value = "备注") private String remark; + /** + * 数据类型 + */ + @ExcelProperty(value = "数据类型", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "machine_data_type") + private String dataType; + + /** + * 地址 + */ + @ExcelProperty(value = "地址") + private String pointAddress; + + /** + * 频率(毫秒) + */ + @ExcelProperty(value = "频率") + private Long stepTime; + /** * 报警项目名称 */