diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 13b531a..39932c2 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -2593,7 +2593,8 @@ public class MesPcnEnumUtil { TIME_MODULE_CONTENT("timeModuleContent", "定时组件内容"), TIME_MODULE_INIT("timeModuleInit", "初始化时间展示组件"), TIME_MODULE_START("timeModuleStart", "定时组件开始"), - TIME_MODULE_STOP("timeModuleStop", "定时组件暂停"); + TIME_MODULE_STOP("timeModuleStop", "定时组件暂停"), + TIME_MODULE_INIT("timeModuleInit", "初始化时间展示组件"); private String value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java index 5bc6718..57d30f8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java @@ -82,6 +82,10 @@ public class MesStateMachineStatus extends BaseBean implements Serializable { @ApiParam("状态点顺序") private Integer seq; + @Column(name = "IS_INIT") + @ApiParam("是否初始化") + private Integer isInit = 1; + @Transient @ApiParam("状态点是否完成") private boolean isComplete; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java index 3b1c38e..566aa9c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java @@ -49,4 +49,8 @@ public class MesTypeCfg extends BaseBean implements Serializable { @Column(name = "COLOR_VALUE") @ApiParam("颜色值") private String colorValue; + + @Column(name = "SEQ") + @ApiParam("顺序") + private Integer seq; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java index 7ee2845..681d328 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java @@ -104,12 +104,14 @@ public class ProductInfoManageModel { this.queDetailSeq = queDetailSeq; } - public ProductInfoManageModel(String vinCode, String produceCategoryCode, String orderNo, Double queDetailSeq, Double queueSeq, String workType) { + public ProductInfoManageModel(String vinCode, String produceCategoryCode, String orderNo, Double queDetailSeq, + Double queueSeq, String workType, String produceColor) { this.vinCode = vinCode; this.produceCategoryCode = produceCategoryCode; this.orderNo = orderNo; this.queDetailSeq = queDetailSeq; this.queueSeq = queueSeq; this.workType = workType; + this.produceColor = produceColor; } } diff --git a/sonar-project.properties b/sonar-project.properties index 0786d8d..ae014e9 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-TEST-SNAPSHOT +sonar.projectVersion=1.0-PROD-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./