feat: 采购/半成品/成品列表拆分SKU独立搜索框
This commit is contained in:
@ -240,17 +240,16 @@ class BuyInboundService:
|
||||
# 5. 获取列表 (支持排序和高级筛选)
|
||||
# ============================================================
|
||||
@staticmethod
|
||||
def get_list(page, limit, keyword=None, statuses=None, category=None, material_type=None, company=None,
|
||||
def get_list(page, limit, keyword=None, sku=None, statuses=None, category=None, material_type=None, company=None,
|
||||
order_by='', is_asc='', advanced_filters=None):
|
||||
try:
|
||||
from sqlalchemy import and_, or_
|
||||
query = db.session.query(StockBuy).outerjoin(MaterialBase, StockBuy.base_id == MaterialBase.id)
|
||||
|
||||
# 1. 通用关键词搜索
|
||||
# 1. 通用关键词搜索(名称、规格、公司)
|
||||
if keyword:
|
||||
k_str = f'%{keyword.strip()}%'
|
||||
conditions = [
|
||||
StockBuy.sku.ilike(k_str),
|
||||
StockBuy.barcode.ilike(k_str),
|
||||
StockBuy.batch_number.ilike(k_str),
|
||||
StockBuy.serial_number.ilike(k_str),
|
||||
@ -262,6 +261,11 @@ class BuyInboundService:
|
||||
]
|
||||
query = query.filter(or_(*conditions))
|
||||
|
||||
# 1.1 SKU 独立搜索
|
||||
if sku and sku.strip():
|
||||
sku_str = f'%{sku.strip()}%'
|
||||
query = query.filter(StockBuy.sku.ilike(sku_str))
|
||||
|
||||
# 2. 类别独立搜索
|
||||
if category and category.strip():
|
||||
query = query.filter(MaterialBase.category == category.strip())
|
||||
|
||||
Reference in New Issue
Block a user