Merge remote-tracking branch 'remotes/origin/dev' into test

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

@@ -513,12 +513,23 @@ public class MesHqlPack {
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
         return packBean;
     }
+    public static DdlPackBean getMesEventByEventName(MesEvent mesEvent) {
+        DdlPackBean packBean = getAllBaseData(mesEvent.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(mesEvent.getEventName(), "eventName", packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
+        return packBean;
+    }
 
     public static DdlPackBean getMesActionByActionCode(MesAction mesAction, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesAction, organizeCode);
         DdlPreparedPack.getStringEqualPack(mesAction.getActionCode(), "actionCode", packBean);
         return packBean;
     }
+    public static DdlPackBean getMesActionByActionName(MesAction mesAction, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesAction, organizeCode);
+        DdlPreparedPack.getStringEqualPack(mesAction.getActionName(), "actionName", packBean);
+        return packBean;
+    }
 
     public static DdlPackBean getMesActionExcludeById(MesAction mesAction) {
         DdlPackBean packBean = getAllBaseData(mesAction.getOrganizeCode());
@@ -554,7 +565,6 @@ public class MesHqlPack {
         DdlPreparedPack.getStringRightLikerPack(mesMethod.getMethodCode(), "methodCode", packBean);
         DdlPreparedPack.getStringLikerPack(mesMethod.getMethodName(), "methodName", packBean);
         DdlPreparedPack.getStringRightLikerPack(mesMethod.getCallClass(), "callClass", packBean);
-        DdlPreparedPack.getStringEqualPack(mesMethod.getMethodType() + "", "methodType", packBean);
 
         return packBean;
     }
@@ -564,6 +574,11 @@ public class MesHqlPack {
         DdlPreparedPack.getStringEqualPack(mesMethod.getMethodCode(), "methodCode", packBean);
         return packBean;
     }
+    public static DdlPackBean getMesMethodByMethodName(MesMethod mesMethod) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesMethod, mesMethod.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(mesMethod.getMethodName(), "methodName", packBean);
+        return packBean;
+    }
 
     /**
      * 事件动作分页获取封装
@@ -810,13 +825,8 @@ public class MesHqlPack {
      */
     public static DdlPackBean getMesKpData(MesKpData kpData, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(kpData, organizeCode);
-        if (StringUtils.isNotEmpty(kpData.getPartNo())) {
-            DdlPreparedPack.getStringLikerPack(kpData.getKeyDataCode(), "partNo", packBean);
-        }
-        if (StringUtils.isNotEmpty(kpData.getKeyDataCode())) {
+        DdlPreparedPack.getStringLikerPack(kpData.getPartNo(), "partNo", packBean);
         DdlPreparedPack.getStringLikerPack(kpData.getKeyDataCode(), "keyDataCode", packBean);
-        }
-
         return packBean;
     }