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 e42d084..ad2e0e4 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 @@ -1239,7 +1239,9 @@ public class MesEnumUtil { public enum MES_PRODUCE_SN_TYPE { NORMAL(10, "正常件"), - FIRST_INSPECTION(20, "首检件"); + FIRST_INSPECTION(20, "首检件"), + HALF_PRODUCT(30, "半成品"), + KP(40, "关键件"); private int value; private String description; 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 371e3aa..ce35b5b 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 @@ -418,7 +418,9 @@ public class MesPcnEnumUtil { public enum MES_PRODUCE_SN_TYPE { NORMAL(10, "正常件"), - FIRST_INSPECTION(20, "首检件"); + FIRST_INSPECTION(20, "首检件"), + HALF_PRODUCT(30, "半成品"), + KP(40, "关键件"); private int value; private String description; @@ -2215,43 +2217,6 @@ public class MesPcnEnumUtil { } /** - * 条码类型 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum PCN_SN_TYPE { - - NORMAL(10, "正常件"), - FIRST_INSPECTION(20, "首检件"); - - private int value; - private String description; - - PCN_SN_TYPE(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; - } - } - - - /** * MesPlanOrder实体对应的source值 计划来源 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java index 91cd118..9685268 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java @@ -5,6 +5,8 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Transient; + /** * @Description: 打印条码工步, 打印信息模板 * @Reference: @@ -18,6 +20,9 @@ public class StepPrintSnModel extends MesProduceSn { @ApiParam("打印描述") private String printDesc; + @ApiParam(value = "打印时间") + private String printTime; + @ApiParam("条码") private String barCode;