From a40e11cc7ea79611f4c158603e460973eda2aca1 Mon Sep 17 00:00:00 2001
From: wangzhikun <wangzhikun@ele-cloud.com>
Date: Tue, 21 Mar 2023 17:25:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E9=A1=B9=E7=A8=8E=E8=BD=AC=E5=87=BA?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/controller/InterfaceController.java     | 17 ++++++++++++++---
 .../dxhy/erp/entity/BaseTDxRecordInvoice.java   |  1 -
 .../erp/service/impl/ReceiptOutServiceImpl.java | 13 ++++++++++++-
 3 files changed, 26 insertions(+), 5 deletions(-)

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 b9b6d7de..2c4c04fe 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
@@ -1134,7 +1134,7 @@ public class InterfaceController extends AbstractController {
     }
     @RequestMapping(path = "/po",method={RequestMethod.POST,RequestMethod.GET})
     public String po(@RequestBody String param,HttpServletRequest request){
-        log.info("po接口调用开始,传参{}",JsonUtils.getInstance().toJsonString(request));
+        log.info("po接口调用开始,传参{}",param);
         String token = request.getHeader("token");
         if(org.apache.commons.lang3.StringUtils.isBlank(token) && !ConfigureConstant.POTOKEN.equals(token)){
             return "非法请求,请停止访问!";
@@ -1184,8 +1184,19 @@ public class InterfaceController extends AbstractController {
         baseInvoiceEditVO.setOutStatus("1");
         baseInvoiceEditVO.setOutTaxPeriod(outTaxPeriod);
         UserInfo userInfo = new UserInfo();
-        String transfer = iReceiptOutService.transfer(erpInvoiceData,baseInvoiceEditVO, userInfo);
-        return transfer;
+        try{
+            String transfer = iReceiptOutService.transfer(erpInvoiceData,baseInvoiceEditVO, userInfo);
+            return transfer;
+        }catch (Exception e){
+            log.info(e.getMessage());
+            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);
+        }
+
     }
 
 }
diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/entity/BaseTDxRecordInvoice.java b/dxhy-erp/src/main/java/com/dxhy/erp/entity/BaseTDxRecordInvoice.java
index 1046b110..e285d039 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/entity/BaseTDxRecordInvoice.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/entity/BaseTDxRecordInvoice.java
@@ -464,5 +464,4 @@ public class BaseTDxRecordInvoice implements Serializable {
      */
     private String inAccountStatus;
 
-    private String invoiceSource;
 }
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 bb833462..e556be35 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
@@ -17,13 +17,16 @@ import com.dxhy.erp.model.ErpInvoiceData;
 import com.dxhy.erp.model.EsOutPutResp;
 import com.dxhy.erp.service.BaseIReceiptInvoiceService;
 import com.dxhy.erp.service.IReceiptOutService;
+import com.dxhy.erp.utils.JsonUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -42,6 +45,9 @@ public class ReceiptOutServiceImpl extends MpBaseServiceImpl<BaseReceiptOutDao,
     public String transfer(ErpInvoiceData erpInvoiceData, BaseInvoiceEditVO condVO, UserInfo userInfo) {
         EsOutPutResp es = new EsOutPutResp();
         es.setSAPKEY(erpInvoiceData.getIS_INPUT().getSAPKEY());
+        es.setBSKEY(erpInvoiceData.getIS_INPUT().getBSKEY());
+        es.setZTYPE("S");
+        es.setZMESSAGE("处理成功");
         DynamicContextHolder.push("business"+DbConstant.BUSINESS_READ);
 
         String idStr = condVO.getPrimaryKey();
@@ -49,6 +55,11 @@ public class ReceiptOutServiceImpl extends MpBaseServiceImpl<BaseReceiptOutDao,
 
         // first：查询出底账表相关数据
         List<BaseTDxRecordInvoice> invoices = baseIReceiptInvoiceService.selectByUuids(ids);
+        if(CollectionUtils.isEmpty(invoices)){
+            es.setZTYPE("E");
+            es.setZMESSAGE("底账数据不存在");
+            return JsonUtils.getInstance().toJsonString(es);
+        }
         // second：根据uuids查询出转出明细并转为map，key=uuid ，value=转出明细
         List<BaseTDxRecordInvoiceOut> outs = listByUuids(ids);
         Map<String, BaseTDxRecordInvoiceOut> outMap =
@@ -73,7 +84,7 @@ public class ReceiptOutServiceImpl extends MpBaseServiceImpl<BaseReceiptOutDao,
         DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE);
         excuteTransferWrite(condList, outList);
 
-        return "success";
+        return JsonUtils.getInstance().toJsonString(es);
     }
     /**
      * 根据uuids查询进项税转出明细