|
@@ -7,7 +7,7 @@
|
|
select ifa.project_id,ifa.contract_id,ifa.middle_meter_id,ifa.contract_form_id,ifa.current_meter_total as meterTotal,
|
|
select ifa.project_id,ifa.contract_id,ifa.middle_meter_id,ifa.contract_form_id,ifa.current_meter_total as meterTotal,
|
|
cif.form_number,cif.form_name,cif.unit,
|
|
cif.form_number,cif.form_name,cif.unit,
|
|
(select meter_number from s_middle_meter_apply mma where mma.id = ifa.middle_meter_id) as meterNumber,
|
|
(select meter_number from s_middle_meter_apply mma where mma.id = ifa.middle_meter_id) as meterNumber,
|
|
- (select adjust_factor from s_inventory_form_material ifm where ifm.contract_material_id = #{dto.contractMaterialId}
|
|
|
|
|
|
+ (select adjust_factor from s_inventory_form_material ifm where ifm.is_deleted = 0 and ifm.contract_material_id = #{dto.contractMaterialId}
|
|
and ifm.contract_form_id = ifa.contract_form_id) as adjustFactor
|
|
and ifm.contract_form_id = ifa.contract_form_id) as adjustFactor
|
|
from s_inventory_form_apply ifa left join s_contract_inventory_form cif on ifa.contract_form_id = cif.id
|
|
from s_inventory_form_apply ifa left join s_contract_inventory_form cif on ifa.contract_form_id = cif.id
|
|
where ifa.is_deleted = 0 and cif.is_deleted = 0 and ifa.contract_id = #{dto.contractId}
|
|
where ifa.is_deleted = 0 and cif.is_deleted = 0 and ifa.contract_id = #{dto.contractId}
|