修改python Excel合并脚本。由xlwings改为openpyxl

app/utils/excelmerge/conformity.py

@@ -1,37 +1,48 @@
-import xlwings as xw
+from openpyxl import load_workbook
+from openpyxl.utils import get_column_letter
 from datetime import datetime
 import os
-import shutil
 
 
 def run_conformity():
-
-    source_folder = os.path.join('data', 'source')
+    # 加载模板文件
     template_path = os.path.join('app', 'utils', 'excelmerge', '国网上海电力整合模版.xlsx')
+    template_excel = load_workbook(template_path)
     EXCEL_FILES_PATH = os.path.join('data', 'output')
 
-    app = xw.App(visible=False)
-    templateExcel = xw.Book(template_path)
-
-    sheet1 = templateExcel.sheets['技术监督工作统计表']
-    sheet2 = templateExcel.sheets['技术监督告（预）警单统计表']
-    sheet3 = templateExcel.sheets['投产前技术监督报告统计表']
-    sheet4 = templateExcel.sheets['技术监督细则完善建议']
-    sheet5 = templateExcel.sheets['典型经验交流']
+    # 获取工作表
+    sheet1 = template_excel['技术监督工作统计表']
+    sheet2 = template_excel['技术监督告（预）警单统计表']
+    sheet3 = template_excel['投产前技术监督报告统计表']
+    sheet4 = template_excel['技术监督细则完善建议']
+    sheet5 = template_excel['典型经验交流']
 
+    # 获取源文件路径
+    source_folder = os.path.join('data', 'source')
     source_files = [f for f in os.listdir(source_folder) if f.endswith('.xlsx') and not f.startswith('~$')]
 
     for file in source_files:
-        sourceExcel = xw.Book(os.path.join(source_folder, file))
-        ssheet1 = sourceExcel.sheets['技术监督工作统计表']
-        ssheet2 = sourceExcel.sheets['技术监督告（预）警单统计表']
-        ssheet3 = sourceExcel.sheets['投产前技术监督报告统计表']
-        ssheet4 = sourceExcel.sheets['技术监督细则完善建议']
-        ssheet5 = sourceExcel.sheets['典型经验交流']
+        source_path = os.path.join(source_folder, file)
+        source_excel = load_workbook(source_path)
+
+        # 获取源工作表
+        ssheet1 = source_excel['技术监督工作统计表']
+        ssheet2 = source_excel['技术监督告（预）警单统计表']
+        ssheet3 = source_excel['投产前技术监督报告统计表']
+        ssheet4 = source_excel['技术监督细则完善建议']
+        ssheet5 = source_excel['典型经验交流']
+
+        # 清除无效空白行
         for ssheet in [ssheet1, ssheet2, ssheet3, ssheet4, ssheet5]:
-            last_row_value = ssheet.range(f'A{ssheet.used_range.rows.count}').value
-            if isinstance(last_row_value, str):
-                ssheet.range(f'A{ssheet.used_range.rows.count}:AA{ssheet.used_range.rows.count}').delete()
+            last_row = ssheet.max_row
+            if last_row > 1:
+                for row in range(last_row, 1, -1):
+                    if all(ssheet.cell(row=row, column=col).value is None or ssheet.cell(row=row,
+                                                                                         column=col).value == ''
+                           for col in range(1, ssheet.max_column + 1)):
+                        ssheet.delete_rows(row)
+
+        # 复制数据
         for (ssheet, tsheet, start_point) in [
             (ssheet1, sheet1, 4),
             (ssheet2, sheet2, 3),
@@ -39,26 +50,24 @@ def run_conformity():
             (ssheet4, sheet4, 4),
             (ssheet5, sheet5, 3),
         ]:
-            for row in range(start_point, ssheet.used_range.rows.count + 1):
-                a_cell_value = ssheet.range(f'A{row}').value
-                if not isinstance(a_cell_value, (int, float)):
-                    continue
-                if not all(cell.value is None or cell.value == '' for cell in ssheet.range(f'B{row}:AA{row}')):
-                    tsheet.range(f'B{tsheet.used_range.rows.count + 1}').value = ssheet.range(f'B{row}:AA{row}').value
-        sourceExcel.close()
+            for row in range(start_point, ssheet.max_row + 1):
+                a_cell_value = ssheet.cell(row=row, column=1).value
+                if isinstance(a_cell_value, (int, float)) and any(
+                        ssheet.cell(row=row, column=col).value for col in range(2, ssheet.max_column + 1)):
+                    tsheet.append([ssheet.cell(row=row, column=col).value for col in range(1, ssheet.max_column + 1)])
+
+        source_excel.close()
+
+    # 在目标工作表中添加序号
     for tsheet, start_point in [(sheet1, 4), (sheet2, 3), (sheet3, 3), (sheet4, 4), (sheet5, 3)]:
-        last_row = tsheet.used_range.rows.count
-        number = 1
+        last_row = tsheet.max_row
         for i in range(start_point, last_row + 1):
-            tsheet.range(f'A{i}').value = number
-            number += 1
+            tsheet.cell(row=i, column=1).value = i - start_point + 1
 
-    timestamp = datetime.now().strftime('%Y-%m-%d_%H-%M-%S')
+    # 保存文件
+    timestamp = datetime.now().strftime('%Y_%m_%d_%H_%M_%S')
     output_path = os.path.join(EXCEL_FILES_PATH, f'{timestamp}.xlsx')
-    templateExcel.save(output_path)
-    templateExcel.close()
-    app.quit()
+    template_excel.save(output_path)
+    template_excel.close()
 
     return timestamp
-
-