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

modules/i3plus-pojo-mes-pcn/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

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

@@ -259,6 +259,10 @@ public class WmsPOMaster extends BaseBean {
     @ApiParam("计划交货时间")
     private String planPlanDateTime;
 
+    @Transient
+    @ApiParam(value = "收货日期时间")
+    public String receiveDateTime;
+
 
 
 
@@ -305,12 +309,13 @@ public class WmsPOMaster extends BaseBean {
     }
 
     public WmsPOMaster(String orderNo, String reason, String planDate, String planTime,
-                       String receiveTime, String vendorNo, String vendorName, String organizeCode) {
+                       String receiveTime,String receiveDate, String vendorNo, String vendorName, String organizeCode) {
         this.orderNo = orderNo;
         this.reason = reason;
         this.planDate = planDate;
         this.planTime = planTime;
         this.receiveTime = receiveTime;
+        this.receiveDate= receiveDate;
         this.vendorNo = vendorNo;
         this.vendorName = vendorName;
         this.organizeCode = organizeCode;

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -99,6 +101,10 @@ public class WmsQCSNErrorList extends BaseBean {
     @ApiParam(value = "供应商编码")
     private String vendorNo;
 
+    @Column(name = "VENDOR_NAME")
+    @ApiParam(value = "供应商名称")
+    private String vendorName;
+
     @Column(name = "ERROR_CODE")
     @ApiParam("不良代码")
     private String errorCode;
@@ -116,4 +122,9 @@ public class WmsQCSNErrorList extends BaseBean {
     @ColumnDefault("0")
     @ApiParam(value = "质检比例", example = "0")
     public String qcScale;
+
+    @Column(name = "REF_SRC")
+    @ApiParam("关联单号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    public String refSrc;
 }

sonar-project.properties

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