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

fix: resolve MaterialBase sku property error and add dynamic refresh after stock adjustment

Browse Source
This commit is contained in:
DXC
2026-03-18 14:01:36 +08:00
parent 33969b8336
commit ac15ef74db
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -561,10 +561,15 @@ def export_stocktake():
# 安全获取 sku # 安全获取 sku
stock_sku = getattr(stock, 'sku', None) or getattr(stock, 'SKU', None) or '-' stock_sku = getattr(stock, 'sku', None) or getattr(stock, 'SKU', None) or '-'
# 尝试从MaterialBase获取名称 # 使用 base_id 或 material_id 关联查询物料基础表（安全方式）
material = None material = None
if stock_sku and stock_sku != '-': base_id = getattr(stock, 'base_id', None) or getattr(stock, 'material_id', None)
material = MaterialBase.query.filter_by(sku=stock_sku).first() if base_id:
material = MaterialBase.query.get(base_id)
else:
# 如果没有 base_id，尝试用 code 兜底查询
if hasattr(MaterialBase, 'code') and stock_sku != '-':
material = MaterialBase.query.filter_by(code=stock_sku).first()
return { return {
'name': material.name if material else stock_sku, 'name': material.name if material else stock_sku,

3
inventory-web/src/views/stock/stocktake/index.vue
View File

@ -910,7 +910,8 @@ const handleAdjust = async (row: any) => {
ElMessage.success(res.message || '调整成功') ElMessage.success(res.message || '调整成功')
// 刷新差异列表 // 刷新数据并重新打开差异列表
await loadData()
await openVarianceDialog() await openVarianceDialog()
} catch (e: any) { } catch (e: any) {
if (e !== 'cancel') ElMessage.error(e?.message || '操作失败') if (e !== 'cancel') ElMessage.error(e?.message || '操作失败')