mes工作单元参数CRUD

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

@@ -1079,6 +1079,27 @@ public class MesHqlPack {
     }
 
     /**
+     * MES工作单元参数查询条件封装
+     *
+     * @param workCellParam
+     * @return
+     */
+    public static DdlPackBean getMesWorkCellParam(MesWorkCellParam workCellParam, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(workCellParam, organizeCode);
+        if (StringUtils.isNotEmpty(workCellParam.getParamCode())) {
+            DdlPreparedPack.getStringLikerPack(workCellParam.getParamCode(), "paramCode", packBean);
+        }
+        if (null != workCellParam.getParamType()) {
+            DdlPreparedPack.getNumEqualPack(workCellParam.getParamType(), "paramType", packBean);
+        }
+        if (null != workCellParam.getParamModel()) {
+            DdlPreparedPack.getNumEqualPack(workCellParam.getParamModel(), "paramModel", packBean);
+        }
+        return packBean;
+    }
+
+
+    /**
      * MES工作单元队列查询条件封装
      *
      * @param workCellPoint
@@ -1146,9 +1167,14 @@ public class MesHqlPack {
      */
     public static DdlPackBean getMesPcnTask(MesPcnTask mesPcnTask, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesPcnTask, organizeCode);
-        DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskCode(), "taskCode", packBean);
+        if (StringUtils.isNotEmpty(mesPcnTask.getTaskCode())) {
-        DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskName(), "taskName", packBean);
+            DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskCode(), "taskCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(mesPcnTask.getTaskName())) {
+            DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskName(), "taskName", packBean);
+        }
         packBean.setOrderByStr(mesPcnTask.orderBy());
         return packBean;
     }
+
 }