Merge branch 'test'

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

@@ -157,6 +157,14 @@ public class WmsMoveToERP extends BaseBean {
     @ApiParam("关联单据行号")
     public String refItem;
 
+    @Column(name="IS_LOCK")
+    @ApiParam(value = "是否锁定", example = "2")
+    public Integer isLock= CommonEnumUtil.FALSE;
+
+    @Column(name = "YEAR")
+    @ApiParam("年度")
+    public String year;
+
     @ApiParam(value = "待出库数量", example = "0")
     @Transient
     private Long waitingCounts;
@@ -168,6 +176,13 @@ public class WmsMoveToERP extends BaseBean {
     @Transient
     private Long shippingId;
 
+    @Transient
+    private Double transQtySum;
+
+    public Double getTransQtySumVal() {
+        return this.transQtySum == null ? 0 : this.transQtySum.doubleValue();
+    }
+
     public Double getRejectQty(){
         return this.rejectQty == null ? 0 : this.rejectQty.doubleValue();
     }
@@ -183,4 +198,15 @@ public class WmsMoveToERP extends BaseBean {
     public Long getFinishedCounts() {
         return finishedCounts == null ? 0L : this.finishedCounts;
     }
+
+    public WmsMoveToERP() {}
+
+    public WmsMoveToERP(String partNo, String partNameRdd, String vendorNo, String unit, String destAreaNo, Double transQtySum) {
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.vendorNo = vendorNo;
+        this.unit = unit;
+        this.destAreaNo = destAreaNo;
+        this.transQtySum = transQtySum;
+    }
 }

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

@@ -240,6 +240,8 @@ public class WmsStockSn extends BaseBean {
         this.partNo = partNo;
     }
 
+    public Integer getSnType() { return snType == null ? 0 : snType.intValue();}
+
     public Double getQty() {
         return qty == null ? 0L : qty.doubleValue();
     }