From 09fa33b0a3761c3b061be31f6641c07caa6c02ce Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Wed, 31 May 2023 17:35:49 +0800
Subject: [PATCH] =?UTF-8?q?F1847=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/dxhy/erp/model/ZDATA.java   |  2 ++
 .../service/impl/InvoiceAuthServiceImpl.java  | 32 ++++++++++++-------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/model/ZDATA.java b/dxhy-erp/src/main/java/com/dxhy/erp/model/ZDATA.java
index 03cc5312..ca2c0887 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/model/ZDATA.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/model/ZDATA.java
@@ -36,4 +36,6 @@ public class ZDATA {
     private String BELNR;
     @JsonProperty(value = "BUDAT")
     private String BUDAT;
+    @JsonProperty(value = "XXBS")
+    private String XXBS;
 }
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 f80d945f..dc16e642 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
@@ -19,6 +19,7 @@ import com.dxhy.erp.model.auth.InterfaceCode;
 import com.dxhy.erp.service.InvoiceAuthService;
 import com.dxhy.erp.service.TDxInvoiceReimburseService;
 import com.dxhy.erp.utils.CheckUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 
@@ -34,6 +35,7 @@ import java.util.*;
  */
 @SuppressWarnings({"AlibabaMethodTooLong", "AlibabaUndefineMagicConstant"})
 @Service
+@Slf4j
 public class InvoiceAuthServiceImpl extends MpBaseServiceImpl<RecordInvoiceDao, RecordInvoice>
     implements InvoiceAuthService {
 
@@ -362,8 +364,11 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl<RecordInvoiceDao,
             //成功或者失败标识
             boolean flag = false;
             String uuid = zdata1.getZFPDM()+zdata1.getZFPHM();
+            //销项标识
+            String xxbs = zdata1.getXXBS();
+            log.info("xxbs==>{}",xxbs);
             DynamicContextHolder.push("business"+DbConstant.BUSINESS_READ);
-            if(fplxList.contains(zdata1.getZFPLX())){
+            if(fplxList.contains(zdata1.getZFPLX()) && !"X".equals(xxbs)){
                 TdxRecordInvoice recordInvoiceByUuid = tDxrecordInvoiceDao.getRecordInvoiceByUuid(uuid);
                 if(recordInvoiceByUuid!=null){
                     UpdateWrapper updateWrapper = new UpdateWrapper();
@@ -419,17 +424,20 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl<RecordInvoiceDao,
                 DynamicContextHolder.push("business"+DbConstant.BUSINESS_WRITE);
                 tDxInvoiceReimburseService.getBaseMapper().update(null,updateWrapper);
             }
-            DynamicContextHolder.push("business"+DbConstant.BUSINESS_WRITE);
-            UpdateWrapper updateWrapper = new UpdateWrapper();
-            updateWrapper.set("sn_voucher_number",zdata1.getBELNR());
-            updateWrapper.set("posting_time",zdata1.getBUDAT());
-            updateWrapper.set("account_period",zdata1.getBUDAT().substring(0,7));
-            updateWrapper.set("bzdh",zdata1.getZBZDH());
-            updateWrapper.set("inaccount_status",zdata1.getZYWZT());
-            updateWrapper.set("comp_code",zdata1.getZGSDM());
-            updateWrapper.set("bzr",zdata1.getZJBRT());
-            updateWrapper.eq("uuid",uuid);
-            tdxSaleRecordInvoiceDao.update(null,updateWrapper);
+            if ("X".equals(xxbs)){
+                DynamicContextHolder.push("business"+DbConstant.BUSINESS_WRITE);
+                UpdateWrapper updateWrapper = new UpdateWrapper();
+                updateWrapper.set("sn_voucher_number",zdata1.getBELNR());
+                updateWrapper.set("posting_time",zdata1.getBUDAT());
+                updateWrapper.set("account_period",zdata1.getBUDAT().substring(0,7));
+                updateWrapper.set("bzdh",zdata1.getZBZDH());
+                updateWrapper.set("inaccount_status",zdata1.getZYWZT());
+                updateWrapper.set("comp_code",zdata1.getZGSDM());
+                updateWrapper.set("bzr",zdata1.getZJBRT());
+                updateWrapper.eq("uuid",uuid);
+                tdxSaleRecordInvoiceDao.update(null,updateWrapper);
+            }
+
             if(!flag){
                 promsg.append("票据号码:"+zdata1.getZFPHM()+"绑定成功!  ");
             }