From c1c00213e1635c5a3608538a17060b45336136bf Mon Sep 17 00:00:00 2001
From: WYnneaoapc <lu_1005@foxmail.com>
Date: Tue, 12 Nov 2019 22:37:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E7=9B=91=E6=8E=A7=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=206283?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/mes/pcn/bean/MesProduceSnTravel.java      |  6 ++++-
 .../i3plus/pojo/mes/pcn/model/StepParamsModel.java | 29 ++++++++++++++++++++++
 .../i3plus/pojo/mes/bean/MesProduceSnTravel.java   |  6 ++++-
 .../i3plus/pojo/mes/model/StepParamsModel.java     | 29 ++++++++++++++++++++++
 4 files changed, 68 insertions(+), 2 deletions(-)
 create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepParamsModel.java
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepParamsModel.java

diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java
index e162d62..bd8d086 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java
@@ -29,9 +29,13 @@ import javax.persistence.Transient;
 @Api("产品条码履历表")
 public class MesProduceSnTravel extends BaseBean {
     @Column(name = "SERIAL_NUMBER")
-    @ApiParam("产品条码")
+    @ApiParam("过程条码")
     private String serialNumber;
 
+    @Column(name = "PRODUCT_SN")
+    @ApiParam("产品条码")
+    private String productSn;
+
     @Column(name = "PART_NO")
     @ApiParam("物料号")
     private String partNo;
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepParamsModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepParamsModel.java
new file mode 100644
index 0000000..7b2296f
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepParamsModel.java
@@ -0,0 +1,29 @@
+package cn.estsh.i3plus.pojo.mes.pcn.model;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/11/12 3:50 下午
+ * @Description: 下拉工步参数对象
+ **/
+@Data
+@Api("下拉工步参数对象")
+public class StepParamsModel implements Serializable {
+    private static final long serialVersionUID = -6361645141217616499L;
+
+    @ApiParam("参数代码")
+    private String paramCode;
+
+    @ApiParam("参数代码")
+    private Map<String, Object> paramValues;
+
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java
index 4eed687..d3d073b 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java
@@ -29,9 +29,13 @@ import javax.persistence.Transient;
 @Api("产品条码履历表")
 public class MesProduceSnTravel extends BaseBean {
     @Column(name = "SERIAL_NUMBER")
-    @ApiParam("产品条码")
+    @ApiParam("过程条码")
     private String serialNumber;
 
+    @Column(name = "PRODUCT_SN")
+    @ApiParam("产品条码")
+    private String productSn;
+
     @Column(name = "PART_NO")
     @ApiParam("物料号")
     private String partNo;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepParamsModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepParamsModel.java
new file mode 100644
index 0000000..2a90b5e
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepParamsModel.java
@@ -0,0 +1,29 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/11/12 3:50 下午
+ * @Description: 下拉工步参数对象
+ **/
+@Data
+@Api("下拉工步参数对象")
+public class StepParamsModel implements Serializable {
+    private static final long serialVersionUID = -6361645141217616499L;
+
+    @ApiParam("参数代码")
+    private String paramCode;
+
+    @ApiParam("参数代码")
+    private Map<String, Object> paramValues;
+
+
+}