From 723cad3d1f8ee1b1b9753b0cc1f9d7da0a8cc5f0 Mon Sep 17 00:00:00 2001
From: zhizhijie <zhizhijie@users.noreply.gitee.com>
Date: 星期一, 28 九月 2026 17:14:37 +0800
Subject: [PATCH] docs(交接): HANDOFF 补《无表头草稿列》9 处清单（母版已清空、手工仍保留），与已确认差异清单同步
---
docs/工具/汇总大表差异比对.py | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git "a/docs/\345\267\245\345\205\267/\346\261\207\346\200\273\345\244\247\350\241\250\345\267\256\345\274\202\346\257\224\345\257\271.py" "b/docs/\345\267\245\345\205\267/\346\261\207\346\200\273\345\244\247\350\241\250\345\267\256\345\274\202\346\257\224\345\257\271.py"
index 7737ec5..56228de 100644
--- "a/docs/\345\267\245\345\205\267/\346\261\207\346\200\273\345\244\247\350\241\250\345\267\256\345\274\202\346\257\224\345\257\271.py"
+++ "b/docs/\345\267\245\345\205\267/\346\261\207\346\200\273\345\244\247\350\241\250\345\267\256\345\274\202\346\257\224\345\257\271.py"
@@ -109,7 +109,7 @@
"""
def main(gen, dgf, prefix):
- ACTION = ("瀹炶川鏁板�煎樊寮�", "閿欒鍊�(绋嬪簭)", "閿欒鍊�(鎵嬪伐)", "鏂囨湰涓嶅悓")
+ ACTION = ("瀹炶川鏁板�煎樊寮�", "閿欒鍊�(绋嬪簭)", "閿欒鍊�(鎵嬪伐)", "闇�澶勭悊(闈炴暟鍊兼枃鏈�)", "鏂囨湰涓嶅悓")
IGNORE = ("宸插拷鐣�(鍗曡竟鏈夊��)", "宸插拷鐣�(缁撴瀯/璁捐)", "鍙栨暣灏惧樊(鍙拷鐣�)", "鏂囨湰鍨嬫暟瀛�(鍙拷鐣�)",
"宸茬煡璁捐(姣嶇増鏂板琛�)", "宸茬煡璁捐(鏃犺〃澶磋崏绋垮垪)", "宸茬煡璁捐(鎺掑悕琛ㄥ綋鏈�/绱鍧�)", "鍏跺畠")
cats = list(ACTION) + list(IGNORE)
@@ -193,17 +193,20 @@
cat = "閿欒鍊�(绋嬪簭)"; note = vg
elif isinstance(vd, str) and vd.startswith("#"):
cat = "閿欒鍊�(鎵嬪伐)"; note = vd
+ elif (num(vg) and isinstance(vd, str)) or (num(vd) and isinstance(vg, str)):
+ cat = "闇�澶勭悊(闈炴暟鍊兼枃鏈�)"; note = "绋嬪簭=%s 鎵嬪伐=%s" % (str(vg)[:14], str(vd)[:14])
else:
cat = "鍏跺畠"; note = "绋嬪簭=%s 鎵嬪伐=%s" % (str(vg)[:14], str(vd)[:14])
if cat:
bump(cat)
rows_out.append([sh, "%s%d" % (get_column_letter(i+1), p+1), rl_g[p][:38], cl_g[i][:18], cat,
- ("" if vg is None else str(vg)[:20]), ("" if vd is None else str(vd)[:20]), note])
+ ("" if vg is None else str(vg)[:20]), ("" if vd is None else str(vd)[:20]), note,
+ "%s%d" % (get_column_letter(j+1), q+1)])
per_sheet.append((sh, cnt))
# 杈撳嚭 CSV
csv = prefix + ".csv"
with io.open(csv, "w", encoding="utf-8-sig", newline="") as f:
- f.write("椤电,鐢熸垚浠跺崟鍏冩牸,琛屾爣绛�,鍒楄〃澶�,绫诲埆,鐢熸垚浠跺��,鎵嬪伐鍊�,澶囨敞\n")
+ f.write("椤电,鐢熸垚浠跺崟鍏冩牸,琛屾爣绛�,鍒楄〃澶�,绫诲埆,鐢熸垚浠跺��,鎵嬪伐鍊�,澶囨敞,鎵嬪伐鍗曞厓鏍糪n")
for x in rows_out:
if x[4] not in ACTION: continue
f.write(",".join('"%s"' % str(v).replace('"', "'") for v in x) + "\n")
--
Gitblit v1.9.1