diff --git a/uapbd/src/private/nc/bs/bd/bom/bom0202/rule/BomSaveAfterEpicMesRule.java b/uapbd/src/private/nc/bs/bd/bom/bom0202/rule/BomSaveAfterEpicMesRule.java index 60c5b619..d38b32a8 100644 --- a/uapbd/src/private/nc/bs/bd/bom/bom0202/rule/BomSaveAfterEpicMesRule.java +++ b/uapbd/src/private/nc/bs/bd/bom/bom0202/rule/BomSaveAfterEpicMesRule.java @@ -48,10 +48,7 @@ public class BomSaveAfterEpicMesRule implements IRule { if (!MMValueCheck.isEmpty(vos)) { try { configParams = MyHelper.getConfigParams("Dldz-config", null); - JSONArray data = buildSyncData(vos); - if (!data.isEmpty()) { - pushData(data, vos); - } + buildSyncData(vos); } catch (BusinessException e) { String message = e.getMessage(); logDl.error("EpicMes-BOM-exp:" + message, e); @@ -70,8 +67,7 @@ public class BomSaveAfterEpicMesRule implements IRule { /** * 构建同步数据 */ - private JSONArray buildSyncData(AggBomVO[] useVOs) throws BusinessException { - JSONArray data = new JSONArray(); + private void buildSyncData(AggBomVO[] useVOs) throws BusinessException { for (AggBomVO vo : useVOs) { // 判断物料的业务单元是否是电力电子公司,不是则跳过 BomVO hvo = (BomVO) vo.getParentVO(); @@ -99,6 +95,7 @@ public class BomSaveAfterEpicMesRule implements IRule { String mitm = MyHelper.getStrValByCondition(MaterialVO.getDefaultTableName(), MaterialVO.CODE, MaterialVO.PK_MATERIAL + " = '" + hcmaterialid + "'"); + JSONArray data = new JSONArray(); for (BomItemVO childrenVO : childrenVOs) { String cmaterialid = childrenVO.getCmaterialid(); String sitm = MyHelper.getStrValByCondition(MaterialVO.getDefaultTableName(), MaterialVO.CODE, @@ -113,6 +110,7 @@ public class BomSaveAfterEpicMesRule implements IRule { singleObj.put("remark", childrenVO.getVnote()); // 备注 data.add(singleObj); } + pushData(data, new AggBomVO[]{vo}); /** * [ * { @@ -127,7 +125,6 @@ public class BomSaveAfterEpicMesRule implements IRule { */ } - return data; } /** diff --git a/uapbd/src/private/nc/bs/uapbd/task/mes/epic/BomToEpicMesPlugin.java b/uapbd/src/private/nc/bs/uapbd/task/mes/epic/BomToEpicMesPlugin.java index 2ac8bed7..4077a625 100644 --- a/uapbd/src/private/nc/bs/uapbd/task/mes/epic/BomToEpicMesPlugin.java +++ b/uapbd/src/private/nc/bs/uapbd/task/mes/epic/BomToEpicMesPlugin.java @@ -61,10 +61,7 @@ public class BomToEpicMesPlugin implements IBackgroundWorkPlugin { for (Map map : pkList) { String cbomid = map.get("cbomid"); AggBomVO[] vos = qry.queryAggBomByBomID(new String[]{cbomid}); - JSONArray data = buildSyncData(vos); - if (!data.isEmpty()) { - pushData(data, vos); - } + buildSyncData(vos); } } catch (Exception e) { @@ -76,8 +73,7 @@ public class BomToEpicMesPlugin implements IBackgroundWorkPlugin { /** * 构建同步数据 */ - private JSONArray buildSyncData(AggBomVO[] useVOs) throws BusinessException { - JSONArray data = new JSONArray(); + private void buildSyncData(AggBomVO[] useVOs) throws BusinessException { for (AggBomVO vo : useVOs) { // 判断物料的业务单元是否是电力电子公司,不是则跳过 BomVO hvo = (BomVO) vo.getParentVO(); @@ -105,6 +101,7 @@ public class BomToEpicMesPlugin implements IBackgroundWorkPlugin { String mitm = MyHelper.getStrValByCondition(MaterialVO.getDefaultTableName(), MaterialVO.CODE, MaterialVO.PK_MATERIAL + " = '" + hcmaterialid + "'"); + JSONArray data = new JSONArray(); for (BomItemVO childrenVO : childrenVOs) { String cmaterialid = childrenVO.getCmaterialid(); String sitm = MyHelper.getStrValByCondition(MaterialVO.getDefaultTableName(), MaterialVO.CODE, @@ -119,6 +116,7 @@ public class BomToEpicMesPlugin implements IBackgroundWorkPlugin { singleObj.put("remark", childrenVO.getVnote()); // 备注 data.add(singleObj); } + pushData(data, new AggBomVO[]{vo}); /** * [ * { @@ -133,7 +131,6 @@ public class BomToEpicMesPlugin implements IBackgroundWorkPlugin { */ } - return data; } /**