diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 716509d..bc83711 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -3379,7 +3379,8 @@ public class MesEnumUtil { TASK_COMPLETE("taskComplete", "整个扫描完成"), STEP_RAN_STATUS("stepRanStatus", "工步列表执行前"), RUNNING_INFO("runningInfo", "执行信息"), - STOP_PCS_CTL("stopPcsCtl", "停止监控"); + STOP_PCS_CTL("stopPcsCtl", "停止监控"), + RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean"); private String value; 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 1526981..6bd6523 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 @@ -2441,9 +2441,9 @@ public class MesPcnEnumUtil { TASK_COMPLETE("taskComplete", "整个扫描完成"), STEP_RAN_STATUS("stepRanStatus", "工步列表执行前"), RUNNING_INFO("runningInfo", "执行信息"), + STOP_PCS_CTL("stopPcsCtl", "停止监控"), RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean"); - private String value; private String description; @@ -2770,4 +2770,40 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * 质量状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PASS_FAIL { + + PASS(1, "合格"), + FAIL(2, "不合格"); + + private int value; + private String description; + + PASS_FAIL(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java index b0cb953..bdb5567 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java @@ -52,7 +52,7 @@ public class QueueJisModel implements Serializable { private String detailStatusName; @ApiParam("明细整体状态名称") - private Integer finalStatusName; + private String finalStatusName; @ApiParam("颜色") private String color;