ariesy 70619

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-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 "发票类型错误";
         }