From 6eb3c8ae11021ff06290e3d4560a710cc92c4427 Mon Sep 17 00:00:00 2001 From: yefei Date: Wed, 19 Apr 2023 14:55:51 +0800 Subject: [PATCH 1/2] 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 "发票类型错误"; } From 18bacbd6019662bfa3e0444bd4afbae33d408053 Mon Sep 17 00:00:00 2001 From: yefei Date: Wed, 19 Apr 2023 15:02:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?ariesy=20=E4=BF=AE=E6=94=B9=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6&=E9=87=8D=E6=96=B0=E6=89=93?= =?UTF-8?q?=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-erp/src/main/resources/bootstrap-std.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dxhy-erp/src/main/resources/bootstrap-std.yaml b/dxhy-erp/src/main/resources/bootstrap-std.yaml index d2241fff..7c52edcd 100644 --- a/dxhy-erp/src/main/resources/bootstrap-std.yaml +++ b/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 \ No newline at end of file + namespace: b271ba8e-84d9-4393-88b8-9271aff9465c \ No newline at end of file