Jenkins自动合并

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

@@ -477,10 +477,6 @@ public class MesHqlPack {
     public static DdlPackBean getEsopExcludeById(MesEsop esop, String org) {
         DdlPackBean packBean = getAllBaseData(org);
         DdlPreparedPack.getStringEqualPack(esop.getPartNo(), "partNo", packBean);
-        DdlPreparedPack.getStringEqualPack(esop.getRouteCode(), "routeCode", packBean);
-        DdlPreparedPack.getStringEqualPack(esop.getProcessCode(), "processCode", packBean);
-        DdlPreparedPack.getStringEqualPack(esop.getStepCode(), "stepCode", packBean);
-        DdlPreparedPack.getNumEqualPack(esop.getStepSeq(), "stepSeq", packBean);
         DdlPreparedPack.getStringEqualPack(esop.getWorkCenterCode(), "workCenterCode", packBean);
         DdlPreparedPack.getStringEqualPack(esop.getWorkCellCode(), "workCellCode", packBean);
         DdlPreparedPack.getNumNOEqualPack(esop.getId(), "id", packBean);
@@ -1055,16 +1051,9 @@ public class MesHqlPack {
      */
     public static DdlPackBean getMesPcnSyncCfg(MesPcnSyncCfg pcnSyncCfg, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(pcnSyncCfg, organizeCode);
-        if (!StringUtils.isEmpty(pcnSyncCfg.getObjectCode())) {
+        DdlPreparedPack.getStringLikerPack(pcnSyncCfg.getObjectCode(), "objectCode", packBean);
-            DdlPreparedPack.getStringLikerPack(pcnSyncCfg.getObjectCode(), "objectCode", packBean);
+        DdlPreparedPack.getStringLikerPack(pcnSyncCfg.getPcnCode(), "pcnCode", packBean);
-        }
+        DdlPreparedPack.getNumEqualPack(pcnSyncCfg.getSyncType(), "syncType", packBean);
-        if (!StringUtils.isEmpty(pcnSyncCfg.getPcnCode())) {
-            DdlPreparedPack.getStringLikerPack(pcnSyncCfg.getPcnCode(), "pcnCode", packBean);
-        }
-        if (null != pcnSyncCfg.getSyncType()) {
-            DdlPreparedPack.getNumEqualPack(pcnSyncCfg.getSyncType(), "syncType", packBean);
-        }
-
         return packBean;
     }