From 1d90195de668b0d253a7546cd53f432663579a30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= <gragon.xu@estsh.com>
Date: Thu, 12 Mar 2020 09:50:34 +0800
Subject: [PATCH] =?UTF-8?q?3D=E4=BB=93=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/WmsEnumUtil.java      | 21 +++++++++++++++++++++
 .../i3plus/pojo/model/wms/WmsSearchGroupModel.java  |  3 +++
 .../i3plus/pojo/model/wms/WmsTdChangeModel.java     |  1 +
 3 files changed, 25 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 57cadad..9a6da09 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
@@ -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);}
     }
 
     /**
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchGroupModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchGroupModel.java
index b4d1527..5d35929 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchGroupModel.java
+++ b/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;
 }
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTdChangeModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTdChangeModel.java
index a6f69a8..4033d02 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTdChangeModel.java
+++ b/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;
 }