violet/ensign
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:

Browse Source 
1.外销合同信保费计算

(cherry picked from commit 298d9f73c8)
This commit is contained in:
25655 2025-04-14 10:49:17 +08:00
parent 14cdf136d2
commit ffb9c2fe9d
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/yem/wm/es/salesorder/from/SalesOrderZJEdit.java
View File

@ -368,7 +368,7 @@ public class SalesOrderZJEdit extends AbstractBillPlugIn implements Plugin, Befo
ClientUtils.countFrontDisPrice(model, rowIndex);//折扣前单价 ClientUtils.countFrontDisPrice(model, rowIndex);//折扣前单价
ClientUtils.addSaAmountTk(model, rowIndex);//销售金额（价格条款）结算币别 ClientUtils.addSaAmountTk(model, rowIndex);//销售金额（价格条款）结算币别
ClientUtils.calculateInsurancePremiums(rowIndex, model);//保险费 ClientUtils.calculateInsurancePremiums(rowIndex, model);//保险费
ClientUtils.calculateCreditAmount(rowIndex, model);//信保费 // ClientUtils.calculateCreditAmount(rowIndex, model);//信保费
ClientUtils.calculateBankInterestCharges(rowIndex, model);//银行利息费 ClientUtils.calculateBankInterestCharges(rowIndex, model);//银行利息费
break; break;
case"yem_e_landcarrycost": case"yem_e_landcarrycost":
@ -457,7 +457,7 @@ public class SalesOrderZJEdit extends AbstractBillPlugIn implements Plugin, Befo
break; break;
case "yem_raprate": case "yem_raprate":
TotalUtil.countRapAmt(model, "yem_es_salescontrac_s"); TotalUtil.countRapAmt(model, "yem_es_salescontrac_s");
ClientUtils.calculateCreditAmount(-1, model);//信保费 // ClientUtils.calculateCreditAmount(-1, model);//信保费
ClientUtils.calculateBankInterestCharges(-1, model);//银行利息费 ClientUtils.calculateBankInterestCharges(-1, model);//银行利息费
break; break;
case "yem_rapamt": case "yem_rapamt":
@ -516,12 +516,12 @@ public class SalesOrderZJEdit extends AbstractBillPlugIn implements Plugin, Befo
break; break;
case "yem_sinosurerate"://信保费率 case "yem_sinosurerate"://信保费率
case "yem_issinosure"://是否信保 case "yem_issinosure"://是否信保
ClientUtils.calculateCreditAmount(-1, model);//信保费 // ClientUtils.calculateCreditAmount(-1, model);//信保费
ClientUtils.calculateBankInterestCharges(-1, model);//银行利息费 ClientUtils.calculateBankInterestCharges(-1, model);//银行利息费
break; break;
case "yem_e_seafreight":// 海运费 case "yem_e_seafreight":// 海运费
ClientUtils.calculateInsurancePremiums(rowIndex, model);//保险费 ClientUtils.calculateInsurancePremiums(rowIndex, model);//保险费
ClientUtils.calculateCreditAmount(rowIndex, model);//信保费 // ClientUtils.calculateCreditAmount(rowIndex, model);//信保费
ClientUtils.calculateBankInterestCharges(rowIndex, model);//银行利息费 ClientUtils.calculateBankInterestCharges(rowIndex, model);//银行利息费
break; break;
case "yem_insuranceaddrate"://保险加成率 case "yem_insuranceaddrate"://保险加成率
@ -531,11 +531,11 @@ public class SalesOrderZJEdit extends AbstractBillPlugIn implements Plugin, Befo
ClientUtils.calculateInsurancePremiums(-1, model);//保险费 ClientUtils.calculateInsurancePremiums(-1, model);//保险费
break; break;
case "yem_e_marinsupreamt"://保险费 case "yem_e_marinsupreamt"://保险费
ClientUtils.calculateCreditAmount(rowIndex, model);//信保费 // ClientUtils.calculateCreditAmount(rowIndex, model);//信保费
ClientUtils.calculateBankInterestCharges(rowIndex, model);//银行利息费 ClientUtils.calculateBankInterestCharges(rowIndex, model);//银行利息费
break; break;
case "yem_e_interestamt"://银行利息费 case "yem_e_interestamt"://银行利息费
ClientUtils.calculateCreditAmount(rowIndex, model);//信保费 // ClientUtils.calculateCreditAmount(rowIndex, model);//信保费
break; break;
case "yem_interestdays": case "yem_interestdays":
ClientUtils.calculateBankInterestCharges(-1, model);//银行利息费 ClientUtils.calculateBankInterestCharges(-1, model);//银行利息费

11
src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java
View File

@ -1520,19 +1520,20 @@ public class ClientUtils {
if ("A".equals(issinosure)) { if ("A".equals(issinosure)) {
BigDecimal raprate = (BigDecimal) model.getValue("yem_raprate", i);//收汇百分比% BigDecimal raprate = (BigDecimal) model.getValue("yem_raprate", i);//收汇百分比%
BigDecimal interestdays = ((BigDecimal) model.getValue("yem_interestdays", i));//利息天数 BigDecimal interestdays = ((BigDecimal) model.getValue("yem_interestdays", i));//利息天数
BigDecimal yem_sinosurerate = ((BigDecimal) model.getValue("yem_sinosurerate", i));//利息天数 BigDecimal yem_sinosurerate = ((BigDecimal) model.getValue("yem_sinosurerate", i));//信保费率
BigDecimal calculate = raprate; // BigDecimal calculate = raprate;
BigDecimal yem_e_interestamt = safobprice.add(seafreight).add(yemELandcarrycost).add(yemEAirliftcost).add(yemPortamt) BigDecimal yem_e_interestamt = safobprice.add(seafreight).add(yemELandcarrycost).add(yemEAirliftcost).add(yemPortamt)
.add(yemInlandtransportation).add(yemEBankcost).add(yemEElsecost).add(yemCostsinclude).add(marinsupreamt); .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, interestdays, 10);
multiply = BigDecimalUtils.multiply(multiply, interestrate, 10); multiply = BigDecimalUtils.multiply(multiply, interestrate, 10);
multiply = BigDecimalUtils.div(multiply, new BigDecimal(100), 10); multiply = BigDecimalUtils.div(multiply, new BigDecimal(100), 10);
multiply = BigDecimalUtils.div(multiply, new BigDecimal(360), 10); multiply = BigDecimalUtils.div(multiply, new BigDecimal(360), 10);
setScale =setScale.add(multiply.setScale(0, RoundingMode.UP)); setScale =setScale.add(multiply.setScale(0, RoundingMode.UP));
BigDecimal yem_e_creditamt = BigDecimalUtils.multiply(yem_e_interestamt,calculate,10); BigDecimal yem_e_creditamt = BigDecimalUtils.multiply(yem_e_interestamt,raprate,10);
yem_e_creditamt= BigDecimalUtils.multiply(yem_e_creditamt,yem_sinosurerate,10);
yem_e_creditamt = BigDecimalUtils.div(yem_e_creditamt, new BigDecimal(100),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)); yemEAirliftcosts = yemEAirliftcosts.add(BigDecimalUtils.div(yem_e_creditamt, new BigDecimal(100),10));
} }
} }