From 2a0204ad991788dda39923b7d3149f55f24f428b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= <sliter.yuan@estsh.com>
Date: Fri, 20 Mar 2020 19:32:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91WMS=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E6=8F=92=E4=BB=B6=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/WmsEnumUtil.java     | 61 ++++++++++++++++++++++
 .../i3plus/pojo/wms/bean/plugin/BasPlugin.java     |  9 +++-
 2 files changed, 69 insertions(+), 1 deletion(-)

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 44f3039..309bdcc 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
@@ -5150,4 +5150,65 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     *  插件类型 10-PDA插件，20-交易处理插件
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PLUGIN_TYPE {
+        PDA_PLUGIN(10, "PDA_PLUGIN", "PDA插件"),
+        TRANS_PLUGIN(20, "TRANS_PLUGIN", "交易处理插件");
+
+        private int value;
+        private String code;
+        private String description;
+
+        PLUGIN_TYPE(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 PLUGIN_TYPE codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        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;
+        }
+    }
 }
\ No newline at end of file
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPlugin.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPlugin.java
index 876fd8e..6942fee 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPlugin.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPlugin.java
@@ -63,7 +63,7 @@ public class BasPlugin extends BaseBean{
 
     @Column(name = "COPYRIGHT")
     @ApiParam(value = "版权")
-    private Integer copyRight;
+    private String copyRight;
 
     @Column(name = "AUTHOR")
     @ApiParam(value = "作者")
@@ -83,4 +83,11 @@ public class BasPlugin extends BaseBean{
     @Column(name = "PLUGIN_PACKAGE_NAME")
     @ApiParam(value = "插件项目包名称")
     private String pluginPackName;
+
+    /**
+     * 插件类型 10-PDA功能插件，20-交易处理插件
+     */
+    @Column(name="PLUGIN_TYPE")
+    @ApiParam(value = "插件类型", example = "10")
+    private Integer pluginType;
 }
\ No newline at end of file