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,