From 486dda639f730f283367af88d7c880dd2c87802f Mon Sep 17 00:00:00 2001
From: "yiming.gu" <yiming.gu@estsh.com>
Date: Tue, 14 May 2019 10:39:32 +0800
Subject: [PATCH] =?UTF-8?q?pcn=E9=98=9F=E5=88=97pojo=20vin=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=94=B9=E4=B8=BAstring=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/MesEnumUtil.java     | 38 ++++++++++++++++++++++
 .../i3plus/pojo/mes/pcn/bean/MesQueueOrder.java    |  2 +-
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
index bc9b23c..84e4777 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
@@ -571,4 +571,42 @@ public class MesEnumUtil {
         }
     }
 
+    /**
+     * 组织模型树形菜单level
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PROD_ORG_LEVEL{
+
+        LEVEL_ONE(1,"一级目录"),
+        LEVEL_TWO(1,"二级目录"),
+        LEVEL_THREE(1,"三级目录"),
+        LEVEL_FOUR(1,"四级目录");
+
+        private int value;
+        private String description;
+
+        PROD_ORG_LEVEL(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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java
index 32e27cb..26675f7 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java
@@ -33,7 +33,7 @@ public class MesQueueOrder extends BaseBean {
 
     @Column(name="VIN_CODE")
     @ApiParam("Vin")
-    private Integer vinCode;
+    private String vinCode;
 
     @Column(name="CUST_FLAG_NO")
     @ApiParam("客户标识号")