From 05d5709ce85f0d2de5eefa2d9b640aec00d0315b Mon Sep 17 00:00:00 2001 From: mzr Date: Wed, 19 Nov 2025 10:08:52 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E5=8E=8B=E7=94=9F=E4=BA=A7=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=90=8C=E6=AD=A5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...rApproveCancelSyncHighpressureMesRule.java | 26 ++++++++++++++----- .../AfterApproveSyncHighpressureMesRule.java | 6 ++--- .../bp/rule/AfterApproveSyncImsRule.java | 2 +- .../rule/AfterPickmRuleHighpressureRule.java | 2 +- 4 files changed, 25 insertions(+), 11 deletions(-) diff --git a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveCancelSyncHighpressureMesRule.java b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveCancelSyncHighpressureMesRule.java index 947889f9..61ba59a7 100644 --- a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveCancelSyncHighpressureMesRule.java +++ b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveCancelSyncHighpressureMesRule.java @@ -8,7 +8,6 @@ import com.alibaba.fastjson.serializer.SerializerFeature; import nc.bs.dao.BaseDAO; import nc.bs.framework.common.InvocationInfoProxy; import nc.bs.logging.Log; -import nc.bs.trade.business.HYPubBO; import nc.bs.uapbd.util.MyHelper; import nc.bs.uapbd.util.ThirdPartyPostRequestUtil; import nc.impl.pubapp.pattern.rule.IRule; @@ -57,9 +56,7 @@ public class AfterApproveCancelSyncHighpressureMesRule implements IRule configParams) throws BusinessException { + String targetCode = configParams.get("gymesPmoType"); + if (targetCode == null || nc.vo.am.common.util.StringUtils.isEmpty(targetCode)) { + throw new BusinessException("未配置单据类型参数"); + } + String[] types = targetCode.split(","); + for (String type : types) { + if (!type.isEmpty() && type.equals(code)) { + return true; + } + } + return false; + } } diff --git a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveSyncHighpressureMesRule.java b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveSyncHighpressureMesRule.java index 5baabcbf..3e43f4e6 100644 --- a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveSyncHighpressureMesRule.java +++ b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveSyncHighpressureMesRule.java @@ -233,8 +233,8 @@ public class AfterApproveSyncHighpressureMesRule implements IRule { } logger.error("gyMes-PMO-url = " + requestUrl); String result = ThirdPartyPostRequestUtil.sendPostRequest(requestUrl, jsonStr); - JSONObject resultObj = JSONObject.parseObject(result); logger.error("gyMes-PMO-res = " + result); + JSONObject resultObj = JSONObject.parseObject(result); if (!"200".equals(resultObj.getString("code"))) { logger.error("gyMes-PMO-error,result[" + resultObj.toJSONString() + "]"); @@ -330,7 +330,7 @@ public class AfterApproveSyncHighpressureMesRule implements IRule { return true; } - public static Map queryMaterialPlanInfoByPks(String[] pks, String pk_stockorg, + public Map queryMaterialPlanInfoByPks(String[] pks, String pk_stockorg, String[] fields) throws BusinessException { Map map = null; List vids = Stream.of(pks).filter(Objects::nonNull).distinct().toList(); @@ -345,7 +345,7 @@ public class AfterApproveSyncHighpressureMesRule implements IRule { } private boolean checkBillType(String code, Map configParams) throws BusinessException { - String targetCode = configParams.get("vtrantypecode"); + String targetCode = configParams.get("gymesPmoType"); if (targetCode == null || nc.vo.am.common.util.StringUtils.isEmpty(targetCode)) { throw new BusinessException("未配置单据类型参数"); } diff --git a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveSyncImsRule.java b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveSyncImsRule.java index 3c8603f3..07e3cec6 100644 --- a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveSyncImsRule.java +++ b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveSyncImsRule.java @@ -139,7 +139,7 @@ public class AfterApproveSyncImsRule implements IRule { } private boolean checkIfVtrantypecode(String vtrantypecode, Map configParams) throws BusinessException { - String targetCode = configParams.get("vtrantypecode"); + String targetCode = configParams.get("gyimsPmoType"); if (targetCode == null || nc.vo.am.common.util.StringUtils.isEmpty(targetCode)) { throw new BusinessException("未配置生产订单交易类型组织参数"); } diff --git a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterPickmRuleHighpressureRule.java b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterPickmRuleHighpressureRule.java index f2f1328e..0c28c20a 100644 --- a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterPickmRuleHighpressureRule.java +++ b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterPickmRuleHighpressureRule.java @@ -222,8 +222,8 @@ public class AfterPickmRuleHighpressureRule implements IRule { String requestUrl = baseUrl + configParams.get("materialRequirementsUpdate"); logger.error("gyMes-Pickm-url = " + requestUrl); String result = ThirdPartyPostRequestUtil.sendPostRequest(requestUrl, jsonStr); - JSONObject resultObj = JSONObject.parseObject(result); logger.error("gyMes-Pickm-res = " + result); + JSONObject resultObj = JSONObject.parseObject(result); if (!"200".equals(resultObj.getString("code"))) { logger.error("gyMes-Pickm-error,result[" + resultObj.toJSONString() + "]");