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

 Conflicts:

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

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

@@ -3361,6 +3361,7 @@ public class WmsEnumUtil {
     public enum SRC_STATUS {
         ZMMES("ZMMES", "知明MES"),
         TBMES("TBMES", "MES接口"),
+        TGMES("TGMES", "泰国MES"),
         AMP("AMP", "AMP系统"),
         DR("DR", "直送拉动");
 
@@ -3379,6 +3380,16 @@ public class WmsEnumUtil {
         public String getDescription() {
             return description;
         }
+
+        public static String descriptionOfValue(String value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(value)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
     }
 
     public static Map<String, Object> getEnumByName(String enumName) throws Exception {

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

@@ -156,6 +156,14 @@ public class WmsDocFgDetail extends BaseBean {
     @ApiParam(value = "BOM版本号")
     private String bomVersion;
 
+    @Column(name = "FIX_LOT_NO", nullable = false)
+    @ApiParam(value = "特殊批次")
+    private String fixLotNo = "";
+
+    @Column(name = "PACKAGE_NO")
+    @ApiParam(value = "包装编号")
+    private String packageNo;
+
     @Column(name = "SEQ_NO")
     @ApiParam(value = "父位置号")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)

sonar-project.properties

@@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo
 # defaults to project key
 sonar.projectName=i3plus-pojo
 # defaults to 'not provided'
-sonar.projectVersion=1.0-PROD-SNAPSHOT
+sonar.projectVersion=1.0-TEST-SNAPSHOT
  
 # Path is relative to the sonar-project.properties file. Defaults to .
 #sonar.sources=./