返回参数修改

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);
         }
 
     }

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;
+}

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<BaseReceiptOutDao,
     BaseIReceiptInvoiceService baseIReceiptInvoiceService;
     @Override
     public String transfer(ErpInvoiceData erpInvoiceData, BaseInvoiceEditVO condVO, UserInfo userInfo) {
+        OutPut outPut = new OutPut();
         EsOutPutResp es = new EsOutPutResp();
         es.setSAPKEY(erpInvoiceData.getIS_INPUT().getSAPKEY());
         es.setBSKEY(erpInvoiceData.getIS_INPUT().getBSKEY());
@@ -58,7 +60,9 @@ public class ReceiptOutServiceImpl extends MpBaseServiceImpl<BaseReceiptOutDao,
         if(CollectionUtils.isEmpty(invoices)){
             es.setZTYPE("E");
             es.setZMESSAGE("底账数据不存在");
-            return JsonUtils.getInstance().toJsonString(es);
+
+            outPut.setES_OUTPUT(es);
+            return JsonUtils.getInstance().toJsonString(outPut);
         }
         // second：根据uuids查询出转出明细并转为map，key=uuid ，value=转出明细
         List<BaseTDxRecordInvoiceOut> outs = listByUuids(ids);
@@ -83,8 +87,8 @@ public class ReceiptOutServiceImpl extends MpBaseServiceImpl<BaseReceiptOutDao,
 
         DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE);
         excuteTransferWrite(condList, outList);
-
+        outPut.setES_OUTPUT(es);
-        return JsonUtils.getInstance().toJsonString(es);
+        return JsonUtils.getInstance().toJsonString(outPut);
     }
     /**
      * 根据uuids查询进项税转出明细