百世「应到/实到」抓取并写入汇总报表

- site_baishi.baishi_download_undelivered_data_impl:进「扫描综合查询→实时扫描率」
  后、下钻未扫前,顺手抓「到/接件扫描→当日」的 应扫(td.nth(10))/已扫(td.nth(11)),
  落库 site_settings(scan_expected_pieces / scan_arrived_pieces);try/except 包裹,
  不影响下载主流程。
- expected_undelivered.process_baishi:应到件/已到件改由 state_store.get_setting 读回
  (空串→None),不再写死 None。
- expected_undelivered.build_summary:百世行有基数时填真实 应到件/已到件/未到率(带热力色),
  无基数仍显示「—」;口径说明文案同步更新。默认不计入合计行/KPI/柱状图(保持 4 站口径)。
This commit is contained in:
Misaka
2026-07-19 21:18:38 +08:00
parent f1cb0a4d7b
commit bbe9e3e619
2 changed files with 53 additions and 6 deletions

View File

@@ -4,7 +4,7 @@
目的:对中通 / 顺心 / 韵达 / 安能 四个站点,比对各自的「应到货物数据」与
「实到货物数据」,找出应到却未到的运单,汇总到 output/应到未到数据.xlsx。
(百世为站点直供未到明细,不参与本模块比对,见 process_baishi。
(百世为站点直供未到明细,不参与 4 站比对;其应到/实到基数取自「扫描综合查询」应扫/已扫,见 process_baishi。
核心口径(四站点统一,重构后):
1. 应到件数 = 应到表「交接件数」之和(按运单号去重 keep-first
@@ -297,10 +297,26 @@ def process_baishi():
df = pd.read_excel(path, dtype=str).fillna("")
rows = df.to_dict("records")
wb_count = df["运单号"].nunique() if "运单号" in df.columns else len(rows)
# 应到/实到基数取自「扫描综合查询」应扫/已扫(到/接件扫描→当日),
# 由 baishi_download_undelivered_data_impl 在同次导航里抓取并落 site_settings。
# 未抓取过则 get_setting 返回 "" → 视为无基数(报表显示「—」)。
import state_store # 与 _read_business_dates 一致:比对模块纯离线,懒加载
def _to_int(v):
v = (v or "").strip().replace(",", "")
try:
return int(float(v)) if v not in ("", "-") else None
except (TypeError, ValueError):
return None
exp_n = _to_int(state_store.get_setting("百世", "scan_expected_pieces"))
arr_n = _to_int(state_store.get_setting("百世", "scan_arrived_pieces"))
stats = {
"运单数": wb_count,
"应到件": None,
"已到件": None,
"应到件": exp_n,
"已到件": arr_n,
"未到件": len(rows),
"涉及运单": wb_count,
"完全未到": None,
@@ -515,7 +531,13 @@ def build_summary(ws, results, generated_at, dates=None):
if s is None:
vals = [f"{name}(无数据)", 0, 0, 0, 0, 0, 0, 0]
elif is_baishi:
vals = [name, s["运单数"], "", "", s["未到件"], "", "", ""]
# 百世:未到明细已知;若已抓取应到/实到基数(扫描综合查询应扫/已扫)则填真实值
if s["应到件"] is not None and s["已到件"] is not None:
srate = (s["未到件"] / s["应到件"]) if s["应到件"] else 0
vals = [name, s["运单数"], s["应到件"], s["已到件"],
s["未到件"], srate, "", ""]
else:
vals = [name, s["运单数"], "", "", s["未到件"], "", "", ""]
else:
srate = (s["未到件"] / s["应到件"]) if s["应到件"] else 0
vals = [
@@ -542,7 +564,7 @@ def build_summary(ws, results, generated_at, dates=None):
cell.fill = PatternFill("solid", fgColor=ZEBRA)
if isinstance(v, (int, float)):
cell.number_format = "0.0%" if i == 5 else "#,##0"
if i == 5 and s is not None and not is_baishi:
if i == 5 and s is not None and isinstance(v, (int, float)) and not isinstance(v, bool):
cell.fill = PatternFill("solid", fgColor=heat(srate))
ws.row_dimensions[r].height = 19
r += 1
@@ -594,7 +616,7 @@ def build_summary(ws, results, generated_at, dates=None):
note_row = chart_anchor + 19
notes = [
"指标口径:未到率 未到件数 ÷ 应到件数;完全未到运单 整单零到货;部分未到运单 部分到货、部分缺件。",
"合计 / 图表仅含 4 站(顺心/中通/韵达/安能,应到−实到口径);百世为站点直供未到、无应到基数,单列不计入合计。",
"合计 / 图表仅含 4 站(顺心/中通/韵达/安能,应到−实到口径);百世应到/实到取自「扫描综合查询」应扫/已扫(到/接件扫描→当日),已填入百世行,但为保持 4 站口径一致、不计入合计与图表",
"本次下载失败的站点标注为(无数据)并计 0不影响其余站点统计。",
"明细见各站点工作表未到明细仅列短少运单并列出该运单实际扫到的单号已到单号1…缺件不再编造子单号。",
"数据日期:各站本次纳入数据对应的业务日期(=应到数据下载日 日期偏移;韵达偏移 1 为前一日);合计为多站混合、不标注。",