Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -1436,4 +1436,40 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 作业步骤处理组件参数类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ACTION_MOUDULE_PARAM_TYPE {
+        CHECKLIST(1, "可选列表"),
+        NUMBER(10, "数字"),
+        STRING(20, "字符串");
+
+        private int value;
+        private String description;
+
+        ACTION_MOUDULE_PARAM_TYPE(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;
+        }
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java

@@ -48,6 +48,6 @@ public class WmsActionModuleParam extends BaseBean {
     public String paramValueList;
 
     @Column(name = "PARAM_TYPE")
-    @ApiParam(value = "参数类型", example = "0")
+    @ApiParam(value = "参数类型【1=可选列表,10=数字,20=字符串】", example = "0")
     public Integer paramType;
 }