From a71e34dbf40f223f102c228e194e21629b67f6bc Mon Sep 17 00:00:00 2001
From: "zhenghaiyang@ele-cloud.com" <zhenghaiyang@ele-cloud.com>
Date: Fri, 2 Jun 2023 11:54:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dxhy-erp/src/main/java/com/dxhy/erp/model/ZDATA.java       | 2 ++
 .../com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java  | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

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..d16fa29d 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
@@ -362,8 +362,10 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl<RecordInvoiceDao,
             //成功或者失败标识
             boolean flag = false;
             String uuid = zdata1.getZFPDM()+zdata1.getZFPHM();
+            //销项标识
+            String xxbs = zdata1.getXXBS();
             DynamicContextHolder.push("business"+DbConstant.BUSINESS_READ);
-            if(fplxList.contains(zdata1.getZFPLX())){
+            if(fplxList.contains(zdata1.getZFPLX()) && !"X".equalsIgnoreCase(xxbs)){
                 TdxRecordInvoice recordInvoiceByUuid = tDxrecordInvoiceDao.getRecordInvoiceByUuid(uuid);
                 if(recordInvoiceByUuid!=null){
                     UpdateWrapper updateWrapper = new UpdateWrapper();
@@ -419,6 +421,7 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl<RecordInvoiceDao,
                 DynamicContextHolder.push("business"+DbConstant.BUSINESS_WRITE);
                 tDxInvoiceReimburseService.getBaseMapper().update(null,updateWrapper);
             }
+            if ("X".equalsIgnoreCase(xxbs)){
             DynamicContextHolder.push("business"+DbConstant.BUSINESS_WRITE);
             UpdateWrapper updateWrapper = new UpdateWrapper();
             updateWrapper.set("sn_voucher_number",zdata1.getBELNR());
@@ -430,6 +433,8 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl<RecordInvoiceDao,
             updateWrapper.set("bzr",zdata1.getZJBRT());
             updateWrapper.eq("uuid",uuid);
             tdxSaleRecordInvoiceDao.update(null,updateWrapper);
+            }
+
             if(!flag){
                 promsg.append("票据号码:"+zdata1.getZFPHM()+"绑定成功!  ");
             }