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

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java

@@ -5,16 +5,10 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Version;
+import javax.persistence.*;
 import java.io.Serializable;
 
 /**
@@ -71,4 +65,7 @@ public class PtlControl extends BaseBean implements Serializable {
     @ApiParam(value = "乐观锁", example = "1")
     public transient Integer lockVersion;
 
+    @Column(name = "BACKOFF")
+    @ApiParam("是否需要回调")
+    private Integer backoff;
 }

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(){
+    }
 }