feat: implement composite debounced search with prepended select and wipe out duplicate root permission nodes
This commit is contained in:
@ -192,76 +192,159 @@ class OutboundService:
|
||||
raise e
|
||||
|
||||
@staticmethod
|
||||
def get_grouped_list(page=1, per_page=10, keyword=None, start_date=None, end_date=None):
|
||||
def get_grouped_list(page=1, per_page=10, keyword=None, search_type='all', start_date=None, end_date=None):
|
||||
"""
|
||||
查询出库记录（按出库单号分组），包含详细物品信息
|
||||
支持跨表搜索：单号、领用人、SKU、物料名称、规格型号
|
||||
search_type: all, no, name, sku, material_name, spec_model
|
||||
"""
|
||||
# 1. 构建基础查询
|
||||
# 如果有关键词，需要联表搜索物料名称和规格型号
|
||||
if keyword:
|
||||
# 由于 TransOutbound 通过 source_table + stock_id 关联到不同库存表，再关联到 MaterialBase
|
||||
# 需要使用 union 或分别查询后合并
|
||||
# 方案：分别查询三种来源的 matching outbound_no，然后合并
|
||||
# 根据 search_type 构建不同的搜索条件
|
||||
if search_type == 'all':
|
||||
# 原有逻辑：or_ 联表全局模糊搜索
|
||||
# 查询 stock_buy 路径匹配的名称/规格
|
||||
buy_match = db.session.query(TransOutbound.outbound_no).join(
|
||||
StockBuy, and_(
|
||||
TransOutbound.stock_id == StockBuy.id,
|
||||
TransOutbound.source_table == 'stock_buy'
|
||||
)
|
||||
).join(
|
||||
MaterialBase, StockBuy.base_id == MaterialBase.id
|
||||
).filter(
|
||||
or_(
|
||||
MaterialBase.name.ilike(f'%{keyword}%'),
|
||||
MaterialBase.spec_model.ilike(f'%{keyword}%')
|
||||
)
|
||||
).subquery()
|
||||
|
||||
# 查询 stock_buy 路径匹配的名称/规格
|
||||
buy_match = db.session.query(TransOutbound.outbound_no).join(
|
||||
StockBuy, and_(
|
||||
TransOutbound.stock_id == StockBuy.id,
|
||||
TransOutbound.source_table == 'stock_buy'
|
||||
)
|
||||
).join(
|
||||
MaterialBase, StockBuy.base_id == MaterialBase.id
|
||||
).filter(
|
||||
or_(
|
||||
MaterialBase.name.ilike(f'%{keyword}%'),
|
||||
MaterialBase.spec_model.ilike(f'%{keyword}%')
|
||||
)
|
||||
).subquery()
|
||||
# 查询 stock_semi 路径匹配的名称/规格
|
||||
semi_match = db.session.query(TransOutbound.outbound_no).join(
|
||||
StockSemi, and_(
|
||||
TransOutbound.stock_id == StockSemi.id,
|
||||
TransOutbound.source_table == 'stock_semi'
|
||||
)
|
||||
).join(
|
||||
MaterialBase, StockSemi.base_id == MaterialBase.id
|
||||
).filter(
|
||||
or_(
|
||||
MaterialBase.name.ilike(f'%{keyword}%'),
|
||||
MaterialBase.spec_model.ilike(f'%{keyword}%')
|
||||
)
|
||||
).subquery()
|
||||
|
||||
# 查询 stock_semi 路径匹配的名称/规格
|
||||
semi_match = db.session.query(TransOutbound.outbound_no).join(
|
||||
StockSemi, and_(
|
||||
TransOutbound.stock_id == StockSemi.id,
|
||||
TransOutbound.source_table == 'stock_semi'
|
||||
)
|
||||
).join(
|
||||
MaterialBase, StockSemi.base_id == MaterialBase.id
|
||||
).filter(
|
||||
or_(
|
||||
MaterialBase.name.ilike(f'%{keyword}%'),
|
||||
MaterialBase.spec_model.ilike(f'%{keyword}%')
|
||||
)
|
||||
).subquery()
|
||||
# 查询 stock_product 路径匹配的名称/规格
|
||||
product_match = db.session.query(TransOutbound.outbound_no).join(
|
||||
StockProduct, and_(
|
||||
TransOutbound.stock_id == StockProduct.id,
|
||||
TransOutbound.source_table == 'stock_product'
|
||||
)
|
||||
).join(
|
||||
MaterialBase, StockProduct.base_id == MaterialBase.id
|
||||
).filter(
|
||||
or_(
|
||||
MaterialBase.name.ilike(f'%{keyword}%'),
|
||||
MaterialBase.spec_model.ilike(f'%{keyword}%')
|
||||
)
|
||||
).subquery()
|
||||
|
||||
# 查询 stock_product 路径匹配的名称/规格
|
||||
product_match = db.session.query(TransOutbound.outbound_no).join(
|
||||
StockProduct, and_(
|
||||
TransOutbound.stock_id == StockProduct.id,
|
||||
TransOutbound.source_table == 'stock_product'
|
||||
)
|
||||
).join(
|
||||
MaterialBase, StockProduct.base_id == MaterialBase.id
|
||||
).filter(
|
||||
or_(
|
||||
MaterialBase.name.ilike(f'%{keyword}%'),
|
||||
MaterialBase.spec_model.ilike(f'%{keyword}%')
|
||||
)
|
||||
).subquery()
|
||||
# 合并三种来源的匹配单号
|
||||
all_matches = db.session.query(buy_match.c.outbound_no).union(
|
||||
db.session.query(semi_match.c.outbound_no),
|
||||
db.session.query(product_match.c.outbound_no)
|
||||
).subquery()
|
||||
|
||||
# 合并三种来源的匹配单号
|
||||
all_matches = db.session.query(buy_match.c.outbound_no).union(
|
||||
db.session.query(semi_match.c.outbound_no),
|
||||
db.session.query(product_match.c.outbound_no)
|
||||
).subquery()
|
||||
keyword_conditions = or_(
|
||||
TransOutbound.outbound_no.ilike(f'%{keyword}%'),
|
||||
TransOutbound.consumer_name.ilike(f'%{keyword}%'),
|
||||
TransOutbound.sku.ilike(f'%{keyword}%'),
|
||||
TransOutbound.outbound_no.in_(all_matches)
|
||||
)
|
||||
|
||||
# 主搜索条件：单号、领用人、SKU + 物料名称/规格匹配的单号
|
||||
keyword_conditions = or_(
|
||||
TransOutbound.outbound_no.ilike(f'%{keyword}%'),
|
||||
TransOutbound.consumer_name.ilike(f'%{keyword}%'),
|
||||
TransOutbound.sku.ilike(f'%{keyword}%'),
|
||||
TransOutbound.outbound_no.in_(all_matches)
|
||||
)
|
||||
elif search_type == 'no':
|
||||
keyword_conditions = TransOutbound.outbound_no.ilike(f'%{keyword}%')
|
||||
|
||||
elif search_type == 'name':
|
||||
keyword_conditions = TransOutbound.consumer_name.ilike(f'%{keyword}%')
|
||||
|
||||
elif search_type == 'sku':
|
||||
keyword_conditions = TransOutbound.sku.ilike(f'%{keyword}%')
|
||||
|
||||
elif search_type == 'material_name':
|
||||
# 联表查询物料名称
|
||||
buy_match = db.session.query(TransOutbound.outbound_no).join(
|
||||
StockBuy, and_(
|
||||
TransOutbound.stock_id == StockBuy.id,
|
||||
TransOutbound.source_table == 'stock_buy'
|
||||
)
|
||||
).join(
|
||||
MaterialBase, StockBuy.base_id == MaterialBase.id
|
||||
).filter(MaterialBase.name.ilike(f'%{keyword}%')).subquery()
|
||||
|
||||
semi_match = db.session.query(TransOutbound.outbound_no).join(
|
||||
StockSemi, and_(
|
||||
TransOutbound.stock_id == StockSemi.id,
|
||||
TransOutbound.source_table == 'stock_semi'
|
||||
)
|
||||
).join(
|
||||
MaterialBase, StockSemi.base_id == MaterialBase.id
|
||||
).filter(MaterialBase.name.ilike(f'%{keyword}%')).subquery()
|
||||
|
||||
product_match = db.session.query(TransOutbound.outbound_no).join(
|
||||
StockProduct, and_(
|
||||
TransOutbound.stock_id == StockProduct.id,
|
||||
TransOutbound.source_table == 'stock_product'
|
||||
)
|
||||
).join(
|
||||
MaterialBase, StockProduct.base_id == MaterialBase.id
|
||||
).filter(MaterialBase.name.ilike(f'%{keyword}%')).subquery()
|
||||
|
||||
all_matches = db.session.query(buy_match.c.outbound_no).union(
|
||||
db.session.query(semi_match.c.outbound_no),
|
||||
db.session.query(product_match.c.outbound_no)
|
||||
).subquery()
|
||||
|
||||
keyword_conditions = TransOutbound.outbound_no.in_(all_matches)
|
||||
|
||||
elif search_type == 'spec_model':
|
||||
# 联表查询规格型号
|
||||
buy_match = db.session.query(TransOutbound.outbound_no).join(
|
||||
StockBuy, and_(
|
||||
TransOutbound.stock_id == StockBuy.id,
|
||||
TransOutbound.source_table == 'stock_buy'
|
||||
)
|
||||
).join(
|
||||
MaterialBase, StockBuy.base_id == MaterialBase.id
|
||||
).filter(MaterialBase.spec_model.ilike(f'%{keyword}%')).subquery()
|
||||
|
||||
semi_match = db.session.query(TransOutbound.outbound_no).join(
|
||||
StockSemi, and_(
|
||||
TransOutbound.stock_id == StockSemi.id,
|
||||
TransOutbound.source_table == 'stock_semi'
|
||||
)
|
||||
).join(
|
||||
MaterialBase, StockSemi.base_id == MaterialBase.id
|
||||
).filter(MaterialBase.spec_model.ilike(f'%{keyword}%')).subquery()
|
||||
|
||||
product_match = db.session.query(TransOutbound.outbound_no).join(
|
||||
StockProduct, and_(
|
||||
TransOutbound.stock_id == StockProduct.id,
|
||||
TransOutbound.source_table == 'stock_product'
|
||||
)
|
||||
).join(
|
||||
MaterialBase, StockProduct.base_id == MaterialBase.id
|
||||
).filter(MaterialBase.spec_model.ilike(f'%{keyword}%')).subquery()
|
||||
|
||||
all_matches = db.session.query(buy_match.c.outbound_no).union(
|
||||
db.session.query(semi_match.c.outbound_no),
|
||||
db.session.query(product_match.c.outbound_no)
|
||||
).subquery()
|
||||
|
||||
keyword_conditions = TransOutbound.outbound_no.in_(all_matches)
|
||||
|
||||
else:
|
||||
keyword_conditions = None
|
||||
else:
|
||||
keyword_conditions = None
|
||||
|
||||
|
||||
Reference in New Issue
Block a user