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

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java

@@ -40,7 +40,7 @@ public class AndonRouteStatusErrorRecord extends BaseBean implements Serializabl
     public String andonOrderNo;
 
     @Column(name = "ERROR_DESC")
-    @ApiParam(value = "失败描述")
+    @ApiParam(value = "异常描述")
     public String errorDesc;
 
     @Column(name = "WORK_CENTER_CODE")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java

@@ -16,6 +16,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.lang.reflect.Method;
 import java.sql.JDBCType;
 
@@ -122,11 +123,15 @@ public class FieldInfo extends BaseAPS {
     private Boolean notEmpty;
 
     @JsonIgnore
+    @Transient
     private transient Class<? extends BaseBean> clazz;
     @JsonIgnore
+    @Transient
     private transient Class<?> typeClass;
     @JsonIgnore
+    @Transient
     private transient Method getMethod;
     @JsonIgnore
+    @Transient
     private transient Method setMethod;
 }

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java

@@ -42,7 +42,7 @@ public class PtlRouteStatusErrorRecord extends BaseBean implements Serializable
     private String taskNo;
 
     @Column(name = "ERROR_DESC")
-    @ApiParam(value = "失败描述")
+    @ApiParam(value = "异常描述")
     public String errorDesc;
 
     @Column(name = "AREA_NO")

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

@@ -202,6 +202,10 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones",
     @ApiParam(value = "库龄")
     private String age;
 
+    @Transient
+    @ApiParam(value = "库位箱数")
+    private Long qty;
+
     public WmsLocate() {
     }
 
@@ -252,6 +256,12 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones",
         this.z=z;
     }
 
+    public WmsLocate(Long qty, Integer status, String zoneNo) {
+        this.qty = qty;
+        this.status = status;
+        this.zoneNo = zoneNo;
+    }
+
     public Integer getMaxPackageQty() {
         return this.maxPackageQty == null ? 0 : this.maxPackageQty.intValue();
     }

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-DEV-SNAPSHOT
  
 # Path is relative to the sonar-project.properties file. Defaults to .
 #sonar.sources=./