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

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.model.wms;
 
+import cn.estsh.i3plus.pojo.wms.bean.WmsPart;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -41,4 +42,7 @@ public class TransSnModle extends BaseComponetsParam implements Serializable {
      * 供应商批次
      */
     public String dateCode;
+
+    @ApiParam(value = "物料信息")
+    public WmsPart wmsPart;
 }

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

@@ -206,17 +206,33 @@ public class WmsDocMovementDetails extends BaseBean {
         return recommondLot == null ? "无" : this.recommondLot;
     }
 
-    public Double getQty() {return qty == null ? 0D : this.qty.doubleValue(); }
+    public Double getQty() {
+        return qty == null ? 0D : this.qty.doubleValue();
+    }
+
+    public Double getOutQty() {
+        return outQty == null ? 0D : this.outQty.doubleValue();
+    }
 
-    public Double getOutQty() {return outQty == null ? 0D : this.outQty.doubleValue(); }
+    public Double getPickQty() {
+        return pickQty == null ? 0D : this.pickQty.doubleValue();
+    }
 
-    public Double getPickQty() {return pickQty == null ? 0D : this.pickQty.doubleValue(); }
+    public Double getActualQty() {
+        return actualQty == null ? 0D : this.actualQty.doubleValue();
+    }
 
-    public Double getActualQty() {return actualQty == null ? 0D : this.actualQty.doubleValue(); }
+    public Double getRecQty() {
+        return recQty == null ? 0D : this.recQty.doubleValue();
+    }
 
-    public Integer getIsTaskVal() {return isTask == null ? 0 : this.isTask.intValue();}
+    public Integer getIsTaskVal() {
+        return isTask == null ? 0 : this.isTask.intValue();
+    }
 
-    public Integer getOrderMasterStatus() { return orderMasterStatus== null ? 0 : this.orderMasterStatus.intValue(); }
+    public Integer getOrderMasterStatus() {
+        return orderMasterStatus == null ? 0 : this.orderMasterStatus.intValue();
+    }
 
     @Version
     @Column(name = "LOCK_VERSION")