From a19167e80482f8add1c13bfc1b7407dd064c041f Mon Sep 17 00:00:00 2001 From: DXC Date: Thu, 19 Mar 2026 11:36:48 +0800 Subject: [PATCH] fix: add missing remark header to stocktake excel export --- inventory-backend/app/api/v1/inbound/stock.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/inventory-backend/app/api/v1/inbound/stock.py b/inventory-backend/app/api/v1/inbound/stock.py index cc2eda0..657c4e3 100644 --- a/inventory-backend/app/api/v1/inbound/stock.py +++ b/inventory-backend/app/api/v1/inbound/stock.py @@ -644,13 +644,13 @@ def export_stocktake(): # ===== Sheet 1: 盘点全景汇总表 (放在最前面) ===== ws1 = wb.create_sheet("盘点全景汇总表", 0) - summary_headers = ["物料名称", "SKU", "规格型号", "库位", "调整后账面数", "实盘数", "差异数", "盘点状态", "盘点人", "盘点时间"] + summary_headers = ["物料名称", "SKU", "规格型号", "库位", "调整后账面数", "实盘数", "差异数", "盘点状态", "盘点人", "盘点时间", "备注"] set_header_row(ws1, summary_headers) master_row_idx = 2 # 汇总表行计数器 # ===== Sheet 2: 盘点差异明细 ===== ws2 = wb.create_sheet("盘点差异明细") - diff_headers = ["物料名称", "SKU", "规格型号", "库位", "调整后账面数", "实盘数", "差异数", "盘点人", "盘点时间"] + diff_headers = ["物料名称", "SKU", "规格型号", "库位", "调整后账面数", "实盘数", "差异数", "盘点人", "盘点时间", "备注"] set_header_row(ws2, diff_headers) diff_drafts = StocktakeDraft.query.filter(StocktakeDraft.diff_qty != 0).all() @@ -666,6 +666,7 @@ def export_stocktake(): ws2.cell(row=row_idx, column=7, value=float(draft.diff_qty or 0)).border = thin_border ws2.cell(row=row_idx, column=8, value=get_user_name(draft.user_id)).border = thin_border ws2.cell(row=row_idx, column=9, value=to_beijing_time(draft.scan_time)).border = thin_border + ws2.cell(row=row_idx, column=10, value=draft.remark or '').border = thin_border # 同时写入 Sheet 1 (汇总表) ws1.cell(row=master_row_idx, column=1, value=mat_info['name']).border = thin_border ws1.cell(row=master_row_idx, column=2, value=mat_info['sku']).border = thin_border @@ -677,11 +678,12 @@ def export_stocktake(): ws1.cell(row=master_row_idx, column=8, value="有差异").border = thin_border ws1.cell(row=master_row_idx, column=9, value=get_user_name(draft.user_id)).border = thin_border ws1.cell(row=master_row_idx, column=10, value=to_beijing_time(draft.scan_time)).border = thin_border + ws1.cell(row=master_row_idx, column=11, value=draft.remark or '').border = thin_border master_row_idx += 1 # ===== Sheet 3: 账实相符明细 ===== ws3 = wb.create_sheet("账实相符明细") - normal_headers = ["物料名称", "SKU", "规格型号", "库位", "调整后账面数", "实盘数", "差异数", "盘点人", "盘点时间"] + normal_headers = ["物料名称", "SKU", "规格型号", "库位", "调整后账面数", "实盘数", "差异数", "盘点人", "盘点时间", "备注"] set_header_row(ws3, normal_headers) normal_drafts = StocktakeDraft.query.filter(StocktakeDraft.diff_qty == 0).all() @@ -697,6 +699,7 @@ def export_stocktake(): ws3.cell(row=row_idx, column=7, value=float(draft.diff_qty or 0)).border = thin_border ws3.cell(row=row_idx, column=8, value=get_user_name(draft.user_id)).border = thin_border ws3.cell(row=row_idx, column=9, value=to_beijing_time(draft.scan_time)).border = thin_border + ws3.cell(row=row_idx, column=10, value=draft.remark or '').border = thin_border # 同时写入 Sheet 1 (汇总表) ws1.cell(row=master_row_idx, column=1, value=mat_info['name']).border = thin_border ws1.cell(row=master_row_idx, column=2, value=mat_info['sku']).border = thin_border @@ -708,6 +711,7 @@ def export_stocktake(): ws1.cell(row=master_row_idx, column=8, value="正常").border = thin_border ws1.cell(row=master_row_idx, column=9, value=get_user_name(draft.user_id)).border = thin_border ws1.cell(row=master_row_idx, column=10, value=to_beijing_time(draft.scan_time)).border = thin_border + ws1.cell(row=master_row_idx, column=11, value=draft.remark or '').border = thin_border master_row_idx += 1 # ===== Sheet 4: 外借在用资产明细 =====