refactor: Remove wonum exclusion and add worktype CASE statement to equipment queries.

main
MrWaradana 2 weeks ago
parent e6ceb1a3e6
commit fe4317b1b6

@ -2,7 +2,6 @@ def get_where_query_sql(assetnum, worktype):
where_query = f""" where_query = f"""
where where
(a.asset_unit = '3' OR a.asset_unit='00') (a.asset_unit = '3' OR a.asset_unit='00')
and a.wonum not like 'T%'
and a.status in ('COMP', 'CLOSE') and a.status in ('COMP', 'CLOSE')
AND a.asset_assetnum = '{assetnum}' AND a.asset_assetnum = '{assetnum}'
{f"AND a.worktype = '{worktype}'" if worktype != 'CM' else "AND a.worktype in ('CM', 'PROACTIVE', 'EM')"} {f"AND a.worktype = '{worktype}'" if worktype != 'CM' else "AND a.worktype in ('CM', 'PROACTIVE', 'EM')"}
@ -20,21 +19,26 @@ def get_where_query_sql(assetnum, worktype):
def get_where_query_sql_all_worktype(assetnum): def get_where_query_sql_all_worktype(assetnum):
where_query = f""" where_query = f"""
where WHERE
(a.asset_unit = '3' OR a.asset_unit='00') (a.asset_unit = '3' OR a.asset_unit = '00')
and a.wonum not like 'T%' AND a.status IN ('COMP', 'CLOSE')
and a.status in ('COMP', 'CLOSE')
AND a.asset_assetnum = '{assetnum}' AND a.asset_assetnum = '{assetnum}'
AND ( AND (
(a.worktype = 'CM' AND a.wojp8 != 'S1') (a.worktype = 'CM' AND a.wojp8 != 'S1')
OR (a.worktype <> 'CM') OR (a.worktype <> 'CM')
) )
AND ( AND (
a.description NOT ILIKE '%U4%' a.description NOT ILIKE '%U4%'
OR ( OR (
a.description ILIKE '%U3%' a.description ILIKE '%U3%'
AND a.description ILIKE '%U4%' AND a.description ILIKE '%U4%'
)
) )
AND (
CASE
WHEN '{worktype}' <> 'CM' THEN a.worktype = '{worktype}'
ELSE a.worktype IN ('CM', 'PROACTIVE', 'EM')
END
) )
""" """
return where_query return where_query
Loading…
Cancel
Save