From 2ff6eded6eefee990a6ac768f061162a0c3fd291 Mon Sep 17 00:00:00 2001
From: wynne1005 <lu_1005@foxmail.com>
Date: Fri, 30 Oct 2020 13:43:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9Oee?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/mes/model/mgn/tj/OeeModel.java      |  2 ++
 .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java   | 21 +++++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/OeeModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/OeeModel.java
index fcf204f..143452c 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/OeeModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/OeeModel.java
@@ -16,6 +16,8 @@ public class OeeModel {
 
     private Integer standardTakt;
 
+    private Double planOee;
+
     private String color;
 
     private Double threshold = 0.03;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
index 6a6e8bc..50ba239 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
@@ -708,6 +708,27 @@ public class MesHqlPack {
     }
 
     /**
+     * MES工步信息查询条件封装
+     *
+     * @param staff
+     * @return
+     */
+    public static DdlPackBean getStaff(MesStaff staff, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(staff, organizeCode);
+        if (!StringUtils.isEmpty(staff.getUserCode())) {
+            DdlPreparedPack.getStringLikerPack(staff.getUserCode(), "userCode", packBean);
+        }
+        if (!StringUtils.isEmpty(staff.getUserName())) {
+            DdlPreparedPack.getStringLikerPack(staff.getUserName(), "userName", packBean);
+        }
+        if (!StringUtils.isEmpty(staff.getSkillLevel())) {
+            DdlPreparedPack.getNumEqualPack(staff.getSkillLevel(), "skillLevel", packBean);
+        }
+
+        return packBean;
+    }
+
+    /**
      * MES工步参数信息查询条件封装
      *
      * @param stepParam