From 6996dc2273e997ce3ad484a917f0ec189fda0520 Mon Sep 17 00:00:00 2001
From: crish <570360737@qq.com>
Date: Fri, 1 Nov 2019 11:25:10 +0800
Subject: [PATCH] =?UTF-8?q?6204:=20MesConfig=E9=85=8D=E7=BD=AE=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=9A=E5=8A=A1=E4=B8=BB=E9=94=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java  | 32 ++++++++++++++--------
 1 file changed, 20 insertions(+), 12 deletions(-)

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 69b01b7..98d8866 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
@@ -432,15 +432,11 @@ public class MesHqlPack {
      */
     public static DdlPackBean getMesConfig(MesConfig mesConfig, String organizeCode) {
         DdlPackBean packBean = getAllBaseData(organizeCode);
-        if (!StringUtils.isEmpty(mesConfig.getCfgCode())) {
-            DdlPreparedPack.getStringLikerPack(mesConfig.getCfgCode(), "cfgCode", packBean);
-        }
-        if (!StringUtils.isEmpty(mesConfig.getCfgName())) {
-            DdlPreparedPack.getStringLikerPack(mesConfig.getCfgName(), "cfgName", packBean);
-        }
-        if (mesConfig.getIsValid() != null) {
-            DdlPreparedPack.getNumEqualPack(mesConfig.getIsValid(), "isValid", packBean);
-        }
+        DdlPreparedPack.getStringLikerPack(mesConfig.getCfgCode(), "cfgCode", packBean);
+        DdlPreparedPack.getStringLikerPack(mesConfig.getCfgName(), "cfgName", packBean);
+        DdlPreparedPack.getStringEqualPack(mesConfig.getCfgKey(), "cfgKey", packBean);
+        DdlPreparedPack.getStringEqualPack(mesConfig.getCfgType(), "cfgType", packBean);
+        DdlPreparedPack.getNumEqualPack(mesConfig.getIsValid(), "isValid", packBean);
         return packBean;
     }
 
@@ -1399,8 +1395,9 @@ public class MesHqlPack {
     }
 
     /**
-<<<<<<< Updated upstream
+     * <<<<<<< Updated upstream
      * MES 缺陷查询条件封装
+     *
      * @param mesDefect
      * @param organizeCode
      * @return
@@ -1421,6 +1418,7 @@ public class MesHqlPack {
 
     /**
      * MES 产品类型图片查询条件封装
+     *
      * @param mesProduceCtgyPicture
      * @param organizeCode
      * @return
@@ -1440,7 +1438,9 @@ public class MesHqlPack {
     }
 
 
-    /** 设备通知对象配置 查询条件封装
+    /**
+     * 设备通知对象配置 查询条件封装
+     *
      * @param mesEquNotifyObjectCfg
      * @param organizeCode
      * @return
@@ -1462,7 +1462,9 @@ public class MesHqlPack {
         return packBean;
     }
 
-    /** 设备作业通知配置  查询条件封装
+    /**
+     * 设备作业通知配置  查询条件封装
+     *
      * @param mesEquTaskNotifyCfg
      * @param organizeCode
      * @return
@@ -1489,6 +1491,7 @@ public class MesHqlPack {
 
     /**
      * MES 类型信息查询条件封装
+     *
      * @param mesTypeCfg
      * @param organizeCode
      * @return
@@ -1512,6 +1515,7 @@ public class MesHqlPack {
 
     /**
      * MES 缺陷原因查询条件封装
+     *
      * @param mesDefectCause
      * @param organizeCode
      * @return
@@ -1532,6 +1536,7 @@ public class MesHqlPack {
 
     /**
      * 按条件分页查询mes设备点检保养维修作业
+     *
      * @param mesEquTaskDetail
      * @param organizeCode
      * @return
@@ -1555,6 +1560,7 @@ public class MesHqlPack {
 
     /**
      * 按条件分页查询首检件配置信息
+     *
      * @param mesFiCfg
      * @param organizeCode
      * @return
@@ -1575,6 +1581,7 @@ public class MesHqlPack {
 
     /**
      * 维修记录
+     *
      * @param mesEquTaskRepairRecord
      * @param organizeCode
      * @return
@@ -1589,6 +1596,7 @@ public class MesHqlPack {
 
     /**
      * 点检或保养记录
+     *
      * @param mesEquTaskStandardRecord
      * @param organizeCode
      * @return