Merge branch 'dev' into test

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

@@ -176,7 +176,8 @@ public class WmsASNMaster extends BaseBean {
     @ApiParam("项目")
     private String prodCfgTypeCode;
 
-    public  WmsASNMaster(){}
+    public WmsASNMaster() {
+    }
 
     public WmsASNMaster(String orderNo, Integer asnStatus, String vendorNo, String partNo, String partNameRdd,
                         Double sumQty, Double sumRecQty, String planDate, String planTime, Double diffQty, String orderType,
@@ -196,5 +197,7 @@ public class WmsASNMaster extends BaseBean {
         this.recStatus = recStatus;
     }
 
-
+    public int getAsnStatusVal() {
+        return this.asnStatus == null ? 0 : this.asnStatus;
+    }
 }

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

@@ -162,7 +162,7 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam("类型名称")
     public String busiTypeName;
 
-//    public Integer getIsSn() {
+    public int getOrderStatusVal() {
-////        return isSn == null ? 0 : this.getIsSn();
+        return this.orderStatus == null ? 0 : this.orderStatus;
-////    }
+    }
 }

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

@@ -140,4 +140,8 @@ public class WmsPOMaster extends BaseBean {
     @Transient
     @ApiParam("前端信息")
     private String message;
+
+    public int getPoStatusVal() {
+        return this.poStatus == null ? 0 : this.poStatus;
+    }
 }

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

@@ -94,4 +94,8 @@ public class WmsQCMaster extends BaseBean {
     @ApiParam(value = "是否散件", example = "2")
     @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
     public Integer isPart;
+
+    public int getOrderStatusVal() {
+        return this.orderStatus == null ? 0 : this.orderStatus;
+    }
 }