From ae1de03fc212dbaf2b80ab8066a1f18102535ad4 Mon Sep 17 00:00:00 2001 From: 25655 <2565550274@qq.com> Date: Fri, 21 Mar 2025 16:44:26 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=201.=E5=AF=84=E5=8D=95=E6=94=BE?= =?UTF-8?q?=E5=8D=95=E7=94=B3=E8=AF=B7=E6=8F=90=E4=BA=A4=E6=95=88=E9=AA=8C?= =?UTF-8?q?=E6=94=B9=E5=8F=98=E5=B0=8F=E6=95=B0=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../validator/ExportPresentSubmitValidator.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/yem/wm/es/exportpresent/validator/ExportPresentSubmitValidator.java b/src/main/java/com/yem/wm/es/exportpresent/validator/ExportPresentSubmitValidator.java index 18abdac7..5e61a724 100644 --- a/src/main/java/com/yem/wm/es/exportpresent/validator/ExportPresentSubmitValidator.java +++ b/src/main/java/com/yem/wm/es/exportpresent/validator/ExportPresentSubmitValidator.java @@ -125,18 +125,18 @@ public class ExportPresentSubmitValidator extends AbstractValidator { BigDecimal procAmt = PaymentControlUtil.getAdvancePayment(procPreRapRate, offeramount); BigDecimal orderPreAmt = shipAmt.add(procAmt); - + orderPreAmt = orderPreAmt.setScale(4, RoundingMode.HALF_UP); + climePreAmt = climePreAmt.setScale(4, RoundingMode.HALF_UP); if (climePreAmt.compareTo(orderPreAmt) < 0) { sb.append(String.format("合同 [ %s ] ，合同预收金额 [ %s ]， 合同预收已认领金额合计 [ %s ]，合同预收款未认领完成，请核对后提交！", billno, - orderPreAmt.setScale(4, RoundingMode.HALF_UP).toPlainString(), - climePreAmt.setScale(4, RoundingMode.HALF_UP).toPlainString())).append("\r\n"); + orderPreAmt.toPlainString(), + climePreAmt.toPlainString())).append("\r\n"); } } else { - if (climeAmt.compareTo(offeramount) < 0) { sb.append(String.format("合同 [ %s ] ，合同金额 [ %s ]， 合同已认领金额合计 [ %s ]，合同未认领完成，请全部认领后提交单据！", billno,