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

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

@@ -81,4 +81,11 @@ public class WmsCSFactTrans extends BaseBean {
     @Column(name="REMARK")
     @ApiParam(value = "备注")
     public String reMark;
+
+    public WmsCSFactTrans(){}
+
+    public WmsCSFactTrans(double factQty, String partNo){
+        this.factQty = factQty;
+        this.partNo = partNo;
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.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 : 盘点单冻结信息
@@ -94,7 +95,21 @@ public class WmsCSOrderDetails extends BaseBean {
     @ApiParam(value = "处理状态", example = "1")
     public Integer transStatus;
 
+    //虚拟字段（实盘数量、剩余数量）
+    @Transient
+    public Double factQty;
+
+    @Transient
+    public Double surplusQty;
+
     public Double getQty() {
         return this.qty == null ? 0 : this.qty;
     }
+
+    public WmsCSOrderDetails(){}
+
+    public WmsCSOrderDetails(double qty, String partNo){
+        this.qty = qty;
+        this.partNo = partNo;
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.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 :移库单明细实体(用于转储类业务)
@@ -138,4 +139,12 @@ public class WmsDocMovementDetails extends BaseBean {
     @Column(name = "DEST_AREA_NO")
     @ApiParam("目的库存地代码")
     public String destAreaNo;
+
+    @Transient
+    @ApiParam("推荐批次")
+    private String recommondLot;
+
+    @Transient
+    @ApiParam("推荐库位")
+    private String recommondLocateNo;
 }

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

@@ -165,4 +165,10 @@ public class WmsStockSn extends BaseBean {
     @ApiParam(value = "二维码内容")
     @Transient
     public String barCode;
+
+    public WmsStockSn(){}
+
+    public WmsStockSn(String partNo){
+        this.partNo = partNo;
+    }
 }

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

@@ -85,6 +85,13 @@ public class WmsTaskDetails extends BaseBean {
     @ApiParam(value = "状态", example = "1")
     private Integer itemStatus;
 
+    public Integer getItemStatus(){
+        if(itemStatus == null) {
+            return  null;
+        }
+        return itemStatus.intValue();
+    }
+
     @Column(name = "SRC_ZONE_NO")
     @ApiParam(value = "源存储区代码")
     private String srcZoneNo;