From 746a17bd7539a670f75789981fc7f3fd5535f435 Mon Sep 17 00:00:00 2001
From: "joke.wang" <joke.wang@estsh.com>
Date: Wed, 2 Sep 2020 18:26:46 +0800
Subject: [PATCH] =?UTF-8?q?bj-mgn=E8=BE=85=E5=8A=A9=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java |  4 ++++
 .../i3plus/pojo/mes/model/AssistModuleModel.java   | 25 ++++++++++++++++++++++
 .../i3plus/pojo/mes/model/GenSerialNoModel.java    |  3 +++
 3 files changed, 32 insertions(+)
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AssistModuleModel.java

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java
index 3f2bef5..571dd6c 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java
@@ -74,6 +74,10 @@ public class MesWorkCell extends BaseBean implements Serializable {
     @ApiParam("目标合格率")
     private Double targetPassRate;
 
+    @Column(name = "STAND_TAKT")
+    @ApiParam("标准节拍")
+    private Integer standTakt;
+
     @Transient
     @ApiParam(value = "子集列表")
     private List<MesEquipment> childTreeList;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AssistModuleModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AssistModuleModel.java
new file mode 100644
index 0000000..166c188
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AssistModuleModel.java
@@ -0,0 +1,25 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/9/2 5:00 下午
+ * @Modify:
+ */
+@Data
+public class AssistModuleModel {
+
+    @ApiParam("标准节拍")
+    private Integer standTakt;
+
+    @ApiParam("x坐标内容")
+    private List<String> xAxis;
+
+    @ApiParam("y坐标内容")
+    private List<String> yAxis;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java
index c130f5b..7cbd75b 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java
@@ -88,6 +88,9 @@ public class GenSerialNoModel {
     @ApiParam("零件号后4位")
     private String partNoAfterFour;
 
+    @ApiParam("客户工厂代码")
+    private String custProdLineCode;
+
 
     public GenSerialNoModel(String ruleCode) {
         this.ruleCode = ruleCode;