From 52b70927b3a5ac6c55c3fe10a2e3d6511b2312d8 Mon Sep 17 00:00:00 2001
From: "castle.zang" <loveCode1314>
Date: Fri, 16 Jul 2021 12:25:19 +0800
Subject: [PATCH 1/3] =?UTF-8?q?ptl=E4=BA=AE=E7=81=AF=E5=A2=9E=E5=8A=A0back?=
 =?UTF-8?q?off=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java   | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java
index cdd6725..8eeef68 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java
+++ b/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;
 }

From c93d9bdd2a4434946d4b34d0d9829c00ecea9c59 Mon Sep 17 00:00:00 2001
From: jun <337942886@qq.com>
Date: Fri, 16 Jul 2021 14:03:13 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E9=BA=A6=E6=A0=BC?=
 =?UTF-8?q?=E7=BA=B3ASN=E7=9C=8B=E6=9D=BF=E6=98=8E=E7=BB=86=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=AD=97=E6=AE=B5=E5=90=8E=E6=97=A0=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java
index 1ccf8d2..aed8e5f 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java
+++ b/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,

From fdec525fa1e3728f3cebaef9e17cff0e7529119d Mon Sep 17 00:00:00 2001
From: jun <337942886@qq.com>
Date: Sun, 18 Jul 2021 22:35:11 +0800
Subject: [PATCH 3/3] =?UTF-8?q?16788=2019081-=E5=8C=97=E4=BA=AC=E9=BA=A6?=
 =?UTF-8?q?=E6=A0=BC=E7=BA=B3=EF=BC=8CERP=E6=98=8E=E7=BB=86=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E4=BC=98=E5=8C=96=EF=BC=8C2021-07-16?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/wms/bean/snapshot/erp/WmsErpFgDetailsSnapshot.java       | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpFgDetailsSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpFgDetailsSnapshot.java
index 14eeefb..0887cf1 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpFgDetailsSnapshot.java
+++ b/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(){
+    }
 }