修改Oee

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;

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