From a4817a263ebc1fc542e9b59e1dacbd503cd65dee Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Mon, 29 May 2023 15:51:50 +0800
Subject: [PATCH 1/2] =?UTF-8?q?ariesy=20=E4=BF=AE=E5=A4=8D=E4=B8=8D?=
 =?UTF-8?q?=E5=BE=81=E7=A8=8E=E5=8F=91=E7=A5=A8=E6=8A=A5=E9=94=99=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/dxhy/erp/controller/SDNYMainProcessController.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java
index 43874a81..15cd93ca 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java
@@ -488,7 +488,7 @@ public class SDNYMainProcessController extends AbstractController {
             }
 
 
-            if ("免税".equals(detail.getString("taxRate"))) {
+            if ("免税".equals(detail.getString("taxRate")) || "不征税".equals(detail.getString("taxRate"))) {
                 taxRateDetail = "0";
                 snDetailMap.put("taxRate", taxRateDetail);
             } else {

From 8bcc68f445d10e90e98e4a3c1a053a4fd3a6c709 Mon Sep 17 00:00:00 2001
From: WangQi <1021674882@qq.com>
Date: Mon, 29 May 2023 16:53:51 +0800
Subject: [PATCH 2/2] bug:3158

---
 .../com/dxhy/erp/entity/SalesInvoicePushInfos.java     | 10 ++++++++++
 .../java/com/dxhy/erp/entity/TdxSaleRecordInvoice.java | 10 ++++++++++
 .../dxhy/erp/service/impl/InvoicePoolServiceImpl.java  |  8 ++++++++
 3 files changed, 28 insertions(+)

diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/entity/SalesInvoicePushInfos.java b/dxhy-erp/src/main/java/com/dxhy/erp/entity/SalesInvoicePushInfos.java
index 4ce5f4a9..35a92aea 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/entity/SalesInvoicePushInfos.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/entity/SalesInvoicePushInfos.java
@@ -88,5 +88,15 @@ public class SalesInvoicePushInfos {
     private String buyerPhone;
     private String compCode;
 
+    /**
+     * 报账单号
+     */
+    private String bzdh;
+
+    /**
+     * 报账人
+     */
+    private String bzr;
+
     private List<InvoiceDetailInfo> detailList;
 }
diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/entity/TdxSaleRecordInvoice.java b/dxhy-erp/src/main/java/com/dxhy/erp/entity/TdxSaleRecordInvoice.java
index 701d9348..84822a02 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/entity/TdxSaleRecordInvoice.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/entity/TdxSaleRecordInvoice.java
@@ -484,4 +484,14 @@ public class TdxSaleRecordInvoice implements Serializable {
     private String incentiveFlag;
 
     private String compCode;
+
+    /**
+     * 报账单号
+     */
+    private String bzdh;
+
+    /**
+     * 报账人
+     */
+    private String bzr;
 }
diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoicePoolServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoicePoolServiceImpl.java
index 5c18342e..0e575c41 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoicePoolServiceImpl.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoicePoolServiceImpl.java
@@ -1662,6 +1662,10 @@ public class InvoicePoolServiceImpl implements InvoicePoolService {
                     update.setStatusUpdateDate(new Date());
                 }
                 update.setCompCode(infos.getCompCode());
+                // 报账单号 报账人
+                update.setBzdh(infos.getBzdh());
+                update.setBzr(infos.getBzr());
+
                 TDxInvoiceSales tDxInvoiceSales = new TDxInvoiceSales();
                 tDxInvoiceSales.setQsDate(new Date());
                 DynamicContextHolder.push(dbName + DbConstant.BUSINESS_WRITE);
@@ -1813,6 +1817,10 @@ public class InvoicePoolServiceImpl implements InvoicePoolService {
             invoice.setCheckCode(info.getCheckCode());
         }
 
+        // 报账单号 报账人
+        invoice.setBzdh(info.getBzdh());
+        invoice.setBzr(info.getBzr());
+
         invoice.setSourceSystem("1");
         invoice.setValid("1");
         invoice.setQsDate(new Date());