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"))) {