提交 2e88eb70 authored 作者: 刘擎阳's avatar 刘擎阳

1.历史菜单下的数据不进行30天过滤

2.增加删除tk推送日志 3.历史小包关联历史大包优化
上级 cccdbf96
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
<field name="res_model">cc.history.big.package</field> <field name="res_model">cc.history.big.package</field>
<field name="view_mode">tree,form,pivot,graph</field> <field name="view_mode">tree,form,pivot,graph</field>
<field name="domain">[]</field> <field name="domain">[]</field>
<field name="context">{'search_default_last_30d':1}</field> <field name="context">{'search_default_last_30d':0}</field>
<field name="help" type="html"> <field name="help" type="html">
<p class="o_view_nocontent_smiling_face"> <p class="o_view_nocontent_smiling_face">
[History Big Package] Not yet! Click the Create button in the top left corner and the sofa is yours! [History Big Package] Not yet! Click the Create button in the top left corner and the sofa is yours!
......
...@@ -324,7 +324,7 @@ ...@@ -324,7 +324,7 @@
<field name="res_model">cc.history.ship.package</field> <field name="res_model">cc.history.ship.package</field>
<field name="view_mode">tree,form,search,pivot,graph</field> <field name="view_mode">tree,form,search,pivot,graph</field>
<field name="domain">[]</field> <field name="domain">[]</field>
<field name="context">{'search_default_last_30d':1}</field> <field name="context">{'search_default_last_30d':0}</field>
<field name="help" type="html"> <field name="help" type="html">
<p class="o_view_nocontent_smiling_face"> <p class="o_view_nocontent_smiling_face">
[History Ship Package] Not yet! Click the Create button in the top left corner and the sofa is yours! [History Ship Package] Not yet! Click the Create button in the top left corner and the sofa is yours!
......
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
<field name="res_model">history.tt.api.log</field> <field name="res_model">history.tt.api.log</field>
<field name="view_mode">tree,form,search</field> <field name="view_mode">tree,form,search</field>
<field name="domain">[]</field> <field name="domain">[]</field>
<field name="context">{'search_default_last_30d':1}</field> <field name="context">{'search_default_last_30d':0}</field>
</record> </record>
......
...@@ -458,6 +458,9 @@ class Order_dispose(object): ...@@ -458,6 +458,9 @@ class Order_dispose(object):
# tk日志 # tk日志
origin_tk_log_ids = self.history_ao_tt_log(db_handle, past_date, limit_log_num) origin_tk_log_ids = self.history_ao_tt_log(db_handle, past_date, limit_log_num)
if origin_delete and origin_tk_log_ids: if origin_delete and origin_tk_log_ids:
log_ids = '(%s)' % str(origin_tk_log_ids)[1:-1]
delete_api_log_sql = 'delete from ao_tt_api_log where id in %s' % log_ids
pd.read_sql(delete_api_log_sql, con=db_handle, chunksize=100)
logging.info(f'同步日志完成,删除tk日志:{len(origin_tk_log_ids)}个') logging.info(f'同步日志完成,删除tk日志:{len(origin_tk_log_ids)}个')
logging.info('同步完成') logging.info('同步完成')
except Exception as ex: except Exception as ex:
...@@ -544,7 +547,7 @@ class Order_dispose(object): ...@@ -544,7 +547,7 @@ class Order_dispose(object):
'customer_id': ship_package_data.customer_id, 'customer_id': ship_package_data.customer_id,
'origin_id': ship_package_data.id, 'origin_id': ship_package_data.id,
'bl_id': ship_package_data.bl_id, 'bl_id': ship_package_data.bl_id,
'big_package_id': big_dict.get(ship_package_data.id), 'big_package_id': big_dict.get(ship_package_data.big_package_id),
'logistic_order_no': ship_package_data.logistic_order_no, 'logistic_order_no': ship_package_data.logistic_order_no,
'tracking_no': ship_package_data.tracking_no, 'tracking_no': ship_package_data.tracking_no,
'customer_ref': ship_package_data.customer_ref, 'customer_ref': ship_package_data.customer_ref,
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论