From 363ac22adeb062d62a7d6dbd4a7a29b9e8ff5c62 Mon Sep 17 00:00:00 2001
From: "joke.wang" <joke.wang@estsh.com>
Date: Thu, 30 Apr 2020 15:28:54 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A1750=20OEE=E8=BF=90?=
 =?UTF-8?q?=E7=AE=97JOB]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/mes/bean/MesOffLineRecord.java     | 30 ---------------
 .../pojo/mes/model/OperateObjectParamModel.java    | 44 ++++++++++++++++++++++
 2 files changed, 44 insertions(+), 30 deletions(-)
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OperateObjectParamModel.java

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.java
index 6c668db..bc7b401 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.java
@@ -66,34 +66,4 @@ public class MesOffLineRecord extends BaseBean implements Serializable {
     @Column(name = "OFF_LINE_TIME")
     @ApiParam("下线时间")
     private String offLineTime;
-
-    /*************冗余字段****************/
-
-    @Transient
-    @ApiParam("设备代码")
-    private String equCode;
-
-    @Transient
-    @ApiParam("运算对象代码")
-    private String objectCode;
-
-    @Transient
-    @ApiParam("日期")
-    private String oeeDate;
-
-    @Transient
-    @ApiParam("开始时段")
-    private String startTime;
-
-    @Transient
-    @ApiParam("结束时段")
-    private String endTime;
-
-    @Transient
-    @ApiParam("一次合格数")
-    private Integer qualifiedQty;
-
-    @Transient
-    @ApiParam("总生产数")
-    private Integer totalQty;
 }
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
new file mode 100644
index 0000000..2b25ff8
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OperateObjectParamModel.java
@@ -0,0 +1,44 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Transient;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/30 2:01 下午
+ * @Modify:
+ */
+@Data
+public class OperateObjectParamModel {
+
+    private String organizeCode;
+
+    @ApiParam("设备代码")
+    private String equCode;
+
+    @ApiParam("运算对象代码")
+    private String objectCode;
+
+    @ApiParam("日期")
+    private String oeeDate;
+
+    @ApiParam("开始时段")
+    private String startTime;
+
+    @Transient
+    @ApiParam("结束时段")
+    private String endTime;
+
+    @ApiParam("属性值")
+    private Integer attributeValue = 0;
+
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+}