From 01cdf4faf9a7ff8617483faf65db0d373762fc92 Mon Sep 17 00:00:00 2001 From: yefei Date: Thu, 6 Jul 2023 10:08:39 +0800 Subject: [PATCH] =?UTF-8?q?ariesy=20=E5=A2=9E=E5=8A=A0=E5=8D=95=E4=B8=AA?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=8E=92=E5=BA=8F&=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AF=BC=E5=87=BA=E6=9D=A1=E4=BB=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SDNYMainProcessController.java | 26 ++++++++++++++----- 1 file changed, 20 insertions(+), 6 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 56fb7c2c..1f66e9cc 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 @@ -832,7 +832,7 @@ public class SDNYMainProcessController extends AbstractController { sapInvoiceDetail.setZSM(getZSM(tax.toString())); BigDecimal tax1 = tax.multiply(new BigDecimal("100")); sapInvoiceDetail.setZTAX(tax1.toString()); - if (tax1.compareTo(new BigDecimal("100")) < 1) { + if (tax1.compareTo(new BigDecimal("100")) > 0) { sapInvoiceDetail.setZTAX(taxRate); }else if (tax1.scale() > 2){ DecimalFormat decimalFormat = new DecimalFormat("#.00"); @@ -1258,11 +1258,25 @@ public class SDNYMainProcessController extends AbstractController { } public static void main(String[] args) { - DecimalFormat decimalFormat = new DecimalFormat("#.00"); - String formattedDecimal = decimalFormat.format(new BigDecimal("15")); - BigDecimal bigDecimal = new BigDecimal("0.13"); - boolean b = bigDecimal.compareTo(new BigDecimal("1")) < 1; - System.out.println(); +// DecimalFormat decimalFormat = new DecimalFormat("#.00"); +// String formattedDecimal = decimalFormat.format(new BigDecimal("15")); +// BigDecimal bigDecimal = new BigDecimal("0.13"); +// boolean b = bigDecimal.compareTo(new BigDecimal("1")) < 1; +// System.out.println(); + + SAPInvoiceDetail sapInvoiceDetail = new SAPInvoiceDetail(); + String taxRate = "6.00"; + BigDecimal tax = new BigDecimal(taxRate); + BigDecimal tax1 = tax.multiply(new BigDecimal("100")); + sapInvoiceDetail.setZTAX(tax1.toString()); + if (tax1.compareTo(new BigDecimal("100")) > 0) { + sapInvoiceDetail.setZTAX(taxRate); + }else if (tax1.scale() > 2){ + DecimalFormat decimalFormat = new DecimalFormat("#.00"); + String formattedDecimal = decimalFormat.format(tax1); + sapInvoiceDetail.setZTAX(formattedDecimal); + } + System.out.println("sapInvoiceDetail="+sapInvoiceDetail.getZTAX()); } }