From 44189cd3bc8769d1e5e4796d4fd25630aee4977d Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 11 Apr 2023 10:29:03 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E8=A7=A3=E5=86=B3=E7=A8=8E=E7=8E=87?=
 =?UTF-8?q?=E4=B8=BA0=E6=98=AF=E7=A8=8E=E7=A0=81=E6=9C=AA=E5=AD=98?=
 =?UTF-8?q?=E5=82=A8=E5=92=8C=E6=8E=A8=E9=80=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/invoicedetail/InvoiceDetailServiceImpl.java    | 3 +++
 .../com/dxhy/erp/controller/SDNYMainProcessController.java | 7 +++++--
 .../java/com/dxhy/erp/entity/TDxRecordInvoiceDetail.java   | 5 -----
 .../erp/service/impl/SignSaveInvoiceInfoServiceImpl.java   | 3 +++
 pom.xml                                                    | 4 ++--
 5 files changed, 13 insertions(+), 9 deletions(-)

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 ea3aeee0..8fdb658a 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
@@ -605,6 +605,9 @@ public class InvoiceDetailServiceImpl extends MpBaseServiceImpl<TDxRecordInvoice
 
         switch (taxRate) {
             // 发票采集
+            case "0":
+                sm = "J0";
+                break;
             case "0.00":
                 sm = "J0";
                 break;
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 59b82983..fc98d304 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
@@ -370,9 +370,9 @@ public class SDNYMainProcessController extends AbstractController {
             sapInvoiceDetail.setZSM(info.getZSM());
             sapInvoiceDetail.setZGGXH(snInvoiceDetail.getSpecificationModel());
             if (snInvoice.getInvoiceCode() != null) {
-                sapInvoiceDetail.setZTID(snInvoice.getInvoiceCode() + snInvoice.getInvoiceNumber());
+                sapInvoiceDetail.setZTID(snInvoice.getInvoiceCode() + snInvoice.getInvoiceNumber() + snInvoice.getInvoiceType());
             } else {
-                sapInvoiceDetail.setZTID(snInvoice.getInvoiceNumber());
+                sapInvoiceDetail.setZTID(snInvoice.getInvoiceNumber()  + snInvoice.getInvoiceType());
             }
             sapInvoiceDetailList.add(sapInvoiceDetail);
         }
@@ -516,6 +516,9 @@ public class SDNYMainProcessController extends AbstractController {
 
         switch (taxRate) {
             // 发票采集
+            case "0":
+                sm = "J0";
+                break;
             case "0.00":
                 sm = "J0";
                 break;
diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/entity/TDxRecordInvoiceDetail.java b/dxhy-erp/src/main/java/com/dxhy/erp/entity/TDxRecordInvoiceDetail.java
index 75e3d695..e7bae17e 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/entity/TDxRecordInvoiceDetail.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/entity/TDxRecordInvoiceDetail.java
@@ -114,9 +114,4 @@ public class TDxRecordInvoiceDetail implements Serializable {
      */
     private String goodsNum;
 
-    /**
-     * 税码
-     */
-    private String taxCode;
-
 }
diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java
index 88bf23fa..bf07e630 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java
@@ -336,6 +336,9 @@ public class SignSaveInvoiceInfoServiceImpl extends MpBaseServiceImpl<SignRecord
 
         switch (taxRate) {
             // 发票采集
+            case "0":
+                sm = "J0";
+                break;
             case "0.00":
                 sm = "J0";
                 break;
diff --git a/pom.xml b/pom.xml
index a03cc24b..552b1a9b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,9 +47,9 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <docker.maven.plugin.version>1.4.13</docker.maven.plugin.version>
         <!-- true: 使用合包方法，base、extend 等jar包中只存才class文件 -->
-        <project.spring-boot-maven-plugin.skip>false</project.spring-boot-maven-plugin.skip>
+        <project.spring-boot-maven-plugin.skip>true</project.spring-boot-maven-plugin.skip>
         <!-- true: 不使用合包方法，dxhy-operation-flow 中值只存在class文件减少磁盘使用，与上一行配置同时修改，值相反 -->
-        <project.flow.spring-boot-maven-plugin.skip>true</project.flow.spring-boot-maven-plugin.skip>
+        <project.flow.spring-boot-maven-plugin.skip>false</project.flow.spring-boot-maven-plugin.skip>
 
         <repository.url>http://10.1.20.6:8081/nexus/content/groups/public</repository.url>
         <pluginRepositories.url>http://10.1.20.6:8081/nexus/content/groups/public</pluginRepositories.url>