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 87050ca..390532b 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 @@ -110,6 +110,7 @@ public class WmsEnumUtil { /** * 移库单主表:优先级 */ + @Deprecated @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PRIORITY { NORMAL(1, "正常"), URGENT(2, "紧急"); @@ -142,6 +143,38 @@ public class WmsEnumUtil { /** + * 移库单主表:优先级 (PRIORITY_NEW) + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRIORITY_NEW { + URGENT(1, "紧急"), NORMAL(2, "正常"); + private int value; + private String description; + + PRIORITY_NEW(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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; + } + } + /** * 主表信息 单据类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -205,7 +238,8 @@ public class WmsEnumUtil { RECEIPT(20, "RECEIPT", "处理中"), RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成"), CLOSED(40, "CLOSED", "已关闭"), - CANCELLED(50, "CANCELLED", "已取消"); + CANCELLED(50, "CANCELLED", "已取消"), + FINISH_PRODUCT_SHIPING_PICKED(60, "FINISH_PRODUCT_SHIPING_PICKED", "配料完成"); private int value; private String code;