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

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

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description : PO订单明细信息
@@ -45,6 +46,8 @@ public class WmsPOMasterDetails extends BaseBean {
     @ApiParam(value = "需求数量", example = "0")
     public Double qty;
 
+    public Double getQty(){ return this.qty == null ? 0 : this.qty; }
+
     @Column(name = "UNIT")
     @ApiParam("单位")
     public String unit;
@@ -58,21 +61,29 @@ public class WmsPOMasterDetails extends BaseBean {
     @ApiParam(value = "条码打印数量", example = "0")
     public Double printQty;
 
+    public Double getPrintQty(){ return this.printQty == null ? 0 : this.printQty; }
+
     @Column(name = "RC_QTY")
     @ColumnDefault("0")
     @ApiParam(value = "收货数量", example = "0")
     public Double rcQty;
 
+    public Double getRcQty(){ return this.rcQty == null ? 0 : this.rcQty; }
+
     @Column(name = "PASS_QTY")
     @ColumnDefault("0")
     @ApiParam(value = "质检合格数量", example = "0")
     public Double passQty;
 
+    public Double getPassQty(){ return this.passQty == null ? 0 : this.passQty; }
+
     @Column(name = "NG_QTY")
     @ColumnDefault("0")
     @ApiParam(value = "质检不合格数量", example = "0")
     public Double ngQty;
 
+    public Double getNgQty(){ return this.ngQty == null ? 0 : this.ngQty; }
+
     @Column(name = "PLAN_DATE")
     @ApiParam("计划交货日期")
     public String planDate;
@@ -81,9 +92,9 @@ public class WmsPOMasterDetails extends BaseBean {
     @ApiParam("计划交货时间")
     public String planTime;
 
-    @Column(name = "ERP_WH_NO")
+    @Column(name = "ERP_AREA_NO")
     @ApiParam("默认收货库存地")
-    public String erpWhNo;
+    public String erpAreaNo;
 
     /**
      * 状态:10 N=正常,20 C=行取消
@@ -102,4 +113,11 @@ public class WmsPOMasterDetails extends BaseBean {
     @Column(name = "IS_FREE")
     @ApiParam(value = "是否免费", example = "1")
     public Integer isFree;
+
+    @Transient
+    @ApiParam(value = "散件收货输入数量", example = "0")
+    public Double inputRcQty;
+
+
+    public Double getInputRcQty(){ return this.inputRcQty == null ? 0 : this.inputRcQty; }
 }