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 0aa02da..ea58f6e 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 @@ -3025,4 +3025,76 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * 是否完成整箱 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FINISH_FLAG { + + FALSE(0, "未完成"), + TRUE(1, "完成"); + + private int value; + private String description; + + FINISH_FLAG(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; + } + } + + /** + * 换膜信号 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum HM_FLAG { + + NOT_FILM_EXCHANGE(0, "不需换模"), + FILM_EXCHANGE(1, "需换模"); + + private int value; + private String description; + + HM_FLAG(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/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java index 71fb641..e1599ec 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java @@ -120,7 +120,11 @@ public class MesStationBom extends BaseBean implements Serializable { @Transient @ApiParam("是否扫描") - private Boolean isScan; + private Boolean isScan = false; + + @Transient + @ApiParam("半成品条码") + private String halfProductSn; public double getQtyVal() { return this.qty == null ? 0.0d : this.qty;