Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

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

@@ -45,6 +45,16 @@ public class MesEnumUtil {
             }
             return tmp;
         }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
     }
 
     /**
@@ -82,6 +92,16 @@ public class MesEnumUtil {
             }
             return tmp;
         }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
     }
 
     /**
@@ -121,6 +141,16 @@ public class MesEnumUtil {
             }
             return tmp;
         }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
     }
 
     /**
@@ -159,6 +189,16 @@ public class MesEnumUtil {
             }
             return tmp;
         }
+
+        public static String descriptionOfValue(String description) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
     }
 
     /**

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringCastUtils.java

@@ -8,8 +8,6 @@ import java.util.regex.Pattern;
  */
 public class StringCastUtils {
 
-
-
     public static String upperCharToUnderLine(String param) {
       Pattern p= Pattern.compile("[A-Z]");
        if(param==null ||param.equals("")){
@@ -32,7 +30,7 @@ public class StringCastUtils {
      return builder.toString();
     }
 
-    public static void main(String[] args) {
-        upperCharToUnderLine("snStatus");
-    }
+//    public static void main(String[] args) {
+//        upperCharToUnderLine("snStatus");
+//    }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java

@@ -45,4 +45,13 @@ public class MesEquipmentModel implements Serializable {
         this.workCellCode = workCellCode;
         this.areaCode = areaCode;
     }
+
+    public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String workCellCode) {
+        this.id = id;
+        this.equipmentCode = equipmentCode;
+        this.equipmentName = equipmentName;
+        this.status = status;
+        this.workCenterCode = workCenterCode;
+        this.workCellCode = workCellCode;
+    }
 }