diff --git a/docx_merge_win32com.log b/docx_merge_win32com.log index 45ce150..b163ea9 100644 --- a/docx_merge_win32com.log +++ b/docx_merge_win32com.log @@ -14,3 +14,51 @@ Traceback (most recent call last): File ">", line 5, in Open pywintypes.com_error: (-2147352567, '发生意外。', (0, 'Kingsoft WPS', '文档打开失败。', '', 3010, -786427), None) 2025-07-02 16:01:03,620 - INFO - 已清理资源 +2025-07-02 16:26:09,587 - INFO - 开始合并文档: C:\Users\VogelimKafig\Desktop\金风模板\empty.docx 和 C:\Users\VogelimKafig\Desktop\金风模板\jingfeng_1.docx +2025-07-02 16:26:09,620 - ERROR - 文档合并失败: (-2147352567, '发生意外。', (0, 'Kingsoft WPS', '文档打开失败。', '', 3010, -786427), None) +Traceback (most recent call last): + File "c:\Users\VogelimKafig\Desktop\金风模板\tools\win32_total_copy.py", line 43, in merge_documents + doc1 = self.word_app.Documents.Open(str(doc1_path)) + File ">", line 5, in Open +pywintypes.com_error: (-2147352567, '发生意外。', (0, 'Kingsoft WPS', '文档打开失败。', '', 3010, -786427), None) +2025-07-02 16:26:09,657 - INFO - 已清理资源 +2025-07-02 16:26:31,385 - INFO - 开始合并文档: C:\Users\VogelimKafig\Desktop\金风模板\empty.docx 和 C:\Users\VogelimKafig\Desktop\金风模板\jingfeng_1.docx +2025-07-02 16:26:31,418 - ERROR - 文档合并失败: (-2147352567, '发生意外。', (0, 'Kingsoft WPS', '文档打开失败。', '', 3010, -786427), None) +Traceback (most recent call last): + File "c:\Users\VogelimKafig\Desktop\金风模板\tools\win32_total_copy.py", line 43, in merge_documents + doc1 = self.word_app.Documents.Open(str(doc1_path)) + File ">", line 5, in Open +pywintypes.com_error: (-2147352567, '发生意外。', (0, 'Kingsoft WPS', '文档打开失败。', '', 3010, -786427), None) +2025-07-02 16:26:31,453 - INFO - 已清理资源 +2025-07-02 16:29:09,985 - INFO - 开始合并文档: C:\Users\VogelimKafig\Desktop\金风模板\source\muban\empty.docx 和 C:\Users\VogelimKafig\Desktop\金风模板\source\muban\jingfeng_1.docx +2025-07-02 16:29:10,139 - INFO - 已打开第一个文档: C:\Users\VogelimKafig\Desktop\金风模板\source\muban\empty.docx +2025-07-02 16:29:10,229 - INFO - 已打开第二个文档: C:\Users\VogelimKafig\Desktop\金风模板\source\muban\jingfeng_1.docx +2025-07-02 16:29:10,297 - INFO - 已插入第二个文档内容 +2025-07-02 16:29:10,391 - INFO - 已合并页眉页脚 +2025-07-02 16:29:10,422 - INFO - 已修复所有页眉边框线 +2025-07-02 16:29:10,479 - INFO - 已保存合并文档: C:\Users\VogelimKafig\Desktop\金风模板\output\H3-08#_2021年12月10日.docx +2025-07-02 16:29:10,584 - INFO - 已清理资源 +2025-07-03 10:08:06,210 - INFO - 开始合并文档: C:\Users\VogelimKafig\Desktop\金风模板\source\muban\empty.docx 和 C:\Users\VogelimKafig\Desktop\金风模板\source\muban\jingfeng_1.docx +2025-07-03 10:08:06,505 - INFO - 已打开第一个文档: C:\Users\VogelimKafig\Desktop\金风模板\source\muban\empty.docx +2025-07-03 10:08:06,644 - INFO - 已打开第二个文档: C:\Users\VogelimKafig\Desktop\金风模板\source\muban\jingfeng_1.docx +2025-07-03 10:08:06,799 - INFO - 已插入第二个文档内容 +2025-07-03 10:08:06,878 - INFO - 已合并页眉页脚 +2025-07-03 10:08:06,908 - INFO - 已修复所有页眉边框线 +2025-07-03 10:08:06,980 - INFO - 已保存合并文档: C:\Users\VogelimKafig\Desktop\金风模板\output\H3-08#_2021年12月10日_1.docx +2025-07-03 10:08:07,183 - INFO - 已清理资源 +2025-07-03 10:10:10,389 - INFO - 开始合并文档: C:\Users\VogelimKafig\Desktop\金风模板\source\muban\empty.docx 和 C:\Users\VogelimKafig\Desktop\金风模板\source\muban\jingfeng_1.docx +2025-07-03 10:10:10,530 - INFO - 已打开第一个文档: C:\Users\VogelimKafig\Desktop\金风模板\source\muban\empty.docx +2025-07-03 10:10:10,599 - INFO - 已打开第二个文档: C:\Users\VogelimKafig\Desktop\金风模板\source\muban\jingfeng_1.docx +2025-07-03 10:10:10,655 - INFO - 已插入第二个文档内容 +2025-07-03 10:10:10,734 - INFO - 已合并页眉页脚 +2025-07-03 10:10:10,761 - INFO - 已修复所有页眉边框线 +2025-07-03 10:10:10,817 - INFO - 已保存合并文档: C:\Users\VogelimKafig\Desktop\金风模板\output\H3-08#_2021年12月10日_2.docx +2025-07-03 10:10:10,916 - INFO - 已清理资源 +2025-07-03 10:11:17,472 - INFO - 开始合并文档: C:\Users\VogelimKafig\Desktop\金风模板\source\muban\empty.docx 和 C:\Users\VogelimKafig\Desktop\金风模板\source\muban\jingfeng_1.docx +2025-07-03 10:11:17,610 - INFO - 已打开第一个文档: C:\Users\VogelimKafig\Desktop\金风模板\source\muban\empty.docx +2025-07-03 10:11:17,677 - INFO - 已打开第二个文档: C:\Users\VogelimKafig\Desktop\金风模板\source\muban\jingfeng_1.docx +2025-07-03 10:11:17,729 - INFO - 已插入第二个文档内容 +2025-07-03 10:11:17,819 - INFO - 已合并页眉页脚 +2025-07-03 10:11:17,843 - INFO - 已修复所有页眉边框线 +2025-07-03 10:11:17,898 - INFO - 已保存合并文档: C:\Users\VogelimKafig\Desktop\金风模板\output\H3-08#_2021年12月10日_3.docx +2025-07-03 10:11:17,996 - INFO - 已清理资源 diff --git a/generate_jingfeng.py b/generate_jingfeng.py index f6c8f00..2b0da2a 100644 --- a/generate_jingfeng.py +++ b/generate_jingfeng.py @@ -3,34 +3,9 @@ import os, logging from docx import Document from tools.json_process import merge_info from tools.docx_tools import search_and_replace +from source.defines import * def main(base_info, baogao_info): - DEFAULT_BASE_INFO = { #椤圭洰鍩烘湰淇℃伅 - #鐩綍 - 'picture_dir': "", #鍥剧墖瀛樻斁鍦板潃 - 'shengcheng_dir': os.getcwd(), #宸ヤ綔璺緞(鎶ュ憡鐢熸垚鐨勮矾寰勩佹姤鍛婃ā鏉垮瓨鏀剧殑璺緞) - 'muban_dir': os.getcwd(), #鏂囨。妯℃澘瀛樻斁璺緞 - #椤圭洰姒傚喌 - 'jituan_jianxie': '鐢叉柟闆嗗洟', - 'jia_company_name': '鐢叉柟鍏徃鍚', - 'kehu_company_name': '瀹㈡埛鍚嶇О', - 'kehu_fuzeren': '瀹㈡埛璐熻矗浜', - 'kehu_phone': '18xxxxxxxxxx', - 'shigong_company_name': '鏂藉伐鍗曚綅', - 'jizu_num': '椤圭洰瑙勬牸锛堝彴锛', - 'zhengji_changjia': '鏁存満鍘傚', - 'yepian_changjia': '鍙剁墖鍘傚', #鍙剁墖鍘傚淇℃伅 - 'fengchang_name': '椋庡満鍚嶇О', - 'fengchang_location': '椋庡満浣嶇疆', - 'shigong_date': '鏂藉伐鏃ユ湡(寮濮媬缁撴潫)', - 'jizu_type': '鏈虹粍鍨嬪彿', - 'yepian_type': '鍙剁墖鍨嬪彿', - 'jiancha_fangshi': '浣滀笟鏃犱汉鏈鸿繎璺濈澶栬妫鏌', - #涔欐柟淇℃伅 - 'yi_Company': '涔欐柟鍏徃鍚', - 'fuzeren': '鐢叉柟璐熻矗浜', - 'phone_fuzeren': '188xxxxxxxx', - } try: base_info = merge_info(base_info, DEFAULT_BASE_INFO) logger = logging.getLogger(base_info['shengcheng_dir'] + __name__) @@ -60,44 +35,6 @@ def main(base_info, baogao_info): logger.error(f"鑾峰彇椤圭洰鍩烘湰淇℃伅澶辫触锛歿e}") return - - DEFAULT_BAOGAO_INFO = { - #褰撳墠妫鏌ユ姤鍛婂熀鏈唴瀹 - 'jizu_bianhao': 'H3-08#', #妫鏌ョ殑鏈虹粍缂栧彿 - 'baogao_date': '2021骞12鏈10鏃', - #妫鏌ユ柟妗 - 'jiancha_renyuan': '寮犱笁,鏉庡洓,鐜嬩簲', #妫鏌ヤ汉鍛 - #妫鏌ヤ俊鎭 - 'waibu_jiancha': 'True', #鏄惁鍖呭惈澶栭儴妫鏌 - 'neibu_jiancha': 'True', #鏄惁鍖呭惈鍐呴儴妫鏌 - 'fanglei_jiancha': 'True', #鏄惁鍖呭惈闃查浄妫鏌 #娉細闃查浄妫娴嬪崰涓嶅瓨鏀剧己闄峰浘 - 'jiancha_location': '鍙剁墖澶栭儴澶栬', #妫鏌ュ唴瀹规枃瀛 - 'jiancha_fangshi': '浣滀笟鏃犱汉鏈鸿繎璺濈澶栬妫鏌', #妫鏌ユ柟寮忔枃瀛 - #鎶ュ憡澶勭悊淇℃伅 - 'yezhu_renyuan': '鏉庡洓', #涓氫富(浜哄憳) - 'changjia_renyuan': '鐜嬩簲', #鍘傚(浜哄憳) - 'date_process': '鐢熸垚鎶ュ憡浜哄憳', #鏁版嵁澶勭悊浜哄憳 鍚存诲笇鏈涜幏鍙栧墠绔敤鎴锋墽琛岀敓鎴愪汉鍛樹负杩欎釜浜 - 'baogao_bianzhi': '鐢熸垚鎶ュ憡浜哄憳', #鎶ュ憡缂栧埗浜哄憳 鍚存诲笇鏈涜幏鍙栧墠绔敤鎴锋墽琛岀敓鎴愪汉鍛樹负杩欎釜浜 - 'baogao_shenghe': '寰呭～鍐(浜哄憳)', #鎶ュ憡瀹℃牳浜哄憳 - 'shenghe_date': '寰呭～鍐(鏃ユ湡)', #鎶ュ憡瀹℃牳鏃ユ湡 - #妫鏌ユ儏鍐垫眹鎬昏〃锛堟枃瀛椾俊鎭級 鍓嶇鏍规嵁鏄惁鍖呭惈瀵瑰簲閮ㄥ垎妫鏌ヨ嚜琛岀‘瀹氭鏌ュ唴瀹癸紝杩欓噷榛樿鍏ㄩ儴鍖呭惈 - 'Y1_jiancha_neirong': '''1.鍙剁墖鍓嶇紭銆佸悗缂樸丳S闈€丼S闈 -2.鍙剁墖鍐呴儴瀵奸浄鍗°佽吂鏉裤侀忓厜銆佷汉瀛旂洊鐗堛佸彾鏍圭洊鏉... -3.杞瘋鑷冲鍩哄閫氥佸唴閮ㄥ绾跨嚎闃汇佸閮ㄥ绾跨嚎闃...''', - 'Y2_jiancha_neirong': '''1.鍙剁墖鍓嶇紭銆佸悗缂樸丳S闈€丼S闈 -2.鍙剁墖鍐呴儴瀵奸浄鍗°佽吂鏉裤侀忓厜銆佷汉瀛旂洊鐗堛佸彾鏍圭洊鏉... -3.杞瘋鑷冲鍩哄閫氥佸唴閮ㄥ绾跨嚎闃汇佸閮ㄥ绾跨嚎闃...''', - 'Y3_jiancha_neirong': '''1.鍙剁墖鍓嶇紭銆佸悗缂樸丳S闈€丼S闈 -2.鍙剁墖鍐呴儴瀵奸浄鍗°佽吂鏉裤侀忓厜銆佷汉瀛旂洊鐗堛佸彾鏍圭洊鏉... -3.杞瘋鑷冲鍩哄閫氥佸唴閮ㄥ绾跨嚎闃汇佸閮ㄥ绾跨嚎闃...''', - #鎶ュ憡鎬荤粨 - 'baogao_zongjie': '''1銆佸洜娴蜂笂椋庣數鍙剁墖杩愯鐜鎭跺姡銆佺┖姘旂洂纰卞害楂橈紝鍙剁墖鍓嶇紭鍚堟ā缂濆尯鍩熷強PS闈紙杩庨闈級娑傚眰鏄撳彈鑵愯殌锛屽缓璁畾鏈熻瀵熺淮鎶ゃ -2銆佺粡鏃犱汉鏈鸿繎璺濈澶栬妫鏌ュ彂鐜癏3-08#鏈轰綅Y200220AF鍙剁墖PS闈㈣窛鍙舵牴20m澶勫彂鐜颁竴澶勮绾癸紝鎹熶激闀垮害杞村悜3m锛岃缂洪櫡缁忔垜鏂瑰垽瀹氫负涓ラ噸缂洪櫡锛屽缓璁敖蹇粨瀹夋帓瀵硅鏈虹粍鍋滄満骞剁粨鍚堝叾浠栨鏌ユ墜娈碉紙濡備汉宸ユ墦纾級杩涗竴姝ュ嫎鏌ュ苟鍐冲畾缁翠慨澶勭疆鏂规锛岄槻姝㈤闄╄繘涓姝ュ崌绾с -3銆佺粡鏃犱汉鏈鸿繎璺濈澶栬妫鏌ユ湭鍙戠幇H3-08#鏈轰綅Y200249AF銆乊200250AF鍙剁墖鏈夋槑鏄惧奖鍝嶆満缁勬甯歌繍琛岀殑澶栭儴缂洪櫡銆 -''', #鎶ュ憡鎬荤粨鏂囧瓧 - 'pizhun_renyuan': '鐜嬩簲' #鎵瑰噯浜 - } - try: baogao_info = merge_info(baogao_info, DEFAULT_BAOGAO_INFO) jizu_bianhao = baogao_info['jizu_bianhao'] @@ -119,10 +56,9 @@ def main(base_info, baogao_info): 'shenghe_renyuan': baogao_shenghe, 'pizhun_renyuan': pizhun_renyuan, 'bianzhi_riqi': baogao_date, - 'jia_company_name1' : jia_company_name, - 'fengchang_name1' : fengchang_name, - 'jizu_hao1' : jizu_bianhao, - 'fengchang_name2' : fengchang_name, + 'jia_company_name' : jia_company_name, + 'fengchang_name' : fengchang_name, + 'jizu_hao' : jizu_bianhao, 'fengchang_location' : fengchang_location, 'kehu_company' : kehu_company_name, 'xiangmuguige' : jizu_num, @@ -141,16 +77,21 @@ def main(base_info, baogao_info): } output_filename = os.path.join(shengcheng_dir, f"{jizu_bianhao}_{baogao_date}.docx") + # 鍚堝苟骞舵浛鎹 merger = WordDocumentMerger() - try: - merger.merge_documents(os.path.join(muban_dir, f"empty.docx"), os.path.join(muban_dir, 'jingfeng_1.docx'), output_filename) + output_filename = merger.merge_documents(os.path.join(muban_dir, "empty.docx"), os.path.join(muban_dir, 'jingfeng_1.docx'), output_filename) for find_text, replace_text in list_to_replace.items(): print(search_and_replace(output_filename, find_text, replace_text)) except Exception as e: logger.error(f"鍚堝苟鏂囨。澶辫触锛歿e}") return + #=======寮濮嬫坊鍔犵己闄锋枃瀛楀垪琛======== + + #鑾峰彇缂洪櫡淇℃伅 + + if __name__ == '__main__': # 閰嶇疆鏃ュ織 @@ -166,4 +107,4 @@ if __name__ == '__main__': "muban_dir" : r"C:\Users\VogelimKafig\Desktop\閲戦妯℃澘\source\muban", "shengcheng_dir" : r"C:\Users\VogelimKafig\Desktop\閲戦妯℃澘\output" } - main(None, None) \ No newline at end of file + main(base_info, None) \ No newline at end of file diff --git a/output/H3-08#_2021骞12鏈10鏃.docx b/output/H3-08#_2021骞12鏈10鏃.docx new file mode 100644 index 0000000..f88fe8e Binary files /dev/null and b/output/H3-08#_2021骞12鏈10鏃.docx differ diff --git a/output/H3-08#_2021骞12鏈10鏃1.docx b/output/H3-08#_2021骞12鏈10鏃1.docx new file mode 100644 index 0000000..936734b Binary files /dev/null and b/output/H3-08#_2021骞12鏈10鏃1.docx differ diff --git a/output/H3-08#_2021骞12鏈10鏃2.docx b/output/H3-08#_2021骞12鏈10鏃2.docx new file mode 100644 index 0000000..3f929ab Binary files /dev/null and b/output/H3-08#_2021骞12鏈10鏃2.docx differ diff --git a/output/H3-08#_2021骞12鏈10鏃3.docx b/output/H3-08#_2021骞12鏈10鏃3.docx new file mode 100644 index 0000000..cad1f77 Binary files /dev/null and b/output/H3-08#_2021骞12鏈10鏃3.docx differ diff --git a/source/__pycache__/defines.cpython-313.pyc b/source/__pycache__/defines.cpython-313.pyc new file mode 100644 index 0000000..5b273d4 Binary files /dev/null and b/source/__pycache__/defines.cpython-313.pyc differ diff --git a/source/defines.py b/source/defines.py new file mode 100644 index 0000000..93f6012 --- /dev/null +++ b/source/defines.py @@ -0,0 +1,63 @@ +DEFAULT_BAOGAO_INFO = { + #褰撳墠妫鏌ユ姤鍛婂熀鏈唴瀹 + 'jizu_bianhao': 'H3-08#', #妫鏌ョ殑鏈虹粍缂栧彿 + 'baogao_date': '2021骞12鏈10鏃', + #妫鏌ユ柟妗 + 'jiancha_renyuan': '寮犱笁,鏉庡洓,鐜嬩簲', #妫鏌ヤ汉鍛 + #妫鏌ヤ俊鎭 + 'waibu_jiancha': 'True', #鏄惁鍖呭惈澶栭儴妫鏌 + 'neibu_jiancha': 'True', #鏄惁鍖呭惈鍐呴儴妫鏌 + 'fanglei_jiancha': 'True', #鏄惁鍖呭惈闃查浄妫鏌 #娉細闃查浄妫娴嬪崰涓嶅瓨鏀剧己闄峰浘 + 'jiancha_location': '鍙剁墖澶栭儴澶栬', #妫鏌ュ唴瀹规枃瀛 + 'jiancha_fangshi': '浣滀笟鏃犱汉鏈鸿繎璺濈澶栬妫鏌', #妫鏌ユ柟寮忔枃瀛 + #鎶ュ憡澶勭悊淇℃伅 + 'yezhu_renyuan': '鏉庡洓', #涓氫富(浜哄憳) + 'changjia_renyuan': '鐜嬩簲', #鍘傚(浜哄憳) + 'date_process': '鐢熸垚鎶ュ憡浜哄憳', #鏁版嵁澶勭悊浜哄憳 鍚存诲笇鏈涜幏鍙栧墠绔敤鎴锋墽琛岀敓鎴愪汉鍛樹负杩欎釜浜 + 'baogao_bianzhi': '鐢熸垚鎶ュ憡浜哄憳', #鎶ュ憡缂栧埗浜哄憳 鍚存诲笇鏈涜幏鍙栧墠绔敤鎴锋墽琛岀敓鎴愪汉鍛樹负杩欎釜浜 + 'baogao_shenghe': '寰呭～鍐(浜哄憳)', #鎶ュ憡瀹℃牳浜哄憳 + 'shenghe_date': '寰呭～鍐(鏃ユ湡)', #鎶ュ憡瀹℃牳鏃ユ湡 + #妫鏌ユ儏鍐垫眹鎬昏〃锛堟枃瀛椾俊鎭級 鍓嶇鏍规嵁鏄惁鍖呭惈瀵瑰簲閮ㄥ垎妫鏌ヨ嚜琛岀‘瀹氭鏌ュ唴瀹癸紝杩欓噷榛樿鍏ㄩ儴鍖呭惈 + 'Y1_jiancha_neirong': '''1.鍙剁墖鍓嶇紭銆佸悗缂樸丳S闈€丼S闈 +2.鍙剁墖鍐呴儴瀵奸浄鍗°佽吂鏉裤侀忓厜銆佷汉瀛旂洊鐗堛佸彾鏍圭洊鏉... +3.杞瘋鑷冲鍩哄閫氥佸唴閮ㄥ绾跨嚎闃汇佸閮ㄥ绾跨嚎闃...''', + 'Y2_jiancha_neirong': '''1.鍙剁墖鍓嶇紭銆佸悗缂樸丳S闈€丼S闈 +2.鍙剁墖鍐呴儴瀵奸浄鍗°佽吂鏉裤侀忓厜銆佷汉瀛旂洊鐗堛佸彾鏍圭洊鏉... +3.杞瘋鑷冲鍩哄閫氥佸唴閮ㄥ绾跨嚎闃汇佸閮ㄥ绾跨嚎闃...''', + 'Y3_jiancha_neirong': '''1.鍙剁墖鍓嶇紭銆佸悗缂樸丳S闈€丼S闈 +2.鍙剁墖鍐呴儴瀵奸浄鍗°佽吂鏉裤侀忓厜銆佷汉瀛旂洊鐗堛佸彾鏍圭洊鏉... +3.杞瘋鑷冲鍩哄閫氥佸唴閮ㄥ绾跨嚎闃汇佸閮ㄥ绾跨嚎闃...''', + #鎶ュ憡鎬荤粨 + 'baogao_zongjie': '''1銆佸洜娴蜂笂椋庣數鍙剁墖杩愯鐜鎭跺姡銆佺┖姘旂洂纰卞害楂橈紝鍙剁墖鍓嶇紭鍚堟ā缂濆尯鍩熷強PS闈紙杩庨闈級娑傚眰鏄撳彈鑵愯殌锛屽缓璁畾鏈熻瀵熺淮鎶ゃ +2銆佺粡鏃犱汉鏈鸿繎璺濈澶栬妫鏌ュ彂鐜癏3-08#鏈轰綅Y200220AF鍙剁墖PS闈㈣窛鍙舵牴20m澶勫彂鐜颁竴澶勮绾癸紝鎹熶激闀垮害杞村悜3m锛岃缂洪櫡缁忔垜鏂瑰垽瀹氫负涓ラ噸缂洪櫡锛屽缓璁敖蹇粨瀹夋帓瀵硅鏈虹粍鍋滄満骞剁粨鍚堝叾浠栨鏌ユ墜娈碉紙濡備汉宸ユ墦纾級杩涗竴姝ュ嫎鏌ュ苟鍐冲畾缁翠慨澶勭疆鏂规锛岄槻姝㈤闄╄繘涓姝ュ崌绾с +3銆佺粡鏃犱汉鏈鸿繎璺濈澶栬妫鏌ユ湭鍙戠幇H3-08#鏈轰綅Y200249AF銆乊200250AF鍙剁墖鏈夋槑鏄惧奖鍝嶆満缁勬甯歌繍琛岀殑澶栭儴缂洪櫡銆 +''', #鎶ュ憡鎬荤粨鏂囧瓧 + 'pizhun_renyuan': '鐜嬩簲' #鎵瑰噯浜 +} + +DEFAULT_BASE_INFO = { #椤圭洰鍩烘湰淇℃伅 + #鐩綍 + 'picture_dir': "", #鍥剧墖瀛樻斁鍦板潃 + 'shengcheng_dir': "", #宸ヤ綔璺緞(鎶ュ憡鐢熸垚鐨勮矾寰勩佹姤鍛婃ā鏉垮瓨鏀剧殑璺緞) + 'muban_dir': "", #鏂囨。妯℃澘瀛樻斁璺緞 + #椤圭洰姒傚喌 + 'jituan_jianxie': '鐢叉柟闆嗗洟', + 'jia_company_name': '鐢叉柟鍏徃鍚', + 'kehu_company_name': '瀹㈡埛鍚嶇О', + 'kehu_fuzeren': '瀹㈡埛璐熻矗浜', + 'kehu_phone': '18xxxxxxxxxx', + 'shigong_company_name': '鏂藉伐鍗曚綅', + 'jizu_num': '椤圭洰瑙勬牸锛堝彴锛', + 'zhengji_changjia': '鏁存満鍘傚', + 'yepian_changjia': '鍙剁墖鍘傚', #鍙剁墖鍘傚淇℃伅 + 'fengchang_name': '椋庡満鍚嶇О', + 'fengchang_location': '椋庡満浣嶇疆', + 'shigong_date': '鏂藉伐鏃ユ湡(寮濮媬缁撴潫)', + 'jizu_type': '鏈虹粍鍨嬪彿', + 'yepian_type': '鍙剁墖鍨嬪彿', + 'jiancha_fangshi': '浣滀笟鏃犱汉鏈鸿繎璺濈澶栬妫鏌', + #涔欐柟淇℃伅 + 'yi_Company': '涔欐柟鍏徃鍚', + 'fuzeren': '鐢叉柟璐熻矗浜', + 'phone_fuzeren': '188xxxxxxxx', + } \ No newline at end of file diff --git a/source/muban/jingfeng_1.docx b/source/muban/jingfeng_1.docx index a5e2510..6976a14 100644 Binary files a/source/muban/jingfeng_1.docx and b/source/muban/jingfeng_1.docx differ diff --git a/tools/__pycache__/win32_total_copy.cpython-313.pyc b/tools/__pycache__/win32_total_copy.cpython-313.pyc index b31016d..929bd9e 100644 Binary files a/tools/__pycache__/win32_total_copy.cpython-313.pyc and b/tools/__pycache__/win32_total_copy.cpython-313.pyc differ diff --git a/tools/win32_total_copy.py b/tools/win32_total_copy.py index 51be8e7..c2dff86 100644 --- a/tools/win32_total_copy.py +++ b/tools/win32_total_copy.py @@ -55,10 +55,10 @@ class WordDocumentMerger: output_path = self._ensure_unique_filename(output_path) doc1.SaveAs(str(output_path)) logger.info(f"宸蹭繚瀛樺悎骞舵枃妗: {output_path}") - return True + return output_path except Exception as e: logger.error(f"鏂囨。鍚堝苟澶辫触: {str(e)}", exc_info=True) - return False + return None finally: self._cleanup(doc1, doc2)