From 02d3b08808c14b294cfe2b4b36c26499fbd97c27 Mon Sep 17 00:00:00 2001 From: yefei Date: Tue, 27 Jun 2023 08:48:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?ariesy=20=E4=BF=AE=E6=94=B9=E7=A8=8E?= =?UTF-8?q?=E7=8E=87=E4=B8=BA=E6=95=B4=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/service/SNPushCheckRecordService.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) 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 6b0cd5df..a7dbc101 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 @@ -564,20 +564,20 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { 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; - } - } +// Float num = Float.parseFloat(taxRateDetail); +// if (num > 9) { +// taxRateDetail = "0." + taxRateDetail; +// } else { +// if (!taxRateDetail.startsWith("0")) { +// taxRateDetail = "0.0" + taxRateDetail; +// } +// } } } } if ("11".equals(invoiceType)) { - taxRateDetail = "0.000"; + taxRateDetail = "0"; } log.info("明细-发票税率为:{}", taxRateDetail); snDetailMap.put("taxRate", taxRateDetail); From 0924f2b2ed0dfd4665c7966df5433fa5d003ae82 Mon Sep 17 00:00:00 2001 From: yefei Date: Tue, 27 Jun 2023 18:38:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?ariesy=20=E4=BF=AE=E6=94=B9=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E6=96=87=E4=BB=B6=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/dxhy/core/thread/QyswxxExportThread.java | 2 +- .../src/main/java/com/dxhy/core/thread/RzFpxxExportThread.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/QyswxxExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/QyswxxExportThread.java index 70b9b413..21dab14c 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/QyswxxExportThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/QyswxxExportThread.java @@ -46,7 +46,7 @@ public class QyswxxExportThread extends BaseThread { /** * 文件名后缀 */ - private final String fileNameSurfix = ".xlsx"; + private final String fileNameSurfix = ".xls"; /** * 文件名中间分隔符 */ diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/RzFpxxExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/RzFpxxExportThread.java index 6c674297..1ffe40ec 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/RzFpxxExportThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/RzFpxxExportThread.java @@ -46,7 +46,7 @@ public class RzFpxxExportThread extends BaseThread { /** * 文件名后缀 */ - private final String fileNameSurfix = ".xlsx"; + private final String fileNameSurfix = ".xls"; /** * 文件名中间分隔符 */