From 8ac53abe9ec5a83248ebf3bb4658caabb7c4a81f Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sun, 13 Sep 2020 17:22:58 +0800 Subject: [PATCH] =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3ASN=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 52 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java | 5 +++ 2 files changed, 57 insertions(+) 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 2bd7583..24d3342 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 @@ -5063,6 +5063,58 @@ public class WmsEnumUtil { /** + * 生产计划主表计划状态 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_ORDER_PLAN_STATUS { + CREATE(10, "CREATE", "创建"), + PLANNED(20, "PLANNED", "处理中"), + CLOSE(30, "CLOSE", "已关闭"); + + private int value; + private String code; + private String description; + + WORK_ORDER_PLAN_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 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; + } + } + /** * 是否贵重物料 * 默认为2 */ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java index 0e69083..52fb00f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java @@ -81,6 +81,11 @@ public class MesPpMaster extends BaseBean{ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String remark; + @Column(name = "WORK_ORDER_PLAN_STATUS", columnDefinition = "int default 10") + @ApiParam("工单计划状态:10-创建,20-处理中,30-已关闭") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "WORK_ORDER_PLAN_STATUS") + private Integer workOrderPlanStatus; + public Integer getOrderStatus() { return orderStatus == null ? 0 : this.orderStatus.intValue(); }