公式相关：附表自动设置小数位

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

@@ -93,6 +93,7 @@ public class SubTable {
                 FormulaUtils.write(design, designList, true);
                 design.setUpdate(1);
             }
+
             FormulaUtils.write(data, dataList, true);
             itemName.setUpdate(1);
             data.setUpdate(1);

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

@@ -946,13 +946,13 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                     if(designFdOp.isPresent()){
                         key+="@"+designFdOp.get().getValues().stream().map(ElementData::getValue).filter(StringUtils::isNotEmpty).findAny().orElse("");
                     }
-                    sta.put(key,setScale(2,overList));
+                    sta.put(key,FormulaUtils.setScale(null,overList));
                 });
                 if(sta.checked()){
                     /*把附表数据刷入对应的附表元素对象*/
                     sta.flush();
                 }
-                String mainTableName = this.tec.getTableAll().stream().filter(e -> e.getNodeName().contains("检验单") || e.getTableType().equals(5)).map(NodeTable::getInitTableName).findFirst().orElse("");
+                String mainTableName = this.tec.getTableAll().stream().filter(e -> e.getTableType().equals(1) || e.getTableType().equals(5)).map(NodeTable::getInitTableName).findFirst().orElse("");
                 if(Func.isNotBlank(mainTableName)){
                     List<FormData> sourceFds=tec.getFormDataMap().values().stream().filter(s->!s.empty()).filter(s->StringUtils.isEquals(s.getTableName(),mainTableName)).collect(Collectors.toList());
                     Map<String,Object> copyMap= new HashMap<>();
@@ -1203,13 +1203,13 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
    }
 
 
-public  List<ElementData> setScale(Integer scale,List<ElementData> data){
+/*public  List<ElementData> setScale(Integer scale,List<ElementData> data){
     if(scale==null){
         scale=StringUtils.getScale(data.stream().map(ElementData::getValue).filter(StringUtils::isDouble).collect(Collectors.toList()));
     }
     Integer finalScale = scale;
     return data.stream().peek(e->{if(StringUtils.isDouble(e.getValue())){e.setValue(StringUtils.number2StringZero(e.getValue(),finalScale));}}).collect(Collectors.toList());
-}
+}*/
 
     @Override
     public void format() {
@@ -1219,7 +1219,7 @@ public  List<ElementData> setScale(Integer scale,List<ElementData> data){
                 /*保留小数位*/
                 if(fd.getFormula()!=null&&!fd.empty()&&fd.getValues().stream().map(ElementData::getValue).anyMatch(StringUtils::isNumber)){
                     Formula f = fd.getFormula();
-                    fd.setValues(setScale(f.getScale(),fd.getValues()));
+                    fd.setValues(FormulaUtils.setScale(f.getScale(),fd.getValues()));
                 }
             }
         }