计量公式相关

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/Material.java

@@ -52,8 +52,8 @@ public class Material {
         data.add(index);
         data.add(materialName);
         data.add(unit);
-        data.add(price);
         data.add(meterAmount);
+        data.add(price);
         data.add(sum);
         data.add(ratio);
         data.add(advancePayment);

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

@@ -220,10 +220,10 @@ public class ExecutorMeter extends FormulaExecutor {
                 for(Material m:materials){
                     m.setIndex(n++);
                     m.setRatio(baseInfo.getDeductRatio()*100+"%");
-                    m.setAdvancePayment(StringUtils.number2StringZero(Double.parseDouble(m.getSum())*baseInfo.getDeductRatio(),1));
+                    m.setAdvancePayment(StringUtils.number2StringZero(Double.parseDouble(m.getSum())*baseInfo.getDeductRatio(),2));
                 }
-                this.total=StringUtils.number2StringZero(materials.stream().mapToDouble(m->Double.parseDouble(m.getSum())).sum(),1);
-                this.totalAdvance=StringUtils.number2StringZero(materials.stream().mapToDouble(m->Double.parseDouble(m.getAdvancePayment())).sum(),1);
+                this.total=StringUtils.number2StringZero(materials.stream().mapToDouble(m->Double.parseDouble(m.getSum())).sum(),2);
+                this.totalAdvance=StringUtils.number2StringZero(materials.stream().mapToDouble(m->Double.parseDouble(m.getAdvancePayment())).sum(),2);
                 /*合计*/
                 Material summary= new Material();
                 summary.setMaterialName("合计");

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

@@ -2046,17 +2046,6 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
 
 
 
-
-    /**
-     * @Description 元素依赖解析
-     * @Author yangyj
-     * @Date 2022.07.04 16:10
-     **/
-
-
-
-
-
     /**
      * 先把公式脚本需要聚合部分预处理
      * */