Merge remote-tracking branch 'origin/dev-v6.0.1' into dev-v6.0.1

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;

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;

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;

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>