Merge branch 'dev' of i3-IMPP/i3plus-pojo into test

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java

@@ -629,6 +629,16 @@ public class MesEnumUtil {
             }
             return tmp;
         }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
     }
 
     /**
@@ -1285,7 +1295,10 @@ public class MesEnumUtil {
         MES_PCN_SYNC_CFG(50, "PCN同步配置"),
         MES_PART(60, "物料表"),
         MES_PRODUCE_CATEGORY(70, "产品类型"),
-        MES_PACK_SPEC(80, "包装规格");
+        MES_PACK_SPEC(80, "包装规格"),
+        MES_PROD_PACK(90, "产品包装关系"),
+        MES_PRODUCT_ENCODE_CFG(100, "产品编码配置"),
+        MES_BOM(110, "物料清单");
 
         private int value;
         private String description;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java

@@ -350,4 +350,25 @@ public class MesHqlPack {
     }
 
 
+    /**
+     * MES班组信息查询条件封装
+     *
+     * @param shiftGroup
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesShiftGroup(MesShiftGroup shiftGroup, String organizeCode) {
+
+        DdlPackBean packBean = getAllBaseDataByNormalPro(shiftGroup, organizeCode);
+        if (!StringUtils.isEmpty(shiftGroup.getGroupCode())) {
+            DdlPreparedPack.getStringLikerPack(shiftGroup.getGroupCode(), "groupCode", packBean);
+        }
+        if (!StringUtils.isEmpty(shiftGroup.getGroupName())) {
+            DdlPreparedPack.getStringLikerPack(shiftGroup.getGroupName(), "groupName", packBean);
+        }
+        if (!StringUtils.isEmpty(shiftGroup.getWorkCenterCode())) {
+            DdlPreparedPack.getStringLikerPack(shiftGroup.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+        return packBean;
+    }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -365,6 +365,9 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(shiftGroup.getGroupName())) {
             DdlPreparedPack.getStringLikerPack(shiftGroup.getGroupName(), "groupName", packBean);
         }
+        if (!StringUtils.isEmpty(shiftGroup.getWorkCenterCode())) {
+            DdlPreparedPack.getStringLikerPack(shiftGroup.getWorkCenterCode(), "workCenterCode", packBean);
+        }
         return packBean;
     }