Merge remote-tracking branch 'origin/release' into release

dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java

@@ -515,6 +515,9 @@ public class BaseInvoiceController extends AbstractController {
                 pramsMap.put("eleInvoiceNo", invoiceNo);
             }
         }
+
+
+
         if (!StringUtils.isBlank(xfmc)) {
             pramsMap.put("xfmc", xfmc);
         }

dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java

@@ -245,6 +245,8 @@ public class SDNYMainProcessController extends AbstractController {
         checkInvoice.put("salesAddressPhone", checkInvoice.get("gfAddressAndPhone"));
         checkInvoice.put("salesBank", checkInvoice.get("gfBankAndNo"));
         checkInvoice.put("checkCode", checkInvoice.get("checkCode"));
+        checkInvoice.put("state", "0");
+        checkInvoice.put("tollSign", "07");
         String taxRate = "";
 
         List<Map<String, String>> returnDetailList = new ArrayList<>();

dxhy-erp/src/main/resources/bootstrap-std.yaml

@@ -4,9 +4,9 @@ spring:
     nacos:
       config:
         # Nacos config 地址
-        server-addr: 172.31.36.147:33000
+        server-addr: 172.31.36.143:33000
         # Nacos config 命名空间,对应配置中的名称（dxhy-jxpt-namespace）
-        namespace: eb6eab27-62a4-4ccf-8640-b8e91df0a1a6
+        namespace: b271ba8e-84d9-4393-88b8-9271aff9465c
         # Nacos config 分组
         group: dxhy-erp-group
         # Nacos config 登录用户名
@@ -19,9 +19,9 @@ spring:
         file-extension: yaml
       # Nacos discovery 配置
       discovery:
-        server-addr: 172.31.36.147:33000
+        server-addr: 172.31.36.143:33000
         # Nacos config 登录用户名
         username: nacos
         # Nacos config 登录密码
         password: Invoice.nacos.!1
-        namespace: eb6eab27-62a4-4ccf-8640-b8e91df0a1a6
+        namespace: b271ba8e-84d9-4393-88b8-9271aff9465c

dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/drawback/impl/DomesticInvoiceDrawbackServiceImpl.java

@@ -449,7 +449,16 @@ public class DomesticInvoiceDrawbackServiceImpl implements DomesticInvoiceDrawba
         }
         // 发票类型校验
         InvoiceUtil invoiceUtil = new InvoiceUtil(dto.getInvoiceCode());
+
+        log.info("invoiceCode={}",dto.getInvoiceCode());
+        log.info("invoiceNo={}",dto.getInvoiceNo());
+
         String invoiceType = invoiceUtil.getFplxdm();
+
+        if(dto.getInvoiceCode().length() == 20){
+            invoiceType = "31";
+        }
+
         if (!Arrays.asList("01", "08", "31").contains(invoiceType)) {
             return "发票类型错误";
         }