From 3be45ca2ce9f4666b0b3021be91d0ab0202bdc20 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Mon, 8 May 2023 17:26:16 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E4=BF=AE=E5=A4=8D=E5=8F=91=E7=A5=A8?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E4=B8=AD=E6=97=A0=E7=A8=8E=E7=A0=81=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CheckTaskServiceImpl.java    |  3 +
 .../InvoiceDetailServiceImpl.java             | 60 +++++++++++++++----
 .../controller/SDNYMainProcessController.java |  3 +
 3 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CheckTaskServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CheckTaskServiceImpl.java
index f652b37a..20fa1828 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CheckTaskServiceImpl.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CheckTaskServiceImpl.java
@@ -430,6 +430,9 @@ public class CheckTaskServiceImpl implements CheckTaskService {
             case "0":
                 sm = "J0";
                 break;
+            case "不征税":
+                sm = "J0";
+                break;
             case "0.00":
                 sm = "J0";
                 break;
diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/invoicedetail/InvoiceDetailServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/invoicedetail/InvoiceDetailServiceImpl.java
index 392994b2..f44518fc 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/service/invoicedetail/InvoiceDetailServiceImpl.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/service/invoicedetail/InvoiceDetailServiceImpl.java
@@ -622,34 +622,73 @@ public class InvoiceDetailServiceImpl extends MpBaseServiceImpl<TDxRecordInvoice
             case "免税":
                 sm = "J0";
                 break;
-            case "16%":
+            case "不征税":
+                sm = "J0";
+                break;
+            case "0.16":
+                sm = "J1";
+                break;
+            case "0.13":
+                sm = "J2";
+                break;
+            case "0.10":
+                sm = "J3";
+                break;
+            case "0.09":
+                sm = "J4";
+                break;
+            case "0.06":
+                sm = "J5";
+                break;
+            case "0.05":
+                sm = "J6";
+                break;
+            case "0.03":
+                sm = "J7";
+                break;
+            case "0.02":
+                sm = "J8";
+                break;
+            case "0.01":
+                sm = "J9";
+                break;
+            case "0.17":
+                sm = "JC";
+                break;
+            case "0.000":
+                sm = "J0";
+                break;
+            case "16":
                 sm = "J1";
                 break;
-            case "13%":
+            case "13":
                 sm = "J2";
                 break;
-            case "10%":
+            case "10":
                 sm = "J3";
                 break;
-            case "9%":
+            case "9":
                 sm = "J4";
                 break;
-            case "6%":
+            case "6":
                 sm = "J5";
                 break;
-            case "5%":
+            case "5":
                 sm = "J6";
                 break;
-            case "3%":
+            case "3":
                 sm = "J7";
                 break;
-            case "2%":
+            case "2":
                 sm = "J8";
                 break;
-            case "1%":
+            case "1.5":
+                sm = "JA";
+                break;
+            case "1":
                 sm = "J9";
                 break;
-            case "17%":
+            case "17":
                 sm = "JC";
                 break;
             default:
@@ -659,5 +698,4 @@ public class InvoiceDetailServiceImpl extends MpBaseServiceImpl<TDxRecordInvoice
         }
         return sm;
     }
-
 }
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 ca6262a7..a8e79c99 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
@@ -970,6 +970,9 @@ public class SDNYMainProcessController extends AbstractController {
             case "免税":
                 sm = "J0";
                 break;
+            case "不征税":
+                sm = "J0";
+                break;
             case "0.16":
                 sm = "J1";
                 break;