From ffb9c2fe9df827a3a5953123fb8730cd94978dbe Mon Sep 17 00:00:00 2001 From: 25655 <2565550274@qq.com> Date: Mon, 14 Apr 2025 10:49:17 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=201.=E5=A4=96=E9=94=80=E5=90=88?= =?UTF-8?q?=E5=90=8C=E4=BF=A1=E4=BF=9D=E8=B4=B9=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 298d9f73c874020935ee49eff12c2cb2b616ecfc) --- .../yem/wm/es/salesorder/from/SalesOrderZJEdit.java | 12 ++++++------ .../yem/wm/im/clientdemand/utils/ClientUtils.java | 11 ++++++----- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderZJEdit.java b/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderZJEdit.java index 971eb088..9fcf47fc 100644 --- a/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderZJEdit.java +++ b/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderZJEdit.java @@ -368,7 +368,7 @@ public class SalesOrderZJEdit extends AbstractBillPlugIn implements Plugin, Befo ClientUtils.countFrontDisPrice(model, rowIndex);//折扣前单价 ClientUtils.addSaAmountTk(model, rowIndex);//销售金额（价格条款）结算币别 ClientUtils.calculateInsurancePremiums(rowIndex, model);//保险费 - ClientUtils.calculateCreditAmount(rowIndex, model);//信保费 +// ClientUtils.calculateCreditAmount(rowIndex, model);//信保费 ClientUtils.calculateBankInterestCharges(rowIndex, model);//银行利息费 break; case"yem_e_landcarrycost": @@ -457,7 +457,7 @@ public class SalesOrderZJEdit extends AbstractBillPlugIn implements Plugin, Befo break; case "yem_raprate": TotalUtil.countRapAmt(model, "yem_es_salescontrac_s"); - ClientUtils.calculateCreditAmount(-1, model);//信保费 +// ClientUtils.calculateCreditAmount(-1, model);//信保费 ClientUtils.calculateBankInterestCharges(-1, model);//银行利息费 break; case "yem_rapamt": @@ -516,12 +516,12 @@ public class SalesOrderZJEdit extends AbstractBillPlugIn implements Plugin, Befo break; case "yem_sinosurerate"://信保费率 case "yem_issinosure"://是否信保 - ClientUtils.calculateCreditAmount(-1, model);//信保费 +// ClientUtils.calculateCreditAmount(-1, model);//信保费 ClientUtils.calculateBankInterestCharges(-1, model);//银行利息费 break; case "yem_e_seafreight":// 海运费 ClientUtils.calculateInsurancePremiums(rowIndex, model);//保险费 - ClientUtils.calculateCreditAmount(rowIndex, model);//信保费 +// ClientUtils.calculateCreditAmount(rowIndex, model);//信保费 ClientUtils.calculateBankInterestCharges(rowIndex, model);//银行利息费 break; case "yem_insuranceaddrate"://保险加成率 @@ -531,11 +531,11 @@ public class SalesOrderZJEdit extends AbstractBillPlugIn implements Plugin, Befo ClientUtils.calculateInsurancePremiums(-1, model);//保险费 break; case "yem_e_marinsupreamt"://保险费 - ClientUtils.calculateCreditAmount(rowIndex, model);//信保费 +// ClientUtils.calculateCreditAmount(rowIndex, model);//信保费 ClientUtils.calculateBankInterestCharges(rowIndex, model);//银行利息费 break; case "yem_e_interestamt"://银行利息费 - ClientUtils.calculateCreditAmount(rowIndex, model);//信保费 +// ClientUtils.calculateCreditAmount(rowIndex, model);//信保费 break; case "yem_interestdays": ClientUtils.calculateBankInterestCharges(-1, model);//银行利息费 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 ce498355..e9a15354 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 @@ -1520,19 +1520,20 @@ public class ClientUtils { if ("A".equals(issinosure)) { BigDecimal raprate = (BigDecimal) model.getValue("yem_raprate", i);//收汇百分比% BigDecimal interestdays = ((BigDecimal) model.getValue("yem_interestdays", i));//利息天数 - BigDecimal yem_sinosurerate = ((BigDecimal) model.getValue("yem_sinosurerate", i));//利息天数 - BigDecimal calculate = raprate; + BigDecimal yem_sinosurerate = ((BigDecimal) model.getValue("yem_sinosurerate", i));//信保费率 +// BigDecimal calculate = raprate; BigDecimal yem_e_interestamt = safobprice.add(seafreight).add(yemELandcarrycost).add(yemEAirliftcost).add(yemPortamt) .add(yemInlandtransportation).add(yemEBankcost).add(yemEElsecost).add(yemCostsinclude).add(marinsupreamt); - BigDecimal multiply = BigDecimalUtils.multiply(yem_e_interestamt, calculate, 10); + BigDecimal multiply = BigDecimalUtils.multiply(yem_e_interestamt, raprate, 10); multiply = BigDecimalUtils.multiply(multiply, interestdays, 10); multiply = BigDecimalUtils.multiply(multiply, interestrate, 10); multiply = BigDecimalUtils.div(multiply, new BigDecimal(100), 10); multiply = BigDecimalUtils.div(multiply, new BigDecimal(360), 10); setScale =setScale.add(multiply.setScale(0, RoundingMode.UP)); - BigDecimal yem_e_creditamt = BigDecimalUtils.multiply(yem_e_interestamt,calculate,10); - yem_e_creditamt= BigDecimalUtils.multiply(yem_e_creditamt,yem_sinosurerate,10); + BigDecimal yem_e_creditamt = BigDecimalUtils.multiply(yem_e_interestamt,raprate,10); yem_e_creditamt = BigDecimalUtils.div(yem_e_creditamt, new BigDecimal(100),10); + yem_e_creditamt = BigDecimalUtils.add(yem_e_creditamt, setScale, 10); + yem_e_creditamt= BigDecimalUtils.multiply(yem_e_creditamt,yem_sinosurerate,10); yemEAirliftcosts = yemEAirliftcosts.add(BigDecimalUtils.div(yem_e_creditamt, new BigDecimal(100),10)); } }