diff --git a/ic/src/private/nc/bs/ic/m4d/cancelsign/CancelSignBP.java b/ic/src/private/nc/bs/ic/m4d/cancelsign/CancelSignBP.java index 001dc67..d31af6a 100644 --- a/ic/src/private/nc/bs/ic/m4d/cancelsign/CancelSignBP.java +++ b/ic/src/private/nc/bs/ic/m4d/cancelsign/CancelSignBP.java @@ -6,9 +6,11 @@ package nc.bs.ic.m4d.cancelsign; import com.yonyou.cloud.ncc.plugin.entity.OperationInfo; + import java.io.Serializable; import java.util.HashMap; import java.util.Map; + import nc.bs.ic.general.cancelsign.CancelSignBPTemplate; import nc.bs.ic.general.cancelsign.ICancelSignBP; import nc.bs.ic.general.cancelsign.ICancelSignRuleProvider; @@ -18,6 +20,7 @@ import nc.bs.ic.m4d.base.BPPlugInPoint; import nc.bs.ic.m4d.base.UpdateSCOnhandRule; import nc.bs.ic.m4d.cancelsign.rule.AfterCancelSignRuleForLiabilityProcess; import nc.bs.ic.m4d.cancelsign.rule.PushDeleteIAandTOBills; +import nc.bs.ic.m4d.sign.rule.PullProcessEpicMesRule; import nc.bs.ic.pub.util.SagasUtils; import nc.bs.scmpub.rule.VOSagaFrozenValidateRule; import nc.impl.pubapp.pattern.rule.processer.AroundProcesser; @@ -35,7 +38,8 @@ public class CancelSignBP implements ICancelSignBP, ICancelSignRu processor.addAfterRule(new AfterCancelSignRuleForLiabilityProcess()); processor.addAfterRule(new PushDeleteIAandTOBills()); -// processor.addAfterRule(new PullProcess()); + // 推送艾普MES-领料需求/退库单 + processor.addAfterRule(new PullProcessEpicMesRule("N")); } public void addBeforeRule(MaterialOutVO[] vos, AroundProcesser processor) { @@ -46,11 +50,11 @@ public class CancelSignBP implements ICancelSignBP, ICancelSignRu public MaterialOutVO[] cancelSign(MaterialOutVO[] vos) { CancelSignBPTemplate cancelBP = new CancelSignBPTemplate(BPPlugInPoint.CancelSignBP, this); - SagasUtils.frozenAndAddSaga(vos, ICBillType.MaterialOut.getCode(), "1", (OperationInfo)null); + SagasUtils.frozenAndAddSaga(vos, ICBillType.MaterialOut.getCode(), "1", (OperationInfo) null); Map paramMap = new HashMap(); paramMap.put("actionname", "cancelsign_4D"); paramMap.put("hid", VOEntityUtil.getPksFromAggVO(vos)); SagasUtils.compensate(paramMap, IMaterialOutSagasCompensate.class); - return (MaterialOutVO[])cancelBP.cancelSign(vos); + return (MaterialOutVO[]) cancelBP.cancelSign(vos); } } diff --git a/ic/src/private/nc/bs/ic/m4d/sign/SignBP.java b/ic/src/private/nc/bs/ic/m4d/sign/SignBP.java index ca77786..cdbab40 100644 --- a/ic/src/private/nc/bs/ic/m4d/sign/SignBP.java +++ b/ic/src/private/nc/bs/ic/m4d/sign/SignBP.java @@ -36,7 +36,7 @@ public class SignBP implements ISignBP, ISignRuleProvider processor) { diff --git a/ic/src/private/nc/bs/ic/m4d/sign/rule/PullProcessEpicMesRule.java b/ic/src/private/nc/bs/ic/m4d/sign/rule/PullProcessEpicMesRule.java index ac196eb..bb8ab3d 100644 --- a/ic/src/private/nc/bs/ic/m4d/sign/rule/PullProcessEpicMesRule.java +++ b/ic/src/private/nc/bs/ic/m4d/sign/rule/PullProcessEpicMesRule.java @@ -24,9 +24,15 @@ public class PullProcessEpicMesRule implements IRule { public PullProcessEpicMesRule() { } - private static final String LOG_INFO_NAME = "dldzlog"; + public PullProcessEpicMesRule(String auditCode) { + this.auditCode = auditCode; + } + public String auditCode = "Y"; + + private static final String LOG_INFO_NAME = "dldzlog"; private static final Log logDl = Log.getInstance(LOG_INFO_NAME); + private Map configParams; public void process(MaterialOutVO[] vos) { @@ -78,7 +84,7 @@ public class PullProcessEpicMesRule implements IRule { obj.put("supplierCode", null);// 渚涘簲鍟嗙紪鐮侊紙鍙负绌猴級 obj.put("supplierName", null);// 渚涘簲鍟嗗悕绉帮紙鍙负绌猴級 obj.put("conditionalCode", null);// 鐘跺喌鐮侊紙鍙负绌猴紝鐢ㄤ簬鎺у埗涓氬姟閫昏緫锛 - obj.put("auditCode", "Y");// 瀹℃牳鐮 N:鏈鏍 Y:宸插鏍 X:宸蹭綔搴 + obj.put("auditCode", auditCode);// 瀹℃牳鐮 N:鏈鏍 Y:宸插鏍 X:宸蹭綔搴 obj.put("postingStatus", "Y");// 杩囪处鐘舵侊紙Y:宸茶繃璐︼紝N:鏈繃璐︼級 obj.put("confirmationCode", "Y"); // 纭鐮侊紙Y:宸茬‘璁わ紝N:鏈‘璁わ級 obj.put("changeFlag", null); // 鍙樻洿鏍囪瘑锛堝彲涓虹┖锛孻:宸插彉鏇达紝N:鏈彉鏇达級 @@ -121,9 +127,11 @@ public class PullProcessEpicMesRule implements IRule { private void pushData(String requestUrl, JSONArray param) throws BusinessException { String baseUrl = configParams.get("epicMesUrl"); requestUrl = baseUrl + requestUrl; - String result = ThirdPartyPostRequestUtil.sendPostRequest(requestUrl, param.toJSONString()); + String reqJson = param.toJSONString(); + logDl.error("EpicMes-MaterialOut-req = " + reqJson); + String result = ThirdPartyPostRequestUtil.sendPostRequest(requestUrl, reqJson); JSONObject resultObj = JSONObject.parseObject(result); - logDl.error("EpicMes-MaterialOut-req = " + result); + logDl.error("EpicMes-MaterialOut-res = " + result); if (!"1".equals(resultObj.getString("flag"))) { throw new BusinessException("EpicMes-MaterialOut-error:" + resultObj.getString("msg"));