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

\"fix: use explicit labels and native text order_by to enforce strict warning logic\"

Browse Source
This commit is contained in:
DXC
2026-03-11 17:35:27 +08:00
parent 6bc2d2848e
commit f0ec9a68d7
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
inventory-backend/app/services/inbound/base_service.py
View File

@ -313,32 +313,37 @@ class MaterialBaseService:
enable_warning_sort = has_warning_permission and filters.get('enableWarningSort', False) enable_warning_sort = has_warning_permission and filters.get('enableWarningSort', False)
if enable_warning_sort: if enable_warning_sort:
print("====== [DEBUG] 成功进入预警智能排序逻辑 ======") from sqlalchemy import text
# 状态层级：红(2) > 黄(1) > 常规(0) print("====== [DEBUG] 执行虚拟列强排模式 ======")
# 1. 建立虚拟列标签 (显式暴露出计算结果)
warning_level = case([ warning_level = case([
(and_(MaterialWarningSetting.is_enabled.is_(True), total_inv <= MaterialWarningSetting.red_threshold), 2), (and_(MaterialWarningSetting.is_enabled.is_(True), total_inv <= MaterialWarningSetting.red_threshold), 2),
(and_(MaterialWarningSetting.is_enabled.is_(True), total_inv <= MaterialWarningSetting.yellow_threshold), 1) (and_(MaterialWarningSetting.is_enabled.is_(True), total_inv <= MaterialWarningSetting.yellow_threshold), 1)
], else_=0) ], else_=0).label('sort_level')
# 红色组内部：缺口越大越靠前 (red_threshold - total_inv) DESC # 红色组内部：缺口越大越靠前 DESC
red_shortage = case([ red_shortage = case([
(and_(MaterialWarningSetting.is_enabled.is_(True), total_inv <= MaterialWarningSetting.red_threshold), (and_(MaterialWarningSetting.is_enabled.is_(True), total_inv <= MaterialWarningSetting.red_threshold),
MaterialWarningSetting.red_threshold - total_inv) MaterialWarningSetting.red_threshold - total_inv)
], else_=0) ], else_=0).label('sort_red')
# 黄色组内部：距离红线越近越靠前 (total_inv - red_threshold) ASC # 黄色组内部：距离红线越近越靠前 ASC
yellow_distance = case([ yellow_distance = case([
(and_(MaterialWarningSetting.is_enabled.is_(True), total_inv > MaterialWarningSetting.red_threshold, total_inv <= MaterialWarningSetting.yellow_threshold), (and_(MaterialWarningSetting.is_enabled.is_(True), total_inv > MaterialWarningSetting.red_threshold, total_inv <= MaterialWarningSetting.yellow_threshold),
total_inv - MaterialWarningSetting.red_threshold) total_inv - MaterialWarningSetting.red_threshold)
], else_=999999) ], else_=999999).label('sort_yellow')
# 清除默认排序，应用严谨的四级排序 # 2. 将虚拟列加入查询 (使其成为真实可引用的字段)
query = query.order_by( query = query.add_columns(warning_level, red_shortage, yellow_distance)
desc(warning_level),
desc(red_shortage), # 3. 清除任何杂乱排序，使用原生 text 强行指引数据库按虚拟列名排序
asc(yellow_distance), query = query.order_by(None).order_by(
desc(MaterialBase.id) text("sort_level DESC"),
text("sort_red DESC"),
text("sort_yellow ASC"),
MaterialBase.id.desc()
) )
elif order_by_column: elif order_by_column:
# 字段映射 # 字段映射