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 13950cd4..a376c45d 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 @@ -700,16 +700,24 @@ public class SDNYMainProcessController extends AbstractController { invoiceNos.add(invoiceInfo.getInvoiceNumber()); }); } - if (invoiceCodes.size()==0) { + if (invoiceNos.size()==0) { record = requestRecordService.getBaseRequestRecord(JSONObject.toJSONString(snRequestObject), "/syncInvoiceInfo", "syncInvoiceInfo"); } else { - record = requestRecordService.getBaseRequestRecord(JSONObject.toJSONString(snRequestObject), - "/syncInvoiceInfo", - JSONObject.toJSONString(invoiceCodes), - JSONObject.toJSONString(invoiceNos), - "syncInvoiceInfo"); + if (invoiceCodes.size()>0) { + record = requestRecordService.getBaseRequestRecord(JSONObject.toJSONString(snRequestObject), + "/syncInvoiceInfo", + JSONObject.toJSONString(invoiceNos), + JSONObject.toJSONString(invoiceCodes), + "syncInvoiceInfo"); + } else { + record = requestRecordService.getBaseRequestRecord(JSONObject.toJSONString(snRequestObject), + "/syncInvoiceInfo", + JSONObject.toJSONString(invoiceNos), + "syncInvoiceInfo"); + } + } record.setImageId(snRequestObject.getImageId()); diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/RequestRecordService.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/RequestRecordService.java index 40659a3f..b657ea42 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/RequestRecordService.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/RequestRecordService.java @@ -17,5 +17,7 @@ public interface RequestRecordService extends MpBaseService { RequestRecord getBaseRequestRecord(String requestDetail, String portName, String methodName); + RequestRecord getBaseRequestRecord(String requestDetail, String portName, String invoiceNo, String methodName); + ResponseEntity reCall(RequestRecord requestRecord); } 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 e3a770dd..086e7bba 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 @@ -80,6 +80,17 @@ public class RequestRecordServiceImpl extends MpBaseServiceImpl reCall(RequestRecord requestRecord) { DynamicContextHolder.push("business" + DbConstant.BUSINESS_READ);