From 8dc151394715e7c22c544216bb31ccd65f137600 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Fri, 6 Dec 2019 14:54:13 +0800 Subject: [PATCH] =?UTF-8?q?bug`6897`=20SOP=E4=BF=A1=E6=81=AF-=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E5=9B=BE=E7=89=87=E5=90=8E=E6=9C=AA=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=87=BA=E5=9B=BE=E7=89=87=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 17 +++-------------- 1 file changed, 3 insertions(+), 14 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 368abef..b3c14e1 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 @@ -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); - } - if (!StringUtils.isEmpty(pcnSyncCfg.getPcnCode())) { - DdlPreparedPack.getStringLikerPack(pcnSyncCfg.getPcnCode(), "pcnCode", packBean); - } - if (null != pcnSyncCfg.getSyncType()) { - DdlPreparedPack.getNumEqualPack(pcnSyncCfg.getSyncType(), "syncType", packBean); - } - + DdlPreparedPack.getStringLikerPack(pcnSyncCfg.getObjectCode(), "objectCode", packBean); + DdlPreparedPack.getStringLikerPack(pcnSyncCfg.getPcnCode(), "pcnCode", packBean); + DdlPreparedPack.getNumEqualPack(pcnSyncCfg.getSyncType(), "syncType", packBean); return packBean; }