From 6eb3c8ae11021ff06290e3d4560a710cc92c4427 Mon Sep 17 00:00:00 2001 From: yefei Date: Wed, 19 Apr 2023 14:55:51 +0800 Subject: [PATCH] ariesy 70619 --- .../com/dxhy/base/controller/BaseInvoiceController.java | 3 +++ .../dxhy/erp/controller/SDNYMainProcessController.java | 2 ++ .../impl/DomesticInvoiceDrawbackServiceImpl.java | 9 +++++++++ 3 files changed, 14 insertions(+) diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java index 6af5b05d..53b2311f 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java +++ b/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); } 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 8a07e574..dd705162 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 @@ -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> returnDetailList = new ArrayList<>(); diff --git a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/drawback/impl/DomesticInvoiceDrawbackServiceImpl.java b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/drawback/impl/DomesticInvoiceDrawbackServiceImpl.java index c818f4cf..72105774 100644 --- a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/drawback/impl/DomesticInvoiceDrawbackServiceImpl.java +++ b/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 "发票类型错误"; }