From 480df15652cd9c35d33a8a8c0392e39393c50899 Mon Sep 17 00:00:00 2001
From: wangzhikun <wangzhikun@ele-cloud.com>
Date: Thu, 23 Mar 2023 09:32:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E9=A1=B9=E8=BD=AC=E5=87=BA=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/controller/InterfaceController.java   | 16 +++++++------
 .../service/impl/InvoiceAuthServiceImpl.java  | 24 ++++++++++++++-----
 .../service/impl/ReceiptOutServiceImpl.java   |  1 -
 3 files changed, 27 insertions(+), 14 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 ed467084..8866fd7d 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
@@ -1,5 +1,6 @@
 package com.dxhy.erp.controller;
 
+import java.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
 import java.util.HashMap;
@@ -1174,17 +1175,18 @@ public class InterfaceController extends AbstractController {
 
     public String transferOut(ErpInvoiceData erpInvoiceData){
         String zdata = erpInvoiceData.getIS_INPUT().getZDATA();
-        Map<String,String> map=JsonUtils.getInstance().parseObject(zdata,Map.class);
-        String invoiceCode = map.get("invoiceCode");
-        String invoiceNo = map.get("invoiceNo");
-        String outTaxAmount = map.get("outTaxAmount");
-        String outReason = map.get("outReason");
-        String outTaxPeriod = map.get("outTaxPeriod");
+        List<Map> list = JSON.parseArray(zdata, Map.class);
+        Map<String, Object> map = list.get(0);
+        String invoiceCode =(String) map.get("ZFPDM");
+        String invoiceNo = (String)map.get("ZFPHM");
+        BigDecimal bigDecimal = (BigDecimal) map.get("JXSZC");
+        String outReason = (String)map.get("ZZCYY");
+        String outTaxPeriod = (String)map.get("BUDAT");
         String uuid = invoiceCode+invoiceNo;
         BaseInvoiceEditVO baseInvoiceEditVO = new BaseInvoiceEditVO();
         baseInvoiceEditVO.setPrimaryKey(uuid);
         baseInvoiceEditVO.setOutReason(outReason);
-        baseInvoiceEditVO.setOutTax(outTaxAmount);
+        baseInvoiceEditVO.setOutTax(bigDecimal.toString());
         baseInvoiceEditVO.setOutStatus("1");
         baseInvoiceEditVO.setOutTaxPeriod(outTaxPeriod);
         UserInfo userInfo = new UserInfo();
diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java
index 5bdf40f1..ff95c202 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java
@@ -332,6 +332,21 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl<RecordInvoiceDao,
         AuthDateReq authDateReq=new AuthDateReq();
         authDateReq.setBatchNo(isInput.getSAPKEY());
         authDateReq.setApplyRzlx("1");
+        StringBuilder errorMsg = new StringBuilder();
+        DynamicContextHolder.push("business"+DbConstant.BUSINESS_READ);
+        for(ZDATA zdata1:zdata){
+            String uuid = zdata1.getZFPDM()+zdata1.getZFPHM();
+            TdxRecordInvoice recordInvoiceByUuid = tDxrecordInvoiceDao.getRecordInvoiceByUuid(uuid);
+            if(recordInvoiceByUuid==null){
+                errorMsg.append("发票号码:"+zdata1.getZFPHM());
+            }
+        }
+        if(errorMsg.length()>1){
+            es.setZMESSAGE(errorMsg.toString()+"不存在");
+            es.setZTYPE("E");
+            return es;
+        }
+
         for(ZDATA zdata1:zdata){
             //成功或者失败标识
             boolean flag = false;
@@ -354,7 +369,7 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl<RecordInvoiceDao,
                     SysDeptEntity org = sysDeptDao.getOrg(recordInvoiceByUuid.getGfTaxNo());
                     zdata1.setZFPLX(convertFpzldm(zdata1.getZFPLX()));
                     //如果设置的自动认证走申请认证逻辑
-                    if("1".equals(org.getAutoRz()) && ("01".equals(zdata1.getZFPLX()) || "03".equals(zdata1.getZFPLX())
+                    if(org!=null && "1".equals(org.getAutoRz()) && ("01".equals(zdata1.getZFPLX()) || "03".equals(zdata1.getZFPLX())
                             || "08".equals(zdata1.getZFPLX()) || "14".equals(zdata1.getZFPLX())
                             || "31".equals(zdata1.getZFPLX())) && StringUtils.isNotBlank(zdata1.getBUDAT())){
                         if(!"4".equals(recordInvoiceByUuid.getAuthStatus()) && !"3".equals(recordInvoiceByUuid.getAuthStatus())
@@ -369,17 +384,14 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl<RecordInvoiceDao,
                 }else {
                     flag=true;
                 }
-            }else {
-                flag=true;
             }
             if(!flag){
                 promsg.append("票据号码:"+zdata1.getZFPHM()+"绑定成功!  ");
-            }else {
-
             }
         }
         zdataresp.setPROMSG(promsg.toString());
-        zdataresp.setPROTYP("s");
+        zdataresp.setPROTYP("S");
+        es.setZMESSAGE("处理成功");
         es.setZdata(zdataresp);
         return es;
     }
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 3e3acbaa..dd34f7a1 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
@@ -60,7 +60,6 @@ public class ReceiptOutServiceImpl extends MpBaseServiceImpl<BaseReceiptOutDao,
         if(CollectionUtils.isEmpty(invoices)){
             es.setZTYPE("E");
             es.setZMESSAGE("底账数据不存在");
-
             outPut.setES_OUTPUT(es);
             return JsonUtils.getInstance().toJsonString(outPut);
         }