From 1e9797ee60bc5592fd550d0c18d27bad80e85b17 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Tue, 11 Jul 2023 09:17:26 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A8=8E=E7=8E=87=E5=88=A4=E6=96=AD=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/erp/controller/SDNYMainProcessController.java | 3 ++- .../java/com/dxhy/erp/service/SNPushCheckRecordService.java | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) 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 63e6f53d..08c8ac8c 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 @@ -507,7 +507,8 @@ public class SDNYMainProcessController extends AbstractController { } BigDecimal tax = new BigDecimal(taxRateDetail); BigDecimal tax1 = tax.divide(new BigDecimal("100")); - if (tax.compareTo(new BigDecimal("1")) < 1) { + // TODO + if (tax.compareTo(new BigDecimal("1")) < 0) { taxRateDetail = tax.toPlainString(); }else { taxRateDetail = tax1.toPlainString(); 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 07d73f6d..1df2e198 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 @@ -466,7 +466,11 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { if (StringUtils.isNoneBlank(invoiceData.get("sl").toString())) { taxRate = invoiceData.get("sl").toString(); if (!"0".equals(taxRate)) { - taxRate = taxRate.substring(0, taxRate.length() - 1); +// taxRate = taxRate.substring(0, taxRate.length() - 1); + //TODO 存疑等飞哥回来商量 + taxRate = taxRate.replace("%",""); + BigDecimal taxRateBigDecimal = new BigDecimal(taxRate); + taxRate = taxRateBigDecimal.divide(new BigDecimal("100")).toPlainString(); } if ("11".equals(invoiceType)) {