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 6d080fb..7edb1f9 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 @@ -3199,4 +3199,56 @@ public class MesEnumUtil { } } + /** + * MesWorkCenter 工作中心运行状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_CENTER_RUNNING_STATUS { + + RUNNING("Y", "start", "开线"), + STOPPED("N", "stop", "停线"); + + private String value; + private String code; + private String description; + + WORK_CENTER_RUNNING_STATUS(String value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfCode(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + tmp = values()[i].code; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java index 67622a0..4caea9d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java @@ -53,7 +53,7 @@ public class MesWorkCenter extends BaseBean { @Column(name = "RUNNING_STATUS") @ApiParam("运行状态") - private Integer runningStatus; + private String runningStatus; @Transient @ApiParam(value = "子集列表") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java index a7a613f..0104edc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java @@ -1,6 +1,5 @@ package cn.estsh.i3plus.pojo.mes.model; -import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -25,7 +24,7 @@ public class ProductBiModel { private String areaCode; @ApiParam("运行状态") - private Integer runningStatus; + private String runningStatus; @ApiParam(value = "物料号") private String partNo;