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

feat: 重构全局搜索框为复合条件选择，支持按名称、俗名、规格进行精准查杂

Browse Source
This commit is contained in:
dxc
2026-03-11 13:37:52 +08:00
parent e224a07a47
commit b1cc280a71
12 changed files with 156 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
inventory-backend/app/services/inbound/product_service.py
View File

@ -270,22 +270,35 @@ class ProductInboundService:
return []
@staticmethod
def get_list(page, limit, keyword=None, sku=None, statuses=None, category=None, material_type=None, company=None,
def get_list(page, limit, keyword=None, sku=None, search_field='all', statuses=None, category=None, material_type=None, company=None,
order_by_column=None, is_asc=None, advanced_filters=None):
from app.models.inbound.product import StockProduct
try:
query = db.session.query(StockProduct).outerjoin(MaterialBase, StockProduct.base_id == MaterialBase.id)
# 1. 通用关键词搜索（名称、规格、公司）
# 1. 通用关键词搜索（支持指定字段精准搜索）
if keyword:
kw = f'%{keyword}%'
query = query.filter(or_(
MaterialBase.name.ilike(kw),
MaterialBase.spec_model.ilike(kw),
MaterialBase.company_name.ilike(kw),
StockProduct.serial_number.ilike(kw),
StockProduct.work_order_code.ilike(kw),
StockProduct.order_id.ilike(kw)
))
if search_field == 'name':
query = query.filter(MaterialBase.name.ilike(kw))
elif search_field == 'spec':
query = query.filter(MaterialBase.spec_model.ilike(kw))
elif search_field == 'common_name':
query = query.filter(MaterialBase.common_name.ilike(kw))
elif search_field == 'serial_number':
query = query.filter(StockProduct.serial_number.ilike(kw))
elif search_field == 'work_order_code':
query = query.filter(StockProduct.work_order_code.ilike(kw))
elif search_field == 'order_id':
query = query.filter(StockProduct.order_id.ilike(kw))
else: # 'all' 默认全局模糊匹配
query = query.filter(or_(
MaterialBase.name.ilike(kw),
MaterialBase.spec_model.ilike(kw),
MaterialBase.company_name.ilike(kw),
StockProduct.serial_number.ilike(kw),
StockProduct.work_order_code.ilike(kw),
StockProduct.order_id.ilike(kw)
))
# 1.1 SKU 独立搜索
if sku and sku.strip():
sku_str = f'%{sku.strip()}%'