mes班组维护

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:

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