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

fix(api): globally replace invalid material_base/material_name attributes with correct base relationship

Browse Source
This commit is contained in:
DXC
2026-03-26 17:14:26 +08:00
parent d58b002340
commit c8810891d8
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,8 +169,8 @@ def get_stock_list():
if keyword: if keyword:
q = q.filter( q = q.filter(
db.or_( db.or_(
StockBuy.material_name.ilike(f'%{keyword}%'), StockBuy.base.has(MaterialBase.name.ilike(f'%{keyword}%')),
StockBuy.spec_model.ilike(f'%{keyword}%'), StockBuy.base.has(MaterialBase.spec_model.ilike(f'%{keyword}%')),
StockBuy.sku.ilike(f'%{keyword}%') StockBuy.sku.ilike(f'%{keyword}%')
) )
) )
@ -192,8 +192,8 @@ def get_stock_list():
if keyword: if keyword:
q = q.filter( q = q.filter(
db.or_( db.or_(
StockSemi.material_name.ilike(f'%{keyword}%'), StockSemi.base.has(MaterialBase.name.ilike(f'%{keyword}%')),
StockSemi.spec_model.ilike(f'%{keyword}%'), StockSemi.base.has(MaterialBase.spec_model.ilike(f'%{keyword}%')),
StockSemi.sku.ilike(f'%{keyword}%') StockSemi.sku.ilike(f'%{keyword}%')
) )
) )

8
inventory-backend/app/api/v1/scrap.py
View File

@ -184,10 +184,10 @@ class ScrapService:
'id': item.id, 'id': item.id,
'sku': item.sku, 'sku': item.sku,
'barcode': item.barcode, 'barcode': item.barcode,
'name': item.material_base.name if item.material_base else '', 'name': item.base.name if item.base else '',
'spec': item.material_base.spec_model if item.material_base else '', 'spec': item.base.spec_model if item.base else '',
'category': item.material_base.category if item.material_base else '', 'category': item.base.category if item.base else '',
'material_type': item.material_base.material_type if item.material_base else '', 'material_type': item.base.material_type if item.base else '',
'warehouse_loc': item.warehouse_loc or '', 'warehouse_loc': item.warehouse_loc or '',
'stock_quantity': stock_qty, 'stock_quantity': stock_qty,
'available_quantity': avail_qty, 'available_quantity': avail_qty,

4
inventory-backend/app/services/outbound_service.py
View File

@ -101,8 +101,8 @@ class OutboundService:
except Exception: except Exception:
pass pass
if not base_name and hasattr(item, 'material_name'): if not base_name and hasattr(item, 'base') and item.base:
base_name = item.material_name base_name = item.base.name
stock_qty = float(item.stock_quantity) if item.stock_quantity else 0 stock_qty = float(item.stock_quantity) if item.stock_quantity else 0
avail_qty = float(item.available_quantity) if item.available_quantity else 0 avail_qty = float(item.available_quantity) if item.available_quantity else 0