Merge remote-tracking branch 'origin/master'

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

@@ -15,6 +15,8 @@ public class MaterialAdjust {
     private String materialName;
     /**调差金额*/
     private BigDecimal adjustMoney;
+    /**调差金额税前*/
+    private BigDecimal adjustMoneyPre;
     /**调差金额*/
     private BigDecimal adjustTotal;
     /**调差金额*/

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

@@ -538,7 +538,7 @@ public class ExecutorMeter extends FormulaExecutor {
                         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.getAdjustMoney().toPlainString(),"1.09"),0));
+                    mpd.setTotal(StringUtils.number2String(divideFc.apply(mad.getAdjustMoneyPre().toPlainString(),"1.09"),0));
                     mpd.setMaterialArriveNumber(tec.periodInfo.getPayNumber());
                     dataList.add(mpd);
                 }

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

@@ -225,7 +225,7 @@ public class FormulaDaoImpl implements IFormulaDao {
     @Override
     public Function<Long, List<MaterialAdjust>> getMaterialAdjustFc() {
         return  contractId->{
-            String sql="select a.material_name ,a.material_price,a.current_price,a.adjust_money ,a.adjust_total,b.id periodId,b.sort,c.unit,c.quota_ratio " +
+            String sql="select a.material_name ,a.material_price,a.current_price,a.adjust_money,a.adjust_money_pre ,a.adjust_total,b.id periodId,b.sort,c.unit,c.quota_ratio " +
                     "from s_contract_material_adjust a join  s_contract_meter_period b on a.meter_period_id=  b.id  join s_contract_material c on a.contract_material_id =c.id  " +
                     " where a.contract_id="+contractId+" and a.is_deleted=0";
             return getEntityList(sql,MaterialAdjust.class);

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

@@ -2936,6 +2936,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                                       item.setName(StringUtils.handleNull(map.get(fbName.getKey())).split("_\\^_")[0]);
                                       item.setPassRate(BaseUtils.obj2DoubleZero(StringUtils.handleNull(map.get(passRate.getKey())).split("_\\^_")[0]));
                                       item.setLevel(StringUtils.handleNull(map.get(fbLevel.getKey())).split("_\\^_")[0]);
+                                      abList.add(item);
                                 }
                                 dw02.source(abList);
                                 if (dw02.getDatas().size() > 0) {