From 9b82b0be2a6d5c334a90e147d1f80ec645704fdf Mon Sep 17 00:00:00 2001
From: wangjie <jhforever.wang@estsh.com>
Date: Fri, 20 Sep 2019 11:47:34 +0800
Subject: [PATCH] =?UTF-8?q?mes=E7=8F=AD=E7=BB=84=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java    |  3 ---
 .../cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java   | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
index 308024e..13a3217 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.pojo.mes.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil;
 import cn.estsh.i3plus.pojo.mes.model.MesWorkOrderButtonModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -14,8 +13,6 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
-import java.util.Arrays;
-import java.util.List;
 
 /**
  * @Description:
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 f6995fd..0ee655a 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
@@ -363,6 +363,24 @@ public class MesHqlPack {
     }
 
     /**
+     * MES班组信息查询条件封装
+     * @param shiftGroup
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesShiftGroup(MesShiftGroup shiftGroup, String organizeCode) {
+
+        DdlPackBean packBean = getAllBaseDataByNormalPro(shiftGroup, organizeCode);
+        if (StringUtils.isNotEmpty(shiftGroup.getGroupCode())) {
+            DdlPreparedPack.getStringLikerPack(shiftGroup.getGroupCode(), "groupCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(shiftGroup.getGroupName())) {
+            DdlPreparedPack.getStringLikerPack(shiftGroup.getGroupName(), "groupName", packBean);
+        }
+        return packBean;
+    }
+
+    /**
      * MES班次休息信息查询条件封装
      *
      * @param shiftRest