Обновить dags/split_subkonto2.py
This commit is contained in:
parent
accde35e15
commit
fe38d95a78
|
|
@ -254,7 +254,7 @@ def read_dict_subkonto2_db(**kwargs):
|
||||||
from public.oborotno_salbdovaya_vedomostb osv
|
from public.oborotno_salbdovaya_vedomostb osv
|
||||||
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 public.dict_subkonto_two dst2)
|
||||||
and (osv.nomer is null or osv.date_begin is null or osv.date_end is null)
|
and (osv.nomer is null or osv.date_begin is null or osv.date_end is null)
|
||||||
""", engine)
|
""", engine)
|
||||||
return df.to_dict(orient='records')
|
return df.to_dict(orient='records')
|
||||||
|
|
@ -265,7 +265,7 @@ def split_subkonto_from_1C(**kwargs):
|
||||||
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 public.dict_subkonto_two dst2)
|
||||||
""", engine)
|
""", engine)
|
||||||
result_df = df['subkonto2'].apply(parse_contract_cell)
|
result_df = df['subkonto2'].apply(parse_contract_cell)
|
||||||
return result_df.to_dict(orient='records')
|
return result_df.to_dict(orient='records')
|
||||||
|
|
@ -304,7 +304,7 @@ def merge_dict_and_split_1C(**kwargs):
|
||||||
engine = get_db_engine()
|
engine = get_db_engine()
|
||||||
with engine.begin() as conn:
|
with engine.begin() as conn:
|
||||||
#conn.exucute('CREATE TEMP TABLE temp_dict_subkonto_two as SELECT * FROM public.dict_subkonto_two where 1=0')
|
#conn.exucute('CREATE TEMP TABLE temp_dict_subkonto_two as SELECT * FROM public.dict_subkonto_two where 1=0')
|
||||||
result_df.to_sql('public.dict_subkonto_two', con=conn, if_exists='append', index=False, method='multi')
|
result_df.to_sql('dict_subkonto_two', con=conn, if_exists='append', index=False, method='multi')
|
||||||
#conn.execute('INSERT INTO public.dict_subkonto_two SELECT * FROM temp_dict_subkonto_two')
|
#conn.execute('INSERT INTO public.dict_subkonto_two SELECT * FROM temp_dict_subkonto_two')
|
||||||
|
|
||||||
return result_df.to_dict('Данные загружены!')
|
return result_df.to_dict('Данные загружены!')
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue