From 3ed4203f96ae7df9903ff35dd5ebc05697970c25 Mon Sep 17 00:00:00 2001 From: MrWaradana Date: Wed, 17 Dec 2025 14:02:51 +0700 Subject: [PATCH] fix query plant and equipment --- src/modules/equipment/insert_actual_data.py | 2 +- src/modules/plant/run2.py | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/modules/equipment/insert_actual_data.py b/src/modules/equipment/insert_actual_data.py index a5655e8..0a06a9e 100644 --- a/src/modules/equipment/insert_actual_data.py +++ b/src/modules/equipment/insert_actual_data.py @@ -129,7 +129,7 @@ where and a.wonum not like 'T%' {f"AND a.wojp8 != 'S1'" if worktype == 'CM' else ""} group by DATE_PART('year', a.reportdate) -having ROUND(SUM(EXTRACT(EPOCH FROM (a.actfinish - a.actstart)) / 3600), 2) <= 730.001; +having ROUND(SUM(EXTRACT(EPOCH FROM (a.actfinish - a.actstart)) / 3600), 2) <= 730; """ # Eksekusi query dan fetch hasil cursor.execute(query) diff --git a/src/modules/plant/run2.py b/src/modules/plant/run2.py index df1a8e4..4af214b 100644 --- a/src/modules/plant/run2.py +++ b/src/modules/plant/run2.py @@ -239,7 +239,8 @@ def main(): chart_capex_component_a = %s, chart_capex_biaya_investasi_tambahan = %s, chart_capex_acquisition_cost = %s, - chart_capex_annualized = %s + chart_capex_annualized = %s, + cost_disposal_cost = %s, WHERE seq = %s \ """ @@ -274,7 +275,7 @@ def main(): tahun_cod = get_param("tahun_cod") daya_terpasang = get_param("daya_terpasang") equity = get_param("equity") - + params = [] revenue_total_array = [] cost_a_acquisition_array = [] @@ -500,6 +501,8 @@ def main(): calc4_free_cash_flow_on_equity_array.append(calc4_free_cash_flow_on_equity) calc4_discounted_fcf_on_equity = hitung_pv(wacc_on_equity, seq, calc4_free_cash_flow_on_equity) + cost_disposal_cost = -npf.pmt(discount_rate, seq, cost_a_acquisition) + row_params = ( net_capacity_factor, eaf, @@ -567,7 +570,8 @@ def main(): chart_capex_biaya_investasi_tambahan, chart_capex_acquisition_cost, chart_capex_annualized, - seq # <-- penting: ini untuk WHERE + cost_disposal_cost, + seq # <-- penting: ini untuk WHERE ) params.append(tuple(normalize_db_value(v) for v in row_params))