统一各站成败反馈信号;修复中通报错卡死与提示框误判
成败信号统一化(顺心/中通/韵达/安能/百世): - 各站 impl 开头清理上次的最终文件,避免无数据/失败时残留旧数据误导比对 - 轮询下载段加汇总校验:下载数 < 预期则 raise,堵住"零/部分下载被判成功" - 正常完成统一显式 return True(原中通/韵达/安能靠 None 隐式成功) - 无数据统一不落文件(安能实到不再落空 xlsx);韵达裸 except 改 except Exception - 中通"票数0无空提示"分支改判失败 中通 bug 修复(site_zto.py): - poll 加 stall 快速失败(连续4轮无进展即 raise)+ 刷新短超时 + 双失败 raise, 避免页面被遮挡时干等 5 分钟才触发重试 - "生成离线导出任务成功"提示所在 iframe 提交后被销毁,wait_for 抛 "Frame was detached" 属正常(提示已随 iframe 消失=任务已建立),改判成功 Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
@@ -48,6 +48,15 @@ def yunda_reset(page):
|
||||
page.wait_for_timeout(1500)
|
||||
|
||||
|
||||
def _remove_if_exists(path):
|
||||
"""删除文件(若存在):流程开头清理上次的最终文件,避免无数据/失败时残留旧数据。"""
|
||||
try:
|
||||
if os.path.exists(path):
|
||||
os.remove(path)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
def yunda_login(page):
|
||||
"""韵达自动登录:未登录则填充表单并提交,已登录则跳过。"""
|
||||
print(">> 正在检查韵达登录状态...")
|
||||
@@ -136,6 +145,9 @@ def yunda_expected_download_impl(page):
|
||||
if not os.path.exists(download_dir):
|
||||
os.makedirs(download_dir)
|
||||
|
||||
# 清理上次的最终文件,避免本次无数据/失败时残留旧数据误导比对
|
||||
_remove_if_exists(os.path.join(download_dir, "韵达-应到货物数据.xlsx"))
|
||||
|
||||
export_times = []
|
||||
|
||||
try:
|
||||
@@ -361,6 +373,7 @@ def yunda_expected_download_impl(page):
|
||||
download_dir,
|
||||
"韵达-应到货物数据.xlsx",
|
||||
)
|
||||
return True
|
||||
|
||||
except Exception as e:
|
||||
print(f"\n❌ 任务执行过程中发生异常: {e}")
|
||||
@@ -386,6 +399,9 @@ def yunda_actual_download_impl(page):
|
||||
if not os.path.exists(download_dir):
|
||||
os.makedirs(download_dir)
|
||||
|
||||
# 清理上次的最终文件,避免本次无数据/失败时残留旧数据误导比对
|
||||
_remove_if_exists(os.path.join(download_dir, "韵达-实到货物数据.xlsx"))
|
||||
|
||||
export_times = []
|
||||
|
||||
try:
|
||||
@@ -582,6 +598,7 @@ def yunda_actual_download_impl(page):
|
||||
download_dir,
|
||||
"韵达-实到货物数据.xlsx",
|
||||
)
|
||||
return True
|
||||
|
||||
except Exception as e:
|
||||
print(f"\n❌ 任务执行过程中发生异常: {e}")
|
||||
@@ -686,13 +703,19 @@ def _yunda_poll_and_download_tasks(page, export_times, download_dir, final_filen
|
||||
except Exception as e:
|
||||
print(f" ❌ 下载失败: {e}")
|
||||
|
||||
# 汇总校验:下载成功数必须等于本批提交的任务数,否则判失败
|
||||
if len(downloaded_files) < total_expected:
|
||||
raise RuntimeError(
|
||||
f"仅成功下载 {len(downloaded_files)}/{total_expected} 个任务,数据不完整"
|
||||
)
|
||||
|
||||
print(">> 【导出服务】下载完成,正在关闭标签页...")
|
||||
try:
|
||||
page.locator(".tags-view-item", has_text="导出服务").locator(
|
||||
".el-icon-close"
|
||||
).click()
|
||||
print(" ✅ 【导出服务】标签页已关闭。")
|
||||
except:
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
if downloaded_files:
|
||||
@@ -703,7 +726,7 @@ def _yunda_poll_and_download_tasks(page, export_times, download_dir, final_filen
|
||||
df = pd.read_excel(file_path, dtype=str)
|
||||
if not df.empty:
|
||||
all_dfs.append(df)
|
||||
except:
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
if all_dfs:
|
||||
|
||||
Reference in New Issue
Block a user