yonyou
/
taikai2312
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

This commit is contained in:
mzr 2025-09-24 18:42:24 +08:00
parent f74bca024b c003b14186
commit 3968cc3053
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mmpac/src/private/nc/bs/mmpac/pickm/bp/PickmApproveBP.java
View File

@ -28,7 +28,7 @@ public class PickmApproveBP {
processer.addAfterRule(pickmstatusFilterRule); processer.addAfterRule(pickmstatusFilterRule);
//备料计划审批后推送高压MES //备料计划审批后推送高压MES
IRule<AggPickmVO> pickmHighpressureMesRules = new AfterApproveRuleHighpressureMes(); IRule<AggPickmVO> pickmHighpressureMesRules = new AfterApproveRuleHighpressureMes();
processer.addAfterRule(pickmHighpressureMesRules); processer.addAfterRule(new AfterApproveRuleHighpressureMes());
} }
private void addBeforeRule(CompareAroundProcesser<AggPickmVO> processer) { private void addBeforeRule(CompareAroundProcesser<AggPickmVO> processer) {

8
uapbd/src/private/nccloud/api/uapbd/material/listener/MaterialToGyMesListener.java
View File

@ -187,14 +187,16 @@ public class MaterialToGyMesListener implements IBusinessListener {
*/ */
} }
if (!dataArr.isEmpty()) { 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(); // String jsonString = param.toJSONString();
// 转json字符串的时候保留null值 // 转json字符串的时候保留null值
String jsonStr = JSON.toJSONString(param, String jsonStr = JSON.toJSONString(param,
@ -203,7 +205,7 @@ public class MaterialToGyMesListener implements IBusinessListener {
); );
logger.error("gymes-Material-param = " + jsonStr); logger.error("gymes-Material-param = " + jsonStr);
// NCCForUAPLogger.debug("gymes-Material-param = " + jsonStr); // NCCForUAPLogger.debug("gymes-Material-param = " + jsonStr);
String baseUrl = configParams.get("gymesBaseUrl"); String baseUrl = configParams.get("mesBaseUrl");
String requestUrl = baseUrl + addUrl; String requestUrl = baseUrl + addUrl;
logger.error("gymes-Material-url = " + requestUrl); logger.error("gymes-Material-url = " + requestUrl);
String result = ThirdPartyPostRequestUtil.sendPostRequest(requestUrl, jsonStr); String result = ThirdPartyPostRequestUtil.sendPostRequest(requestUrl, jsonStr);