From 52d27b663b6fdebe351a89c4f0c01da677f39c72 Mon Sep 17 00:00:00 2001
From: crish <570360737@qq.com>
Date: Fri, 17 May 2019 09:21:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=AD=E7=9F=A9=E9=87=87=E9=9B=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: crish <570360737@qq.com>
---
 .../estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java  | 63 ++++++++++++++++++++++
 .../pojo/mes/pcn/model/StationRequestBean.java     |  3 ++
 .../mes/pcn/repository/MesKpDataRepository.java    | 17 ++++++
 3 files changed, 83 insertions(+)
 create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java
 create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpDataRepository.java

diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java
new file mode 100644
index 0000000..94c7b81
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java
@@ -0,0 +1,63 @@
+package cn.estsh.i3plus.pojo.mes.pcn.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+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.Transient;
+
+/**
+ * @Description :物料关键数据
+ * @Reference :
+ * @Author : crish
+ * @CreateDate : 2019-05-15
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_KP_DATA")
+@Api("生产区域")
+public class MesKpData extends BaseBean {
+    @Column(name="PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name="KEY_DATA_CODE")
+    @ApiParam("关键数据代码")
+    private String keyDataCode;
+
+    @Column(name="KEY_DATA_NAME")
+    @ApiParam("关键数据名称")
+    private String keyDataName;
+
+    @Column(name="KEY_DATA_COUNT")
+    @ApiParam("关键数据数量")
+    private Integer keyDataCount;
+
+    @Column(name="UPPER_LIMIT")
+    @ApiParam("数据上限")
+    private Double upperLimit;
+
+    @Column(name="LOWER_LIMIT")
+    @ApiParam("数据下限")
+    private Double lowerLimit;
+
+    @Transient
+    @ApiParam("扭矩值")
+    private Double torqueValue;
+
+    @Transient
+    @ApiParam("是否在范围之内")
+    private Boolean ok;
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java
index 03ac201..9ee5b73 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java
@@ -49,6 +49,9 @@ public class StationRequestBean implements Serializable {
     @ApiParam("按钮编号")
     private String buttonCode;
 
+    @ApiParam("工步代码")
+    private String stepCode;
+
     /**
      * doScan-扫描，doModule-处理组件,initModule-初始化组件
      */
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpDataRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpDataRepository.java
new file mode 100644
index 0000000..da57b4f
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpDataRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesArea;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesKpData;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : crish
+ * @CreateDate : 2019-05-15
+ * @Modify:
+ **/
+@Repository
+public interface MesKpDataRepository extends BaseRepository<MesKpData, Long> {
+}