From 0324937d60588d39f99d38b700a3df88cfb9611c Mon Sep 17 00:00:00 2001 From: ljw Date: Tue, 22 Oct 2024 22:50:26 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=8F=98=E6=9B=B4=E5=8D=95=E7=9A=84?= =?UTF-8?q?=E6=8A=98=E6=89=A3=E9=87=91=E9=A2=9D=20=20=E4=B8=8D=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E8=A7=A6=E5=8F=91=E5=80=BC=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yem/wm/im/clientdemand/utils/ClientUtils.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java b/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java index dc46656b..70b84a8d 100644 --- a/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java +++ b/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java @@ -1607,31 +1607,32 @@ public class ClientUtils { Boolean ifGift = (Boolean) model.getValue("yem_ifgift", i); if (!ifGift) { BigDecimal saFobAmount = (BigDecimal) model.getValue("yem_safobamount", i); + //20/40*10 BigDecimal diaAmt = saFobAmount.divide(amount, RoundingMode.HALF_UP).multiply(fundPoolAmt).setScale(2, RoundingMode.HALF_UP); if (i == seq) { model.beginInit(); view.updateView("yem_disamt", i); + model.endInit(); if (!model.getDataEntityType().getName().equals("yem_es_xsalesorder")) { model.setValue("yem_disamt", fundPoolAmt.subtract(fundPoolAmtSum), i); } - model.endInit(); } else { fundPoolAmtSum = fundPoolAmtSum.add(diaAmt); model.beginInit(); if (!model.getDataEntityType().getName().equals("yem_es_xsalesorder")) { model.setValue("yem_disamt", diaAmt, i); + model.endInit(); view.updateView("yem_disamt", i); } - model.endInit(); } // System.out.printf("++++++++-- i = %s -- seq = %s -- yem_disamt = %s%n", i, seq, model.getValue("yem_disamt", i)); } else { model.beginInit(); if (!model.getDataEntityType().getName().equals("yem_es_xsalesorder")) { model.setValue("yem_disamt", null, i); + model.endInit(); view.updateView("yem_disamt", i); } - model.endInit(); } ClientUtils.countAfterFrontAmt(model, i);//计算折扣后销售金额 ClientUtils.addSaAmountTk(model, i);//销售金额（价格条款）结算币别