Merge branch 'dev' into test

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

@@ -176,6 +176,9 @@ public class WmsASNMaster extends BaseBean {
     @ApiParam("项目")
     private String prodCfgTypeCode;
 
+    @Transient
+    private List<String> orderNoList;
+
     public WmsASNMaster() {
     }
 

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

@@ -133,6 +133,11 @@ public class WmsCSOrderDetails extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.INVENTORY_DIFFERENCE_TYPE.class,refForeignKey = "value",value = "description")
     public Integer differenceType;
 
+    public Integer getDifferenceType() {
+        return this.differenceType == null ?
+        -1: this.differenceType;
+    }
+
     public Double getQty() {
         return this.qty == null ? 0 : this.qty;
     }

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

@@ -144,6 +144,17 @@ public class WmsPOMaster extends BaseBean {
     @ApiParam("前端信息")
     private String message;
 
+    @Transient
+    @ApiParam("计划日期开始")
+    private String planDateStart;
+
+    @Transient
+    @ApiParam("计划日期结束")
+    private String planDateEnd;
+
+    @Transient
+    private List<String> orderNoList;
+
     public int getPoStatusVal() {
         return this.poStatus == null ? 0 : this.poStatus;
     }