From 1c4a90ee4d5e001ce0f21537d1789263d8c95e05 Mon Sep 17 00:00:00 2001 From: yefei Date: Wed, 19 Apr 2023 14:09:05 +0800 Subject: [PATCH] =?UTF-8?q?ariesy=20=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6&=E5=A2=9E=E5=8A=A0=E5=85=A8=E7=94=B5?= =?UTF-8?q?=E5=8F=91=E7=A5=A8=E8=AE=A4=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DomesticInvoiceDrawbackServiceImpl.java | 2 +- .../com/dxhy/extend/controller/ExtCustomsController.java | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) 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 775a8508..c818f4cf 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 @@ -450,7 +450,7 @@ public class DomesticInvoiceDrawbackServiceImpl implements DomesticInvoiceDrawba // 发票类型校验 InvoiceUtil invoiceUtil = new InvoiceUtil(dto.getInvoiceCode()); String invoiceType = invoiceUtil.getFplxdm(); - if (!Arrays.asList("01", "08").contains(invoiceType)) { + if (!Arrays.asList("01", "08", "31").contains(invoiceType)) { return "发票类型错误"; } // 重复校验 diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtCustomsController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtCustomsController.java index 452f82da..ed14aa94 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtCustomsController.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtCustomsController.java @@ -126,8 +126,13 @@ public class ExtCustomsController extends AbstractController { pramsMap.put("snVoucherNumber",pramsMap.get("snVoucherNumber")); } - if(pramsMap.get("accountPeriod") != null){ - pramsMap.put("accountPeriod",pramsMap.get("accountPeriod")); + if(pramsMap.get("accountPeriod") != null ){ + if(pramsMap.get("accountPeriod").toString().length() > 7) { + String accountPeriod = pramsMap.get("accountPeriod").toString().substring(0, 7); + pramsMap.put("accountPeriod", accountPeriod); + }else{ + pramsMap.put("accountPeriod", pramsMap.get("accountPeriod")); + } } if (pramsMap.get("postingTimeStart") != null && !"".equals(pramsMap.get("postingTimeStart"))) {