diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 291b0be..7b4d582 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -6836,76 +6836,6 @@ public class WmsEnumUtil { } - /** - * BH检测结果 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum BH_TEST_RESULT_STATUS { - NORMAL(10, "NORMAL", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"); - private int value; - private String code; - private String description; - - BH_TEST_RESULT_STATUS(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 valueOfDescription(int val) { - return valueOf(val); - } - - public static int descriptionOfValue(String desc) { - return descOf(desc); - } - - - 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 BH_TEST_RESULT_STATUS codeOf(Integer value) { - if (value == null) { - return null; - } else { - for (int i = 0; i < values().length; i++) { - if (values()[i].value == value) { - return values()[i]; - } - } - } - return null; - } - } /** * 仓库健康指标等级 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java index aaec61f..9adf080 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java @@ -79,7 +79,7 @@ public class WmsSerialSnTrans extends BaseBean { @Column(name = "IS_OK") @ApiParam(value = "是否合格") - @AnnoOutputColumn(refClass = WmsEnumUtil.BACTH_TRANS_TYPE.class, refForeignKey = "value", value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer isOk; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java index edecd99..a13a31f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java @@ -66,7 +66,7 @@ public class WmsTestResultSummary extends BaseBean { @Column(name = "REWORK_RESULT") @ApiParam("返修结果") - @AnnoOutputColumn(refClass = WmsEnumUtil.BH_TEST_RESULT_STATUS.class, refForeignKey = "value", value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") public Integer reworkResult; @Column(name = "PICK_STATUS") @@ -76,7 +76,7 @@ public class WmsTestResultSummary extends BaseBean { @Column(name = "PICK_RESULT") @ApiParam("挑选结果") - @AnnoOutputColumn(refClass = WmsEnumUtil.BH_TEST_RESULT_STATUS.class, refForeignKey = "value", value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") public Integer pickResult; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java index bb25c21..43fe989 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java @@ -6,10 +6,10 @@ public class WmsInterfaceEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DIRECTION_TYPE { - SAP2WMS(10, "SAP2WMS-2", "SAP --> WMS"), - WMS2SAP(20, "WMS2SAP-2", "WMS --> SAP"), - MES2WMS(30, "MES2WMS-2", "MES --> WMS"), - WMS2MES(40, "WMS2MES-2", "WMS --> MES"); + SAP2WMS(10, "SAP2WMS", "SAP --> WMS"), + WMS2SAP(20, "WMS2SAP", "WMS --> SAP"), + MES2WMS(30, "MES2WMS", "MES --> WMS"), + WMS2MES(40, "WMS2MES", "WMS --> MES"); private int value; private String name;