From cf26f7eaddefd8496bd5ca040bf22776323417a2 Mon Sep 17 00:00:00 2001
From: "jhforever.wang@estsh.com" <jhforever.wang@estsh.com>
Date: Mon, 14 Sep 2020 09:10:37 +0800
Subject: [PATCH 1/2] =?UTF-8?q?mespcn=E5=BC=82=E6=AD=A5=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/mes/model/FutrueTaskModel.java     | 27 ++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java
new file mode 100644
index 0000000..917b27c
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java
@@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description: 条码解绑实体
+ * @Reference:
+ * @Author: siliter.yuan
+ * @CreateDate: 2020-06-28-11:44
+ * @Modify:
+ **/
+@Data
+public class FutrueTaskModel {
+
+    @ApiParam("实现类")
+    private Object futrueTaskService;
+
+    @ApiParam("包装条码")
+    private StationRequestBean stationRequestBean;
+
+    @ApiParam("过程条码")
+    private MesProduceSn produceSn;
+
+
+}

From 6765c58de2a38098ed10f18f412aacb3e95fa8bd Mon Sep 17 00:00:00 2001
From: "puxiao.liao" <liaopuxiao@sina.cn>
Date: Mon, 14 Sep 2020 09:45:50 +0800
Subject: [PATCH 2/2] =?UTF-8?q?Fix=20bug#11212=20=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E7=9A=84=E6=9D=A1=E7=A0=81=E5=9C=A8=E6=9D=A1?=
 =?UTF-8?q?=E7=A0=81=E7=8A=B6=E6=80=81=E4=B8=AD=E6=9F=A5=E8=AF=A2=E6=98=AF?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E7=8A=B6=E6=80=81=20--20200914?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java
index 241599c..bce6ced 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java
@@ -72,4 +72,13 @@ public class WmsWorkCenter extends BaseBean {
             searchColumnName = "zoneNo,locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo")
     private String descLocationCode;
 
+
+    /**
+     * 分钟
+     **/
+    @Column(name = "ADVANCE_PULL_TIMES", columnDefinition = "int default 0")
+    @ApiParam(value = "提前拉动时间")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    private Integer advancePullTimes;
+
 }