diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java index 00103e84..ed467084 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java @@ -1154,9 +1154,11 @@ public class InterfaceController extends AbstractController { @PostMapping("receiveErpInvoiceMessage") public String receiveErpInvoiceMessage(@RequestBody ErpInvoiceData erpInvoiceData){ + OutPut outPut = new OutPut(); try { EsOutPutResp esOutPutResp=invoiceAuthService.receiveErpInvoiceMessage(erpInvoiceData.getIS_INPUT()); - return JsonUtils.getInstance().toJsonString(esOutPutResp); + outPut.setES_OUTPUT(esOutPutResp); + return JsonUtils.getInstance().toJsonString(outPut); }catch (Exception e){ log.info("{}接收erp发票数据出错,sapkey:{}",e,erpInvoiceData.getIS_INPUT().getSAPKEY()); e.printStackTrace(); @@ -1165,7 +1167,8 @@ public class InterfaceController extends AbstractController { esOutPutResp.setSAPKEY(erpInvoiceData.getIS_INPUT().getSAPKEY()); esOutPutResp.setZTYPE("E"); esOutPutResp.setZMESSAGE("程序内部错误"); - return JsonUtils.getInstance().toJsonString(esOutPutResp); + outPut.setES_OUTPUT(esOutPutResp); + return JsonUtils.getInstance().toJsonString(outPut); } } @@ -1190,12 +1193,14 @@ public class InterfaceController extends AbstractController { return transfer; }catch (Exception e){ log.info(e.getMessage()); + OutPut outPut = new OutPut(); EsOutPutResp es = new EsOutPutResp(); es.setSAPKEY(erpInvoiceData.getIS_INPUT().getSAPKEY()); es.setBSKEY(erpInvoiceData.getIS_INPUT().getBSKEY()); es.setZTYPE("E"); es.setZMESSAGE("系统内部错误"); - return JsonUtils.getInstance().toJsonString(es); + outPut.setES_OUTPUT(es); + return JsonUtils.getInstance().toJsonString(outPut); } } diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/model/OutPut.java b/dxhy-erp/src/main/java/com/dxhy/erp/model/OutPut.java new file mode 100644 index 00000000..b8622062 --- /dev/null +++ b/dxhy-erp/src/main/java/com/dxhy/erp/model/OutPut.java @@ -0,0 +1,12 @@ +package com.dxhy.erp.model; + +import lombok.Data; + +/** + * @Author wangzhikun + * @Date 2023/3/22 2023/3/22 + */ +@Data +public class OutPut { + private EsOutPutResp ES_OUTPUT; +} diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java index e556be35..3e3acbaa 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java @@ -15,6 +15,7 @@ import com.dxhy.erp.entity.BaseTDxRecordInvoice; import com.dxhy.erp.entity.BaseTDxRecordInvoiceOut; import com.dxhy.erp.model.ErpInvoiceData; import com.dxhy.erp.model.EsOutPutResp; +import com.dxhy.erp.model.OutPut; import com.dxhy.erp.service.BaseIReceiptInvoiceService; import com.dxhy.erp.service.IReceiptOutService; import com.dxhy.erp.utils.JsonUtils; @@ -43,6 +44,7 @@ public class ReceiptOutServiceImpl extends MpBaseServiceImpl outs = listByUuids(ids); @@ -83,8 +87,8 @@ public class ReceiptOutServiceImpl extends MpBaseServiceImpl