Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev

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

@@ -826,4 +826,10 @@ public class WmsDocMovementDetails extends BaseBean {
         this.createUser = createUser;
 
     }
+
+    public WmsDocMovementDetails (String erpSrcNo,String partNo,Double outQty) {
+        this.erpSrcNo = erpSrcNo;
+        this.partNo = partNo;
+        this.outQty = outQty;
+    }
 }

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

@@ -249,6 +249,10 @@ public class WmsPOMasterDetails extends BaseBean {
     private Double sumRcQty;
 
     @Transient
+    @ApiParam("退货数量")
+    private Double outQty;
+
+    @Transient
     @ApiParam("单据集合")
     private List<String> orderNoLst;
 

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

@@ -1057,11 +1057,22 @@ public class WmsStockSn extends BaseBean {
         this.vendorNo = vendorNo;
     }
 
-
-
-
     public WmsStockSn(String partNo, Double qty) {
         this.partNo = partNo;
         this.qty = qty;
     }
+
+    public WmsStockSn(WmsStockSn wmsStockSn, String modifyDatetime ,String modifyUser) {
+        this.sn = wmsStockSn.getSn();
+        this.partNo = wmsStockSn.getPartNo();
+        this.partNameRdd = wmsStockSn.getPartNameRdd();
+        this.qty = wmsStockSn.getQty();
+        this.vendorNo = wmsStockSn.getVendorNo();
+        this.lotNo = wmsStockSn.getLotNo();
+        this.modifyDatetime = modifyDatetime;
+        this.modifyUser = modifyUser;
+        this.leftCode = wmsStockSn.getLeftCode();
+        this.dateCode = wmsStockSn.getDateCode();
+        this.fixLotNo = wmsStockSn.getFixLotNo();
+    }
 }