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 abeb45ef..43874a81 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 @@ -495,22 +495,31 @@ public class SDNYMainProcessController extends AbstractController { if (detail.get("taxRate") != null && StringUtils.isNoneBlank(detail.get("taxRate").toString())) { taxRateDetail = detail.get("taxRate").toString(); if (!"0".equals(taxRateDetail)) { -// if (StringUtils.isNoneBlank(taxRateDetail)) { -// int index = taxRateDetail.indexOf("%"); -// if (index > 0) { -// taxRateDetail = taxRateDetail.substring(0, taxRateDetail.length() - 1); -// Float num = Float.parseFloat(taxRateDetail); -// if (num > 9) { -// taxRateDetail = "0." + taxRateDetail; -// } else { -// if (!taxRateDetail.startsWith("0")) { -// taxRateDetail = "0.0" + taxRateDetail; -// } -// } -// } -// } - - taxRateDetail = CheckUtil.formatPercentSl(taxRateDetail); + if (StringUtils.isNoneBlank(taxRateDetail)) { + int index = taxRateDetail.indexOf("%"); + if (index > 0) { + taxRateDetail = taxRateDetail.substring(0, taxRateDetail.length() - 1); + Float num = Float.parseFloat(taxRateDetail); + if (num > 9) { + taxRateDetail = "0." + taxRateDetail; + } else { + if (!taxRateDetail.startsWith("0")) { + taxRateDetail = "0.0" + taxRateDetail; + } + } + }else{ + Float num = Float.parseFloat(taxRateDetail); + if (num > 9) { + taxRateDetail = "0." + taxRateDetail; + } else { + if (!taxRateDetail.startsWith("0")) { + taxRateDetail = "0.0" + taxRateDetail; + } + } + } + } + +// taxRateDetail = CheckUtil.formatPercentSl(taxRateDetail); } if ("11".equals(invoiceType)) { diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java index 104df6fd..a3123784 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java @@ -616,6 +616,12 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { InvoiceInfo invoiceInfo = convertToInvoiceInfo(invoice); log.info("进行价税分离的发票信息为:{}", invoiceInfo); + if(SNFplxEnum.KYQCP.getFplxDm().equals(fplxdm)){ + if(StringUtils.isEmpty(invoice.getRiderName()) || StringUtils.isEmpty(invoice.getIdcardNo())){ + return result; + } + } + ServiceResult invoiceResult = this.valoremTaxCount(invoiceInfo, "Y"); InvoiceInfo data = invoiceResult.getData(); if (data != null) {