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 4ab41c0..bfb52e3 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 @@ -2555,7 +2555,7 @@ public class MesPcnEnumUtil { CUSTOM_DIALOG("custom_dialog", "定制弹窗"), FORM("form", "文本按钮"), SPEC_TEXT("spec_text", "工步弹框文本"), - SHOW_ASSEMB_TABLE("SHOW_ASSEMB_TABLE", "展示组件表格"); + SHOW_ASSEMBLE_TABLE("SHOW_ASSEMBLE_TABLE", "展示组件表格"); private String value; private String description; @@ -3939,4 +3939,72 @@ public class MesPcnEnumUtil { return valueOf(val); } } + + /** + * 排序校验模式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CHECK_PROD_SEQ_FLAG { + PRODUCTION_MATERIAS(10, "NO_SORT_CHECK", "无排序校验"), + CUSTOMER_SHPING(20, "QUEUE_BAR_CODE", "按产品队列条码校验排序"), + OUTWARD_SHIPMENT(30, "PRODUCT_MATERIAL_NUMBER", "按产品物料号校验排序"), + ALLOCATION(40, "SAME_MATERIAL_RACK", "按队列同料架单产品校验排序"); + + private int value; + private String code; + private String description; + + CHECK_PROD_SEQ_FLAG(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String codeOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEsop.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEsop.java index 1234ffb..c20de53 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEsop.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEsop.java @@ -62,6 +62,10 @@ public class MesEsop extends BaseBean implements Serializable { @ApiParam("文件id") private Long fileId; + @Column(name = "ESOP_URL") + @ApiParam("文件路径") + private String esopUrl; + @Transient @ApiParam("文件名称") private String fileName; @@ -90,4 +94,8 @@ public class MesEsop extends BaseBean implements Serializable { @ApiParam("同步标记") private Integer syncTag = 0; + @Transient + @ApiParam("过程条码") + private String serialNumber; + }