Обновить dags/split_subkonto2.py
This commit is contained in:
parent
421badf8c9
commit
ca35090f7d
|
|
@ -255,7 +255,7 @@ def read_dict_subkonto2_db(**kwargs):
|
|||
left join public.dict_subkonto_two as dst
|
||||
on dst.subkonto2 = osv.subkonto2
|
||||
where osv.subkonto2 not in (select dst2.subkonto2 from dict_subkonto_two dst2)
|
||||
and osv.nomer is null
|
||||
and (osv.nomer is null or osv.date_begin is null or osv.date_end is null)
|
||||
""", engine)
|
||||
return df.to_dict(orient='records')
|
||||
|
||||
|
|
@ -280,7 +280,6 @@ def merge_dict_and_split_1C(**kwargs):
|
|||
df_split_subkonto = pd.DataFrame.from_records(split_subkonto) if split_subkonto else pd.DataFrame()
|
||||
|
||||
result_df = df_split_subkonto.merge(df_dict_subkonto, how='left', on='subkonto2', suffixes=('_split', '_dict'))
|
||||
return result_df[result_df['subkonto2']=='договор займа №02/11/17'].to_dict(orient='records')
|
||||
result_df['naimenovanie'] = result_df['naimenovanie_split']
|
||||
|
||||
result_df['nomer'] = np.where(
|
||||
|
|
|
|||
Loading…
Reference in New Issue