From 467c21f9b380cf2fe7c14a59710daf1cb3441a68 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 20 Jun 2023 19:59:38 +0800
Subject: [PATCH 1/3] =?UTF-8?q?arieay=20=E5=A2=9E=E5=8A=A0=E5=B7=B2?=
 =?UTF-8?q?=E5=85=A5=E8=B4=A6=E7=8A=B6=E6=80=81=E7=AD=9B=E9=80=89=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index 96cb5ffd..21f528ab 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -133,7 +133,7 @@
             and t.qs_status = #{qszt}
         </if>
         <if test="bzdh != null and bzdh != '' and bzdh != 'null' and bzdh != '99'">
-            and t.bzdh = #{bzdh}
+            and t.bzdh = #{bzdh} and t.inaccount_status = '1'
         </if>
         <if test=" bzdh == ''">
             and t.bzdh is not null and t.inaccount_status = '1'

From 0cecd31d98b5235846b06aa16534a75f92a91e29 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 20 Jun 2023 20:09:41 +0800
Subject: [PATCH 2/3] =?UTF-8?q?arieay=20=E5=A2=9E=E5=8A=A0=E5=B7=B2?=
 =?UTF-8?q?=E5=85=A5=E8=B4=A6=E7=8A=B6=E6=80=81=E7=AD=9B=E9=80=89=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index 21f528ab..e781c0a8 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -77,6 +77,7 @@
         and t.rzh_yesorno = '0'
         and t.auth_status in('0','5','6')
         and t.export_mark = '0'
+        and t.inaccount_status = '1'
         and t.company = #{company}
         <if test="sfkrz != '99' and sfkrz != null and sfkrz != '' and sfkrz != 'null' and sfkrz == '1'.toString()">
             and t.invoice_status in ('0','7')
@@ -133,10 +134,10 @@
             and t.qs_status = #{qszt}
         </if>
         <if test="bzdh != null and bzdh != '' and bzdh != 'null' and bzdh != '99'">
-            and t.bzdh = #{bzdh} and t.inaccount_status = '1'
+            and t.bzdh = #{bzdh}
         </if>
         <if test=" bzdh == ''">
-            and t.bzdh is not null and t.inaccount_status = '1'
+            and t.bzdh is not null
         </if>
         <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
             and t.inaccount_status = #{inAccountStatus}

From 02d3b08808c14b294cfe2b4b36c26499fbd97c27 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 27 Jun 2023 08:48:11 +0800
Subject: [PATCH 3/3] =?UTF-8?q?ariesy=20=E4=BF=AE=E6=94=B9=E7=A8=8E?=
 =?UTF-8?q?=E7=8E=87=E4=B8=BA=E6=95=B4=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/service/SNPushCheckRecordService.java  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java
index 6b0cd5df..a7dbc101 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java
@@ -564,20 +564,20 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
                                     int index = taxRateDetail.indexOf("%");
                                     if (index > 0) {
                                         taxRateDetail = taxRateDetail.substring(0, taxRateDetail.length() - 1);
-                                        Float num = Float.parseFloat(taxRateDetail);
-                                        if (num > 9) {
-                                            taxRateDetail = "0." + taxRateDetail;
-                                        } else {
-                                            if (!taxRateDetail.startsWith("0")) {
-                                                taxRateDetail = "0.0" + taxRateDetail;
-                                            }
-                                        }
+//                                        Float num = Float.parseFloat(taxRateDetail);
+//                                        if (num > 9) {
+//                                            taxRateDetail = "0." + taxRateDetail;
+//                                        } else {
+//                                            if (!taxRateDetail.startsWith("0")) {
+//                                                taxRateDetail = "0.0" + taxRateDetail;
+//                                            }
+//                                        }
                                     }
                                 }
                             }
 
                             if ("11".equals(invoiceType)) {
-                                taxRateDetail = "0.000";
+                                taxRateDetail = "0";
                             }
                             log.info("明细-发票税率为:{}", taxRateDetail);
                             snDetailMap.put("taxRate", taxRateDetail);