Merge remote-tracking branch 'origin/dev' into dev

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

@@ -63,7 +63,7 @@ public class WmsDocMovementSn extends BaseBean {
     public String unit;
 
     /**
-     * 状态：操作状态
+     * 状态：操作状态  itemStatus
      */
     @Column(name="SN_STATUS")
     @ApiParam(value = "操作状态", example = "10")
@@ -105,4 +105,9 @@ public class WmsDocMovementSn extends BaseBean {
     @Transient
     @ApiParam("ERP库存地")
     private String erpWhNo;
+
+    @Column(name="SN_STATUS")
+    @ApiParam(value = "状态", example = "10")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
+    public Integer itemStatus;
 }

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

@@ -246,7 +246,8 @@ public class WmsStockSn extends BaseBean {
     @Transient
     private Integer isSnapshot;
 
-    public WmsStockSn(){}
+    public WmsStockSn() {
+    }
 
     public WmsStockSn(String partNo) {
         this.partNo = partNo;
@@ -256,17 +257,33 @@ public class WmsStockSn extends BaseBean {
         return isSnapshot == null ? 0 : isSnapshot.intValue();
     }
 
-    public Integer getSnType() { return snType == null ? 0 : snType.intValue();}
+    public Integer getSnType() {
+        return snType == null ? 0 : snType.intValue();
+    }
 
     public Double getQty() {
         return qty == null ? 0L : qty.doubleValue();
     }
 
-    public Double getInputNCQty(){return inputNCQty == null ? 0L : this.inputNCQty.doubleValue();}
+    public Double getInputNCQty() {
+        return inputNCQty == null ? 0L : this.inputNCQty.doubleValue();
+    }
 
     public WmsStockSn(Long snCount, Double sumPartQty, String locateNo) {
         this.snCount = snCount;
         this.sumPartQty = sumPartQty;
         this.locateNo = locateNo;
     }
+
+    //locate_no,part_no,sn_status,qc_status,sum(qty),is_deleted,is_valid
+    public WmsStockSn(String locateNo, String partNo, Integer snStatus,
+                      Integer qcStatus, Double qty, Integer isDeleted, Integer isValid) {
+        this.locateNo = locateNo;
+        this.partNo = partNo;
+        this.snStatus = snStatus;
+        this.qcStatus = qcStatus;
+        this.qty = qty;
+        this.isDeleted = isDeleted;
+        this.isValid = isValid;
+    }
 }