材料预付款

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

@@ -27,6 +27,8 @@ public class Material {
     private String unit;
     @JSONField(name = "key_4",label="单价",ordinal = 4)
     private String price;
+    @JSONField(name = "key_15",label="基期单价",ordinal = 4)
+    private String priceBase;
     @JSONField(name = "key_5",label="数量",ordinal = 5)
     private String meterAmount;
     @JSONField(name = "key_6",label="材料合计价格",ordinal = 6)

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

@@ -318,10 +318,10 @@ public class ExecutorMeter extends FormulaExecutor {
                     mpd.setName(e.getMaterialName());
                     mpd.setUnit(e.getUnit());
                     mpd.setQuantity(e.getMeterAmount());
-                    mpd.setPriceBase(e.getPrice());
+                    mpd.setPriceBase(e.getPriceBase());
                     mpd.setAmountBase(e.getSum());
                     mpd.setPrice(e.getPrice());
-                    mpd.setAmountBase(e.getSum());
+                    mpd.setAmountBase(multiFc.apply(e.getPriceBase(),e.getMeterAmount()));
                     return mpd;
                  }
                 ).collect(Collectors.toList()));

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

@@ -96,7 +96,7 @@ public class FormulaDaoImpl implements IFormulaDao {
     @Override
     public Function<Long, List<Material>> getMaterialFormFc() {
         return contractId->{
-            String sql="select  b.material_name materialName,b.unit,a.price,a.meter_amount meterAmount,meter_money sum,a.material_source source,material_conform  materialConform,a.storage_place storagePlace,a.storage_status storageStatus,a.storage_conform storageConform,a.remark,c.sort,c.id period_id from s_material_meter_form a left join s_contract_material b on a.contract_material_id = b.id join s_meter_period c  on a.meter_period_id=c.id where a.contract_id="+contractId+"  and a.is_deleted=0 and  a.approve_status=2";
+            String sql="select  b.material_name materialName,b.unit,a.price,b.price price_base,a.meter_amount meterAmount,meter_money sum,a.material_source source,material_conform  materialConform,a.storage_place storagePlace,a.storage_status storageStatus,a.storage_conform storageConform,a.remark,c.sort,c.id period_id from s_material_meter_form a left join s_contract_material b on a.contract_material_id = b.id join s_meter_period c  on a.meter_period_id=c.id where a.contract_id="+contractId+"  and a.is_deleted=0 and  a.approve_status=2";
             return  getEntityList(sql,Material.class);
         };
     }