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 edcde4c..263e26b 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
@@ -129,7 +129,7 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesPart.getCategoryCode3())) {
             DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode3(), "categoryCode3", packBean);
         }
-        if (StringUtils.isNotEmpty(mesPart.getProduceCategoryCode()) && mesPart.getProduceCategoryCode().toUpperCase().equals("WXJ")) {
+        if (!StringUtils.isEmpty(mesPart.getProduceCategoryCode()) && mesPart.getProduceCategoryCode().toUpperCase().equals("WXJ")) {
             DdlPreparedPack.getStringEqualPack("WXJ", "produceCategoryCode", packBean);
         } else {
             DdlPreparedPack.getStringNoEqualPack("WXJ", "produceCategoryCode", packBean);
@@ -1256,10 +1256,7 @@ public class MesHqlPack {
         DdlPreparedPack.getOrderByPack(new String[]{String.valueOf(CommonEnumUtil.ASC_OR_DESC.ASC.getValue())}, new String[]{"startTime", "shiftCode"}, packBean);
         return packBean;
     }
-
-<<<<<<< Updated upstream
-=======
-
+    
     /**
      * MES Plc设备信息配置查询条件封装
      * @param mesPlc
@@ -1268,25 +1265,25 @@ public class MesHqlPack {
      */
     public static DdlPackBean getMesPlc(MesPlc mesPlc, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesPlc, organizeCode);
-        if (StringUtils.isNotEmpty(mesPlc.getPlcCode())) {
+        if (!StringUtils.isEmpty(mesPlc.getPlcCode())) {
             DdlPreparedPack.getStringEqualPack(mesPlc.getPlcCode(), "plcCode", packBean);
         }
-        if (StringUtils.isNotEmpty(mesPlc.getPlcName())) {
+        if (!StringUtils.isEmpty(mesPlc.getPlcName())) {
             DdlPreparedPack.getStringEqualPack(mesPlc.getPlcName(), "plcName", packBean);
         }
-        if (StringUtils.isNotEmpty(mesPlc.getChannel())) {
+        if (!StringUtils.isEmpty(mesPlc.getChannel())) {
             DdlPreparedPack.getStringEqualPack(mesPlc.getChannel(), "channel", packBean);
         }
-        if (StringUtils.isNotEmpty(mesPlc.getTagAddress())) {
+        if (!StringUtils.isEmpty(mesPlc.getTagAddress())) {
             DdlPreparedPack.getStringEqualPack(mesPlc.getTagAddress(), "tagAddress", packBean);
         }
-        if (StringUtils.isNotEmpty(mesPlc.getEquCode())) {
+        if (!StringUtils.isEmpty(mesPlc.getEquCode())) {
             DdlPreparedPack.getStringEqualPack(mesPlc.getEquCode(), "equCode", packBean);
         }
-        if (StringUtils.isNotEmpty(mesPlc.getWorkCenterCode())) {
+        if (!StringUtils.isEmpty(mesPlc.getWorkCenterCode())) {
             DdlPreparedPack.getStringEqualPack(mesPlc.getWorkCenterCode(), "workCenterCode", packBean);
         }
-        if (StringUtils.isNotEmpty(mesPlc.getPlcCode())) {
+        if (!StringUtils.isEmpty(mesPlc.getPlcCode())) {
             DdlPreparedPack.getStringEqualPack(mesPlc.getWorkCellCode(), "workCellCode", packBean);
         }
         return packBean;
@@ -1300,20 +1297,20 @@ public class MesHqlPack {
      */
     public static DdlPackBean getMesDatasource(MesDatasource mesDatasource, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesDatasource, organizeCode);
-        if (StringUtils.isNotEmpty(mesDatasource.getDsCode())) {
+        if (!StringUtils.isEmpty(mesDatasource.getDsCode())) {
             DdlPreparedPack.getStringEqualPack(mesDatasource.getDsCode(), "dsCode", packBean);
         }
-        if (StringUtils.isNotEmpty(mesDatasource.getDsName())) {
+        if (!StringUtils.isEmpty(mesDatasource.getDsName())) {
             DdlPreparedPack.getStringEqualPack(mesDatasource.getDsName(), "dsName", packBean);
         }
-        if (StringUtils.isNotEmpty(mesDatasource.getDsType())) {
+        if (!StringUtils.isEmpty(mesDatasource.getDsType())) {
             DdlPreparedPack.getStringEqualPack(mesDatasource.getDsType(), "dsType", packBean);
         }
-        if (StringUtils.isNotEmpty(mesDatasource.getDsDbName())) {
+        if (!StringUtils.isEmpty(mesDatasource.getDsDbName())) {
             DdlPreparedPack.getStringEqualPack(mesDatasource.getDsDbName(), "dsDbName", packBean);
         }
-        if (StringUtils.isNotEmpty(mesDatasource.getEquCode())) {
-            DdlPreparedPack.getStringEqualPack(mesDatasource.getEquCode(), "equCode", packBean);
+        if (!StringUtils.isEmpty(mesDatasource.getEquipmentCode())) {
+            DdlPreparedPack.getStringEqualPack(mesDatasource.getEquipmentCode(), "equCode", packBean);
         }
         return packBean;
     }
@@ -1326,13 +1323,13 @@ public class MesHqlPack {
      */
     public static DdlPackBean getMesFaultMethod(MesFaultMethod mesFaultMethod, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesFaultMethod, organizeCode);
-        if (StringUtils.isNotEmpty(mesFaultMethod.getFmCode())) {
+        if (!StringUtils.isEmpty(mesFaultMethod.getFmCode())) {
             DdlPreparedPack.getStringEqualPack(mesFaultMethod.getFmCode(), "fmCode", packBean);
         }
-        if (StringUtils.isNotEmpty(mesFaultMethod.getFmName())) {
+        if (!StringUtils.isEmpty(mesFaultMethod.getFmName())) {
             DdlPreparedPack.getStringEqualPack(mesFaultMethod.getFmName(), "fmName", packBean);
         }
-        if (StringUtils.isNotEmpty(mesFaultMethod.getParentFmCode())) {
+        if (!StringUtils.isEmpty(mesFaultMethod.getParentFmCode())) {
             DdlPreparedPack.getStringEqualPack(mesFaultMethod.getParentFmCode(), "parentFmCode", packBean);
         }
         return packBean;
@@ -1346,13 +1343,13 @@ public class MesHqlPack {
      */
     public static DdlPackBean getMesFaultCause(MesFaultCause mesFaultCause, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesFaultCause, organizeCode);
-        if (StringUtils.isNotEmpty(mesFaultCause.getFcCode())) {
+        if (!StringUtils.isEmpty(mesFaultCause.getFcCode())) {
             DdlPreparedPack.getStringEqualPack(mesFaultCause.getFcCode(), "fcCode", packBean);
         }
-        if (StringUtils.isNotEmpty(mesFaultCause.getFcName())) {
+        if (!StringUtils.isEmpty(mesFaultCause.getFcName())) {
             DdlPreparedPack.getStringEqualPack(mesFaultCause.getFcName(), "fcName", packBean);
         }
-        if (StringUtils.isNotEmpty(mesFaultCause.getParentFcCode())) {
+        if (!StringUtils.isEmpty(mesFaultCause.getParentFcCode())) {
             DdlPreparedPack.getStringEqualPack(mesFaultCause.getParentFcCode(), "parentFcCode", packBean);
         }
         return packBean;
@@ -1366,13 +1363,13 @@ public class MesHqlPack {
      */
     public static DdlPackBean getMesFaultPhenomenon(MesFaultPhenomenon mesFaultPhenomenon, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesFaultPhenomenon, organizeCode);
-        if (StringUtils.isNotEmpty(mesFaultPhenomenon.getFpCode())) {
+        if (!StringUtils.isEmpty(mesFaultPhenomenon.getFpCode())) {
             DdlPreparedPack.getStringEqualPack(mesFaultPhenomenon.getFpCode(), "fpCode", packBean);
         }
-        if (StringUtils.isNotEmpty(mesFaultPhenomenon.getFpName())) {
+        if (!StringUtils.isEmpty(mesFaultPhenomenon.getFpName())) {
             DdlPreparedPack.getStringEqualPack(mesFaultPhenomenon.getFpName(), "fpName", packBean);
         }
-        if (StringUtils.isNotEmpty(mesFaultPhenomenon.getParentFpCode())) {
+        if (!StringUtils.isEmpty(mesFaultPhenomenon.getParentFpCode())) {
             DdlPreparedPack.getStringEqualPack(mesFaultPhenomenon.getParentFpCode(), "parentFpCode", packBean);
         }
         return packBean;
@@ -1386,22 +1383,22 @@ public class MesHqlPack {
      */
     public static DdlPackBean getMesQcCheckStandard(MesQcCheckStandard mesQcCheckStandard, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesQcCheckStandard, organizeCode);
-        if (StringUtils.isNotEmpty(mesQcCheckStandard.getPartNo())) {
+        if (!StringUtils.isEmpty(mesQcCheckStandard.getPartNo())) {
             DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getPartNo(), "partNo", packBean);
         }
-        if (StringUtils.isNotEmpty(mesQcCheckStandard.getWorkCellCode())) {
+        if (!StringUtils.isEmpty(mesQcCheckStandard.getWorkCellCode())) {
             DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getWorkCellCode(), "workCellCode", packBean);
         }
-        if (StringUtils.isNotEmpty(mesQcCheckStandard.getWorkCenterCode())) {
+        if (!StringUtils.isEmpty(mesQcCheckStandard.getWorkCenterCode())) {
             DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getWorkCenterCode(), "workCenterCode", packBean);
         }
         if (null == mesQcCheckStandard.getCheckType()) {
             DdlPreparedPack.getNumberBiggerEqualPack(mesQcCheckStandard.getCheckType(), "checkType", packBean);
         }
-        if (StringUtils.isNotEmpty(mesQcCheckStandard.getCheckItem())) {
+        if (!StringUtils.isEmpty(mesQcCheckStandard.getCheckItem())) {
             DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getCheckItem(), "checkItem", packBean);
         }
         return packBean;
     }
->>>>>>> Stashed changes
+
 }