材料调差

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

@@ -537,8 +537,11 @@ public class ExecutorMeter extends FormulaExecutor {
                     }else{
                         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.setTotal(StringUtils.number2String(divideFc.apply(mad.getAdjustMoneyPre().toPlainString(),"1.09"),0));
+                    mpd.setPriceSpread(BaseUtils.str2BigDecimal(subtractFc.apply(mpd.getPrice(),base)).setScale(2,RoundingMode.HALF_UP).stripTrailingZeros().toPlainString());
+                    if(mad.getAdjustMoneyPre()==null){
+                        mad.setAdjustMoneyPre(BigDecimal.ZERO);
+                    }
+                    mpd.setTotal(StringUtils.number2String(mad.getAdjustMoneyPre().toPlainString(),0));
                     mpd.setMaterialArriveNumber(tec.periodInfo.getPayNumber());
                     dataList.add(mpd);
                 }