From 49442ab5aa0a29bcce224ea40640f5b8923451aa Mon Sep 17 00:00:00 2001
From: jun <337942886@qq.com>
Date: Tue, 12 Oct 2021 13:27:27 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=88=90=E9=83=BD=E9=BA=A6=E6=A0=BC?=
 =?UTF-8?q?=E7=BA=B3=EF=BC=8CwmsCqMaster=E6=96=B0=E5=A2=9E=E6=9E=84?=
 =?UTF-8?q?=E9=80=A0=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java    | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java
index 9003e5f..a2a82f8 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java
@@ -180,4 +180,18 @@ public class WmsQCMaster extends BaseBean {
         this.partNameRdd = partNameRdd;
         this.createDatetime = createDatetime;
     }
+
+    public WmsQCMaster(String orderNo,String refSrc,String remark,String vendorNo,String vendorDesc,String partNo,String partNameRdd,Double qty,Integer orderStatus,Integer qcStatus,String createDatetime) {
+        this.orderNo = orderNo;
+        this.refSrc = refSrc;
+        this.remark = remark;
+        this.vendorNo = vendorNo;
+        this.vendorDesc = vendorDesc;
+        this.partNo = partNo;
+        this.qty = qty;
+        this.orderStatus = orderStatus;
+        this.partNameRdd = partNameRdd;
+        this.qcStatus = qcStatus;
+        this.createDatetime = createDatetime;
+    }
 }

From e390e7fc334f8896d4545befea0fae9d8fb76181 Mon Sep 17 00:00:00 2001
From: jun <337942886@qq.com>
Date: Sun, 17 Oct 2021 14:31:24 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=88=90=E9=83=BD=EF=BC=9APULL=5FWAY=5FSTA?=
 =?UTF-8?q?TUS=E6=9E=9A=E4=B8=BE=E6=96=B0=E5=A2=9E=20OVER=5FPULL(80,=20"?=
 =?UTF-8?q?=E8=BF=87=E7=82=B9=E6=8B=89=E5=8A=A8")?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
index 3e95368..2fa95d8 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
@@ -4958,7 +4958,8 @@ public class WmsEnumUtil {
         PLANNED_PULL(40, "计划拉动"),
         ANDON_PULL(50, "安灯拉动"),
         EXTERNAL_PULL(60, "手工拉动"),
-        WORKORDER_PULL(70, "工单拉动");
+        WORKORDER_PULL(70, "工单拉动"),
+        OVER_PULL(80, "过点拉动");
 
         private int value;
         private String description;

From 93f50a56be2f0eb6918587e5f0b9d02d0e2558c5 Mon Sep 17 00:00:00 2001
From: jun <337942886@qq.com>
Date: Sun, 17 Oct 2021 14:58:17 +0800
Subject: [PATCH 3/3] =?UTF-8?q?WMS=5F=E4=BA=A7=E5=93=81=E6=8A=A5=E5=B7=A5?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E4=BF=A1=E6=81=AF=20=E6=96=B0=E5=A2=9E@ApiPa?=
 =?UTF-8?q?ram("=E6=98=AF=E5=90=A6=E5=B7=B2=E7=BB=8F=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E9=A2=86=E6=96=99=E5=8D=95")=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java
index 7095697..fc9ff48 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java
@@ -216,6 +216,9 @@ public class WmsDocFgDetail extends BaseBean {
     @ApiParam(value = "产品条码")
     private String serialNumber;
 
+    @Column(name = "IS_GENERATE_PICKING", columnDefinition = "int default 2")
+    @ApiParam("是否已经生成领料单")
+    public Integer isGeneratePicking;