From 2a93bb2ca4c0225864a6faa159efb786947c7ff7 Mon Sep 17 00:00:00 2001
From: "joke.wang" <joke.wang@estsh.com>
Date: Wed, 29 Jul 2020 09:28:12 +0800
Subject: [PATCH] Finish Task #2521

---
 .../java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java |  8 ++
 .../cn/estsh/i3plus/pojo/mes/model/BiModel.java    | 89 ++++++++++++++++++++++
 .../pojo/mes/model/OperateObjectParamModel.java    |  9 ++-
 3 files changed, 103 insertions(+), 3 deletions(-)
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BiModel.java

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java
index 0fedc5b..43454da 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java
@@ -108,6 +108,14 @@ public class MesOee extends BaseBean implements Serializable {
     @ApiParam("OEE")
     private Double oee;
 
+    @Column(name = "TARGET_OEE", columnDefinition = "decimal(18,3)")
+    @ApiParam("OEE目标值")
+    private Double targetOee;
+
+    @Column(name = "MIN_OEE", columnDefinition = "decimal(18,3)")
+    @ApiParam("OEE警戒值")
+    private Double minOee;
+
     @Column(name = "BUSI_DATA")
     @ApiParam("自定义数据")
     private String busiData;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BiModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BiModel.java
new file mode 100644
index 0000000..84e28b3
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BiModel.java
@@ -0,0 +1,89 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/7/28 2:37 下午
+ * @Modify:
+ */
+@Data
+public class BiModel {
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @ApiParam("工作中心名称")
+    private String workCenterName;
+
+    @ApiParam("生产区域代码")
+    private String areaCode;
+
+    @ApiParam("运行状态")
+    private String runningStatus;
+
+    @ApiParam(value = "物料号")
+    private String partNo;
+
+    @ApiParam(value = "物料名称")
+    private String partName;
+
+    @ApiParam(value = "计划数量")
+    private double planQty;
+
+    @ApiParam(value = "产量")
+    private double outputQty;
+
+    @ApiParam(value = "完成率")
+    private double completeRate;
+
+    @ApiParam(value = "合格数量")
+    private double passQty = 0;
+
+    @ApiParam(value = "不良数量")
+    private double ngQty = 0;
+
+    @ApiParam(value = "实际数量")
+    private double actualQty = 0;
+
+    @ApiParam(value = "合格率")
+    private double passRate;
+
+    @ApiParam(value = "不良率")
+    private double ngRate;
+
+    @ApiParam(value = "警戒值")
+    private double sentinelValue;
+
+    @ApiParam("客户代码")
+    private String customerCode;
+
+    @ApiParam("客户名称")
+    private String customerName;
+
+    @ApiParam("x坐标内容")
+    private List<String> xAxis;
+
+    @ApiParam("一些携带值 eg:异常类型，异常次数")
+    private Map<String, Object> carryMap;
+
+    @ApiParam("图表显示的数据")
+    private List<ProductBiSeriesModel> series;
+
+    @ApiParam("列名")
+    private Map<String, String> colMap;
+
+    @Deprecated
+    public double getCompleteRate() {
+        if (this.planQty != 0) {
+            this.completeRate = outputQty / planQty;
+        } else {
+            this.completeRate = 0;
+        }
+        return this.completeRate;
+    }
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OperateObjectParamModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OperateObjectParamModel.java
index 2b25ff8..c2f1ef7 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OperateObjectParamModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OperateObjectParamModel.java
@@ -3,8 +3,6 @@ package cn.estsh.i3plus.pojo.mes.model;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
-import javax.persistence.Transient;
-
 /**
  * @Description:
  * @Author: jokelin
@@ -25,10 +23,15 @@ public class OperateObjectParamModel {
     @ApiParam("日期")
     private String oeeDate;
 
+    @ApiParam("开始日期")
+    private String startDate;
+
+    @ApiParam("结束日期")
+    private String endDate;
+
     @ApiParam("开始时段")
     private String startTime;
 
-    @Transient
     @ApiParam("结束时段")
     private String endTime;