diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java index c0251f8..47cd239 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java @@ -52,7 +52,7 @@ public class MesQueueJitActual extends BaseBean implements Serializable { @Column(name = "SEQ") @ApiParam("排序号") - private Double seq; + private String seq; @Column(name = "STATUS") @ApiParam("状态") diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java index 5a874ab..cc36f93 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java @@ -112,6 +112,9 @@ public class TorqueCollectionModel implements Serializable { @ApiParam("实际合格数") private Double actualQualifiedCount; + @ApiParam("是否已经发送了新的组合码") + private boolean hasSendAsciiWhenYellow; + @ApiParam("工步信息行颜色") private String color;