From 12074e24a828928f657907994409b5e4a7b5bc1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= <adair.song@estsh.com>
Date: Mon, 9 Nov 2020 14:15:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=A9=E6=B4=A5=E6=B6=82?=
 =?UTF-8?q?=E8=A3=85=E7=9C=8B=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/pojo/mes/bean/MesBoardArea.java   | 54 ++++++++++++++++++++++
 .../i3plus/pojo/mes/model/MgnBoardListModel.java   |  6 +++
 .../mes/repository/MesBoardAreaRepository.java     | 14 ++++++
 3 files changed, 74 insertions(+)
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardArea.java
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardAreaRepository.java

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardArea.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardArea.java
new file mode 100644
index 0000000..fcf8e78
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardArea.java
@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.mes.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.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description :mes看板车间配置
+ * @Reference :
+ * @Author : adair.song
+ * @CreateDate : 2020-11-09
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD_AREA")
+@Api("mes看板车间配置")
+public class MesBoardArea extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 4592603687011665216L;
+    @Column(name = "BOARD_CODE")
+    @ApiParam("看板代码")
+    private String boardCode;
+
+    @Column(name = "AREA_CODE")
+    @ApiParam("区域代码")
+    private String areaCode;
+
+    @Column(name = "PLAN_PASS_YIELD", columnDefinition = "decimal(18,3)")
+    @ColumnDefault("0")
+    @ApiParam("目标达成率")
+    private Double planPassYield;
+
+    @Column(name = "YIELD_DIFF_VALUE", columnDefinition = "decimal(18,3)")
+    @ColumnDefault("0")
+    @ApiParam("上下偏差值")
+    private Double yieldDiffValue;
+
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java
index cce2193..486deb5 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java
@@ -53,6 +53,12 @@ public class MgnBoardListModel {
     @ApiParam("车间")
     private String areaCode;
 
+    @ApiParam("绿线值")
+    private Double planPassYield;
+
+    @ApiParam("上下偏差值")
+    private Double yieldDiffValue;
+
     @ApiParam("产线集合")
     private List<MgnBoardListColorModel> workCenterList;
 
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardAreaRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardAreaRepository.java
new file mode 100644
index 0000000..fd1a8de
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardAreaRepository.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesBoardArea;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\13 11:53
+ * @Modify:
+ **/
+public interface MesBoardAreaRepository extends BaseRepository<MesBoardArea, Long> {
+}