diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java index 2be715e7..fbf2a1ea 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java @@ -274,6 +274,10 @@ public class SDNYMainProcessController extends AbstractController { if(delete > 0) { checkInvoiceResult = snPushCheckRecordService.singleCheckInvoice(pramsMap,null); + List activeCallRequest = new ArrayList<>(); + activeCallRequest.add(JSONObject.toJSONString(pramsMap)); + activeCallRequest.add(JSONObject.toJSONString(null)); + singleInvoiceCheckRecord.setActiveCallRequestDetail(JSONObject.toJSONString(activeCallRequest)); singleInvoiceCheckRecord.setActiveCall("singleCheckInvoice"); singleInvoiceCheckRecord.setActiveCallResponse(JSONObject.toJSONString(checkInvoiceResult)); @@ -355,6 +359,11 @@ public class SDNYMainProcessController extends AbstractController { try { checkInvoiceResult = snPushCheckRecordService.singleCheckInvoice(pramsMap,"1"); + + List activeCallRequest = new ArrayList<>(); + activeCallRequest.add(JSONObject.toJSONString(pramsMap)); + activeCallRequest.add(JSONObject.toJSONString("1")); + singleInvoiceCheckRecord.setActiveCallRequestDetail(JSONObject.toJSONString(activeCallRequest)); singleInvoiceCheckRecord.setActiveCall("singleCheckInvoice"); singleInvoiceCheckRecord.setActiveCallResponse(JSONObject.toJSONString(checkInvoiceResult)); diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/enums/RequestRecordEnum.java b/dxhy-erp/src/main/java/com/dxhy/erp/enums/RequestRecordEnum.java index e25f1be6..1a4e4eaf 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/enums/RequestRecordEnum.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/enums/RequestRecordEnum.java @@ -12,15 +12,15 @@ public enum RequestRecordEnum { SINGLE_INVOICE_CHECK("/sn/singleInvoiceCheck", "singleInvoiceCheck", SNRequestObject.class, ResponseEntity.class, "SDNYMainProcessController"), - SINGLE_CHECK_INVOICE("singleCheckInvoice", Map.class, JSONObject.class, "SNPushCheckRecordService"), + SINGLE_CHECK_INVOICE("singleCheckInvoice", JSONObject.class, "SNPushCheckRecordService", Map.class, String.class), - PUSH_CHECK_RESULT_TO_SAP("pushCheckResultToSAP", String.class, String.class, "SNPushCheckRecordService"); + PUSH_CHECK_RESULT_TO_SAP("pushCheckResultToSAP", String.class, "SNPushCheckRecordService", String.class); private String className; private String portName; private String methodName; - private Class argClass; + private Class[] argClass; private Class responseEntityClass; @@ -28,11 +28,11 @@ public enum RequestRecordEnum { this.className = className; this.portName = portName; this.methodName = methodName; - this.argClass = argClass; + this.argClass[0] = argClass; this.responseEntityClass = responseEntityClass; } - RequestRecordEnum(String methodName, Class argClass, Class responseEntityClass, String className) { + RequestRecordEnum(String methodName, Class responseEntityClass, String className, Class... argClass) { this.className = className; this.methodName = methodName; this.argClass = argClass; @@ -63,11 +63,11 @@ public enum RequestRecordEnum { return methodName; } - public Class getArgClass() { + public Class[] getArgClass() { return argClass; } - public void setArgClass(Class argClass) { + public void setArgClass(Class[] argClass) { this.argClass = argClass; } diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java index 9344d8f3..bf339130 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java @@ -138,13 +138,24 @@ public class RequestRecordServiceImpl extends MpBaseServiceImpl list = JSONObject.parseObject(dbRecord.getActiveCallRequestDetail(),List.class); + if (recordenum.getArgClass().length>1) { + invokeResponse = method.invoke(snPushCheckRecordService, JSONObject.parseObject(list.get(0), recordenum.getArgClass()[0]),JSONObject.parseObject(list.get(1), recordenum.getArgClass()[1])); + }else { + invokeResponse = method.invoke(snPushCheckRecordService, JSONObject.parseObject(list.get(0), recordenum.getArgClass()[0])); + } + log.info("重调后得到的结果:{}",JSONObject.toJSONString(invokeResponse)); + Map map = JSONObject.parseObject(JSONObject.toJSONString(invokeResponse), Map.class); data.put("data", invokeResponse); @@ -168,16 +179,10 @@ public class RequestRecordServiceImpl extends MpBaseServiceImpl