Merge branch 'dev' of gragon.xu/i3plus-pojo into dev

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

@@ -3155,10 +3155,21 @@ public class WmsEnumUtil {
             }
             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;
+        }
 
         public static String valueOfDescription(int val) {
             return valueOf(val);
         }
+        public static int descriptionOfValue(String desc) {return descOf(desc);}
+
     }
 
 
@@ -4955,10 +4966,20 @@ public class WmsEnumUtil {
             }
             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;
+        }
 
         public static String valueOfDescription(int val) {
             return valueOf(val);
         }
+        public static int descriptionOfValue(String desc) {return descOf(desc);}
     }
 
     /**

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchGroupModel.java

@@ -30,4 +30,7 @@ public class WmsSearchGroupModel {
 
     @ApiParam(value = "有效性")
     public Integer isValid;
+
+    @ApiParam(value = "工厂代码")
+    public String organizeCode;
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTdChangeModel.java

@@ -22,4 +22,5 @@ public class WmsTdChangeModel implements Serializable {
     private List<WmsZones> wmsZonesList;
     private List<WmsFurniture> wmsFurnitureList;
     private List<WmsLocate> wmsLocateList;
+    private String organizeCode;
 }