From c60dd62f320599e1133b594605c9fad9df36bd68 Mon Sep 17 00:00:00 2001
From: "yiming.gu" <yiming.gu@estsh.com>
Date: Wed, 15 May 2019 20:01:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E6=AD=A5=E3=80=81?=
 =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E3=80=81=E5=B7=A5=E6=AD=A5=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java  | 56 +++++++++++++++++++++-
 1 file changed, 55 insertions(+), 1 deletion(-)

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 28c0c8e..4fb3075 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
@@ -281,7 +281,7 @@ public class MesHqlPack {
             DdlPreparedPack.getStringEqualPack(shift.getShiftCode(), "shiftCode", packBean);
         }
         if (StringUtils.isNotEmpty(shift.getShiftName())){
-            DdlPreparedPack.getStringEqualPack(shift.getShiftName(), "shiftName", packBean);
+            DdlPreparedPack.getStringLikerPack(shift.getShiftName(), "shiftName", packBean);
         }
         if (StringUtils.isNotEmpty(shift.getWorkCenterCode())){
             DdlPreparedPack.getStringEqualPack(shift.getWorkCenterCode(), "workCenterCode", packBean);
@@ -289,4 +289,58 @@ public class MesHqlPack {
 
         return packBean;
     }
+
+    /**
+     * MES工序信息查询条件封装
+     * @param process
+     * @return
+     */
+    public static DdlPackBean getMesProcess(MesProcess process, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(process, organizeCode);
+        if (StringUtils.isNotEmpty(process.getProcessCode())){
+            DdlPreparedPack.getStringEqualPack(process.getProcessCode(), "processCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(process.getProcessName())){
+            DdlPreparedPack.getStringLikerPack(process.getProcessName(), "processName", packBean);
+        }
+
+        return packBean;
+    }
+
+    /**
+     * MES工步信息查询条件封装
+     * @param step
+     * @return
+     */
+    public static DdlPackBean getMesStep(MesStep step, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(step, organizeCode);
+        if (StringUtils.isNotEmpty(step.getStepCode())){
+            DdlPreparedPack.getStringEqualPack(step.getStepCode(), "stepCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(step.getStepName())){
+            DdlPreparedPack.getStringLikerPack(step.getStepName(), "stepName", packBean);
+        }
+
+        return packBean;
+    }
+
+    /**
+     * MES工步参数信息查询条件封装
+     * @param stepParam
+     * @return
+     */
+    public static DdlPackBean getMesStepParam(MesStepParam stepParam, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(stepParam, organizeCode);
+        if (StringUtils.isNotEmpty(stepParam.getStepCode())){
+            DdlPreparedPack.getStringEqualPack(stepParam.getStepCode(), "stepCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(stepParam.getParamCode())){
+            DdlPreparedPack.getStringEqualPack(stepParam.getParamCode(), "paramCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(stepParam.getParamName())){
+            DdlPreparedPack.getStringLikerPack(stepParam.getParamName(), "paramName", packBean);
+        }
+
+        return packBean;
+    }
 }