Обновить dags/split_subkonto2.py

This commit is contained in:
bn_user 2025-09-08 08:20:38 +00:00
parent 2090c7e025
commit 85775e6ac6
1 changed files with 5 additions and 3 deletions

View File

@ -243,9 +243,10 @@ def parse_contract_cell(cell_text):
}) })
def read_dict_subkonto2_db(**kwargs): def read_dict_subkonto2_db(**kwargs):
engine = get_db_engine()
df = pd.read_sql(""" df = pd.read_sql("""
select select
osv.subkonto2 as subkonto2 osv.subkonto2 as subkonto2
, dst.naimenovanie as naimenovanie , dst.naimenovanie as naimenovanie
, coalesce(dst.nomer , osv.nomer) as nomer , coalesce(dst.nomer , osv.nomer) as nomer
, coalesce(dst.date_begin , osv.date_bedin) as date_bedin , coalesce(dst.date_begin , osv.date_bedin) as date_bedin
@ -254,16 +255,17 @@ def read_dict_subkonto2_db(**kwargs):
left join public.dict_subkonto_two as dst left join public.dict_subkonto_two as dst
on dst.subkonto2 = osv.subkonto2 on dst.subkonto2 = osv.subkonto2
where osv.subkonto2 not in (select dst2.subkonto2 from dict_subkonto_two dst2) where osv.subkonto2 not in (select dst2.subkonto2 from dict_subkonto_two dst2)
""") """, engine)
return df.to_dict(orient='records') return df.to_dict(orient='records')
def split_subkonto_from_1C(**kwargs): def split_subkonto_from_1C(**kwargs):
engine = get_db_engine()
df = pd.read_sql(""" df = pd.read_sql("""
select distinct select distinct
osv.subkonto2 as subkonto2 osv.subkonto2 as subkonto2
from public.oborotno_salbdovaya_vedomostb osv from public.oborotno_salbdovaya_vedomostb osv
where osv.subkonto2 not in (select dst2.subkonto2 from dict_subkonto_two dst2) where osv.subkonto2 not in (select dst2.subkonto2 from dict_subkonto_two dst2)
""") """, engine)
result_df = df['column_name'].apply(parse_contract_cell) result_df = df['column_name'].apply(parse_contract_cell)
return result_df.to_dict(orient='records') return result_df.to_dict(orient='records')