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

1.提单不存在小包 同步时的报错处理

上级 9ea59f34
...@@ -454,6 +454,7 @@ class Order_dispose(object): ...@@ -454,6 +454,7 @@ class Order_dispose(object):
delete_big_sql = 'delete from cc_big_package where id in %s' % ids delete_big_sql = 'delete from cc_big_package where id in %s' % ids
pd.read_sql(delete_big_sql, con=db_handle, chunksize=100) pd.read_sql(delete_big_sql, con=db_handle, chunksize=100)
logging.info(f'同步提单:{select_bl_no},删除大包{len(origin_big_ids)}个,删除小包{len(origin_ship_ids)}个,删除小包商品{len(origin_goods_ids)}个,删除小包同步日志{len(origin_log_ids)}条') logging.info(f'同步提单:{select_bl_no},删除大包{len(origin_big_ids)}个,删除小包{len(origin_ship_ids)}个,删除小包商品{len(origin_goods_ids)}个,删除小包同步日志{len(origin_log_ids)}条')
logging.info(f'提单{select_bl_no}同步完成')
# 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:
...@@ -502,10 +503,12 @@ class Order_dispose(object): ...@@ -502,10 +503,12 @@ class Order_dispose(object):
val_df = pd.DataFrame(big_package_arr) val_df = pd.DataFrame(big_package_arr)
val_df.to_sql('cc_history_big_package', con=db_handle, if_exists='append', index=False) val_df.to_sql('cc_history_big_package', con=db_handle, if_exists='append', index=False)
# #
result_dict = {}
if origin_big_ids:
big_ids_str = '(%s)' % str(origin_big_ids)[1:-1] big_ids_str = '(%s)' % str(origin_big_ids)[1:-1]
sql = 'select id,origin_id from cc_history_big_package where origin_id in %s' % big_ids_str sql = 'select id,origin_id from cc_history_big_package where origin_id in %s' % big_ids_str
new_order_arr = pd.read_sql(sql, con=db_handle) new_order_arr = pd.read_sql(sql, con=db_handle)
result_dict = {}
for new_order_data in new_order_arr.itertuples(): for new_order_data in new_order_arr.itertuples():
result_dict[new_order_data.origin_id] = new_order_data.id result_dict[new_order_data.origin_id] = new_order_data.id
# logging.info("new_order:%s" % len(new_order)) # logging.info("new_order:%s" % len(new_order))
...@@ -611,11 +614,12 @@ class Order_dispose(object): ...@@ -611,11 +614,12 @@ class Order_dispose(object):
if history_ship_package_vals_arr: if history_ship_package_vals_arr:
val_df = pd.DataFrame(history_ship_package_vals_arr) val_df = pd.DataFrame(history_ship_package_vals_arr)
val_df.to_sql('cc_history_ship_package', con=db_handle, if_exists='append', index=False) val_df.to_sql('cc_history_ship_package', con=db_handle, if_exists='append', index=False)
result_dict = {}
if origin_ship_ids:
ship_ids_str = '(%s)' % str(origin_ship_ids)[1:-1] ship_ids_str = '(%s)' % str(origin_ship_ids)[1:-1]
sql = 'select id,origin_id from cc_history_ship_package where origin_id in %s' % ship_ids_str sql = 'select id,origin_id from cc_history_ship_package where origin_id in %s' % ship_ids_str
new_order_arr = pd.read_sql(sql, con=db_handle) new_order_arr = pd.read_sql(sql, con=db_handle)
result_dict = {}
for new_order_data in new_order_arr.itertuples(): for new_order_data in new_order_arr.itertuples():
result_dict[new_order_data.origin_id] = new_order_data.id result_dict[new_order_data.origin_id] = new_order_data.id
...@@ -656,6 +660,8 @@ class Order_dispose(object): ...@@ -656,6 +660,8 @@ class Order_dispose(object):
:param package_dict: 原来小包数据 :param package_dict: 原来小包数据
:return: :return:
""" """
origin_log_ids = []
if origin_ship_ids:
ids = '(%s)' % str(origin_ship_ids)[1:-1] ids = '(%s)' % str(origin_ship_ids)[1:-1]
sync_sql = "SELECT id, package_id, sync_time, api_customer, process_code, operate_time, operate_remark, operate_user FROM cc_ship_package_sync_log WHERE package_id in %s;" % ids sync_sql = "SELECT id, package_id, sync_time, api_customer, process_code, operate_time, operate_remark, operate_user FROM cc_ship_package_sync_log WHERE package_id in %s;" % ids
sync_log_result_arr = pd.read_sql(sync_sql, con=db_handle) sync_log_result_arr = pd.read_sql(sync_sql, con=db_handle)
...@@ -689,6 +695,8 @@ class Order_dispose(object): ...@@ -689,6 +695,8 @@ class Order_dispose(object):
:return: :return:
""" """
# 商品 # 商品
origin_goods_ids = []
if origin_ship_ids:
ids = '(%s)' % str(origin_ship_ids)[1:-1] ids = '(%s)' % str(origin_ship_ids)[1:-1]
package_good_sql = """select id, bl_line_id, big_package_id, bl_id, item_id, sku_id, package_good_sql = """select id, bl_line_id, big_package_id, bl_id, item_id, sku_id,
item_name_cn, item_name_en, export_hs_code, import_hs_code, weight, item_name_cn, item_name_en, export_hs_code, import_hs_code, weight,
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论