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

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

@@ -330,7 +330,7 @@ public class WmsPOMasterDetails extends BaseBean {
     }
 
     public WmsPOMasterDetails(String orderNo, String partNo, String partNameRdd, String planDate, String planTime,
-                              Double snp, Long totalBoxes, Double qty) {
+                              Double snp, Long totalBoxes, Double qty,Double recQty,String modifyDatetime) {
         this.orderNo = orderNo;
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;
@@ -339,6 +339,8 @@ public class WmsPOMasterDetails extends BaseBean {
         this.snp = snp;
         this.totalBoxes = totalBoxes.intValue();
         this.qty = qty;
+        this.rcQty = recQty;
+        this.modifyDatetime = modifyDatetime;
     }
 
     public WmsPOMasterDetails(String orderNo, String erpSrcNo, Integer item,String partNo,String partNameRdd, Double qty,

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpFgDetailsSnapshot.java

@@ -64,4 +64,12 @@ public class WmsErpFgDetailsSnapshot extends BaseBean {
 
     @ApiParam("存储区")
     private String zoneNo;
+
+    public WmsErpFgDetailsSnapshot(String snapshotTime,String createDatetime){
+        this.snapshotTime = snapshotTime;
+        this.createDatetime = createDatetime;
+    }
+
+    public WmsErpFgDetailsSnapshot(){
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -566,6 +566,8 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringLikerPack(wmsZones.getZoneNo(), "zoneNo", result);
         //存储区名称
         DdlPreparedPack.getStringLikerPack(wmsZones.getZoneName(), "zoneName", result);
+        //是否字节点
+        DdlPreparedPack.getNumEqualPack(wmsZones.getIsSonNode(), "isSonNode", result);
 
         getStringBuilderPack(wmsZones, result);