瀏覽代碼

材料调差

yangyj 11 月之前
父節點
當前提交
9043e7b225

+ 2 - 2
blade-service/blade-manager/src/main/java/org/springblade/manager/formula/impl/ExecutorMeter.java

@@ -533,9 +533,9 @@ public class ExecutorMeter extends FormulaExecutor {
                     mpd.setAmountBase(StringUtils.number2String(multiFc.apply(mpd.getPriceBase(),mpd.getQuantity()),0));
                     mpd.setAmountBase(StringUtils.number2String(multiFc.apply(mpd.getPriceBase(),mpd.getQuantity()),0));
                     String base=mpd.getPriceBase();
                     String base=mpd.getPriceBase();
                     if(mad.getCurrentPrice().compareTo(mad.getMaterialPrice())>0){
                     if(mad.getCurrentPrice().compareTo(mad.getMaterialPrice())>0){
-                        base=multiFc.apply(base,addFc.apply("1",mad.getQuotaRatio()));
+                        base=multiFc.apply(base,addFc.apply("1",divideFc.apply(mad.getQuotaRatio(),"100")));
                     }else{
                     }else{
-                        base=multiFc.apply(base,subtractFc.apply("1",mad.getQuotaRatio()));
+                        base=multiFc.apply(base,subtractFc.apply("1",divideFc.apply(mad.getQuotaRatio(),"100")));
                     }
                     }
                     mpd.setPriceSpread(BaseUtils.str2BigDecimal(subtractFc.apply(mpd.getPrice(),base)).setScale(0,RoundingMode.HALF_UP).toPlainString());
                     mpd.setPriceSpread(BaseUtils.str2BigDecimal(subtractFc.apply(mpd.getPrice(),base)).setScale(0,RoundingMode.HALF_UP).toPlainString());
                     mpd.setTotal(StringUtils.number2String(multiFc.apply("0.91",mad.getAdjustMoney().toPlainString()),0));
                     mpd.setTotal(StringUtils.number2String(multiFc.apply("0.91",mad.getAdjustMoney().toPlainString()),0));