fix:
1.寄单放单申请提交效验改变小数位
This commit is contained in:
parent
9980d97af7
commit
ae1de03fc2
@ -125,18 +125,18 @@ public class ExportPresentSubmitValidator extends AbstractValidator {
|
|||||||
BigDecimal procAmt = PaymentControlUtil.getAdvancePayment(procPreRapRate, offeramount);
|
BigDecimal procAmt = PaymentControlUtil.getAdvancePayment(procPreRapRate, offeramount);
|
||||||
|
|
||||||
BigDecimal orderPreAmt = shipAmt.add(procAmt);
|
BigDecimal orderPreAmt = shipAmt.add(procAmt);
|
||||||
|
orderPreAmt = orderPreAmt.setScale(4, RoundingMode.HALF_UP);
|
||||||
|
climePreAmt = climePreAmt.setScale(4, RoundingMode.HALF_UP);
|
||||||
if (climePreAmt.compareTo(orderPreAmt) < 0) {
|
if (climePreAmt.compareTo(orderPreAmt) < 0) {
|
||||||
sb.append(String.format("合同 [ %s ] ,合同预收金额 [ %s ], 合同预收已认领金额合计 [ %s ],合同预收款未认领完成,请核对后提交!",
|
sb.append(String.format("合同 [ %s ] ,合同预收金额 [ %s ], 合同预收已认领金额合计 [ %s ],合同预收款未认领完成,请核对后提交!",
|
||||||
billno,
|
billno,
|
||||||
orderPreAmt.setScale(4, RoundingMode.HALF_UP).toPlainString(),
|
orderPreAmt.toPlainString(),
|
||||||
climePreAmt.setScale(4, RoundingMode.HALF_UP).toPlainString())).append("\r\n");
|
climePreAmt.toPlainString())).append("\r\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (climeAmt.compareTo(offeramount) < 0) {
|
if (climeAmt.compareTo(offeramount) < 0) {
|
||||||
sb.append(String.format("合同 [ %s ] ,合同金额 [ %s ], 合同已认领金额合计 [ %s ],合同未认领完成,请全部认领后提交单据!",
|
sb.append(String.format("合同 [ %s ] ,合同金额 [ %s ], 合同已认领金额合计 [ %s ],合同未认领完成,请全部认领后提交单据!",
|
||||||
billno,
|
billno,
|
||||||
|
Loading…
Reference in New Issue
Block a user