2-11

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

@@ -24,6 +24,8 @@ public class Material {
     /**名称*/
     @JSONField(name = "key_2",label="材料名称",ordinal = 2)
     private String materialName;
+    @JSONField(name = "key_18",label="计量材料名称",ordinal = 2)
+    private String formMaterialName;
     @JSONField(name = "key_3",label="单位",ordinal = 3)
     private String unit;
     @JSONField(name = "key_4",label="单价",ordinal = 4)

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

@@ -849,7 +849,8 @@ public class ExecutorMeter extends FormulaExecutor {
                 List<MaterialsArrival> list =materials.stream().map(e->{
                             MaterialsArrival ma = new MaterialsArrival();
                             ma.setPeriodNumber(tec.periodInfo.getPeriodNumber());
-                            ma.setName(e.getMaterialName());
+                            ma.setName(e.getFormMaterialName());
+                            /*ma.setName(e.getMaterialName());*/
                             ma.setUnit(e.getUnit());
                             ma.setQuantity(e.getMeterAmount());
                             ma.setPrice(e.getPrice());

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

@@ -130,7 +130,7 @@ public class FormulaDaoImpl implements IFormulaDao {
     @Override
     public Function<Long, List<Material>> getMaterialFormFc() {
         return contractId->{
-            String sql="select a.certificate,a.material_arrive_number,  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 ";
+            String sql="select a.certificate,a.material_arrive_number,a.contract_material_name  formMaterialName,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 ";
             return  getEntityList(sql,Material.class);
         };
     }