duxingchen/KCGL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf: implement optimistic UI for scanner, disable auto-camera, and sort excel by SKU

Browse Source
This commit is contained in:
DXC
2026-03-23 09:51:59 +08:00
parent 13e910645d
commit 7c9331d78a
2 changed files with 42 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
inventory-backend/app/api/v1/inbound/stock.py
View File

@ -718,7 +718,15 @@ def export_stocktake():
diff_headers = ["物料名称", "SKU", "规格型号", "库位", "调整后账面数", "实盘数", "差异数", "盘点人", "盘点时间", "备注"]
set_header_row(ws2, diff_headers)
# 按 SKU 排序：先获取全部数据，再在 Python 中按 SKU 排序
diff_drafts = StocktakeDraft.query.filter(StocktakeDraft.diff_qty != 0).all()
diff_drafts_with_sku = []
for draft in diff_drafts:
mat_info = get_material_info(draft.source_table, draft.stock_id)
diff_drafts_with_sku.append((mat_info.get('sku', ''), draft))
diff_drafts_with_sku.sort(key=lambda x: x[0] if x[0] else '')
diff_drafts = [d[1] for d in diff_drafts_with_sku]
for row_idx, draft in enumerate(diff_drafts, 2):
mat_info = get_material_info(draft.source_table, draft.stock_id)
# 写入 Sheet 2 (差异明细)
@ -751,7 +759,15 @@ def export_stocktake():
normal_headers = ["物料名称", "SKU", "规格型号", "库位", "调整后账面数", "实盘数", "差异数", "盘点人", "盘点时间", "备注"]
set_header_row(ws3, normal_headers)
# 按 SKU 排序
normal_drafts = StocktakeDraft.query.filter(StocktakeDraft.diff_qty == 0).all()
normal_drafts_with_sku = []
for draft in normal_drafts:
mat_info = get_material_info(draft.source_table, draft.stock_id)
normal_drafts_with_sku.append((mat_info.get('sku', ''), draft))
normal_drafts_with_sku.sort(key=lambda x: x[0] if x[0] else '')
normal_drafts = [d[1] for d in normal_drafts_with_sku]
for row_idx, draft in enumerate(normal_drafts, 2):
mat_info = get_material_info(draft.source_table, draft.stock_id)
# 写入 Sheet 3 (账实相符)