diff --git a/mmpac/src/private/nc/bs/mmpac/pickm/bp/PickmApproveBP.java b/mmpac/src/private/nc/bs/mmpac/pickm/bp/PickmApproveBP.java index ae4dd414..c1d2b94e 100644 --- a/mmpac/src/private/nc/bs/mmpac/pickm/bp/PickmApproveBP.java +++ b/mmpac/src/private/nc/bs/mmpac/pickm/bp/PickmApproveBP.java @@ -28,7 +28,7 @@ public class PickmApproveBP { processer.addAfterRule(pickmstatusFilterRule); //备料计划审批后推送高压MES IRule pickmHighpressureMesRules = new AfterApproveRuleHighpressureMes(); - processer.addAfterRule(pickmHighpressureMesRules); + processer.addAfterRule(new AfterApproveRuleHighpressureMes()); } private void addBeforeRule(CompareAroundProcesser processer) { diff --git a/uapbd/src/private/nccloud/api/uapbd/material/listener/MaterialToGyMesListener.java b/uapbd/src/private/nccloud/api/uapbd/material/listener/MaterialToGyMesListener.java index 7e0bdf19..08fb504c 100644 --- a/uapbd/src/private/nccloud/api/uapbd/material/listener/MaterialToGyMesListener.java +++ b/uapbd/src/private/nccloud/api/uapbd/material/listener/MaterialToGyMesListener.java @@ -187,14 +187,16 @@ public class MaterialToGyMesListener implements IBusinessListener { */ } if (!dataArr.isEmpty()) { - pushData(dataArr); + JSONObject jsonObj = new JSONObject(); + jsonObj.put("list", dataArr); + pushData(jsonObj); } } /** * 推送同步数据 */ - private void pushData(JSONArray param) throws BusinessException { + private void pushData(JSONObject param) throws BusinessException { // String jsonString = param.toJSONString(); // 转json字符串的时候保留null值 String jsonStr = JSON.toJSONString(param, @@ -203,7 +205,7 @@ public class MaterialToGyMesListener implements IBusinessListener { ); logger.error("gymes-Material-param = " + jsonStr); // NCCForUAPLogger.debug("gymes-Material-param = " + jsonStr); - String baseUrl = configParams.get("gymesBaseUrl"); + String baseUrl = configParams.get("mesBaseUrl"); String requestUrl = baseUrl + addUrl; logger.error("gymes-Material-url = " + requestUrl); String result = ThirdPartyPostRequestUtil.sendPostRequest(requestUrl, jsonStr); @@ -230,8 +232,8 @@ public class MaterialToGyMesListener implements IBusinessListener { private Map getStockInfo(String pkMaterial) throws BusinessException { String sql = " select martype, wholemanaflag, outpriority, pk_stordoc, remain" + - "from bd_materialstock" + - "where pk_material = '" + pkMaterial + "' "; + " from bd_materialstock " + + " where pk_material = '" + pkMaterial + "' "; Map map = (Map) new BaseDAO().executeQuery(sql, new MapProcessor()); return map; } @@ -241,8 +243,8 @@ public class MaterialToGyMesListener implements IBusinessListener { " pk_materialprod " + "FROM " + " bd_materialprod a" + - "left join org_dept b on a.pk_prodeptdoc = b.pk_dept " + - "where a.pk_material = '" + pkMaterial + "' "; + " left join org_dept b on a.pk_prodeptdoc = b.pk_dept " + + " where a.pk_material = '" + pkMaterial + "' "; Map map = (Map) new BaseDAO().executeQuery(sql, new MapProcessor()); return map; }