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

fix: implement traffic-light color warning and correct ascending sort for overdue borrow records

Browse Source
This commit is contained in:
DXC
2026-03-19 11:45:27 +08:00
parent a32d4f6b65
commit 8db1015f99
2 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@ from app.models.transaction import TransBorrow
from app.models.inbound.buy import StockBuy
from app.models.inbound.semi import StockSemi
from app.models.inbound.product import StockProduct
from sqlalchemy import desc, func
from sqlalchemy import desc, func, nullslast, asc
class TransService:
@ -199,7 +199,7 @@ class TransService:
TransBorrow.sku.ilike(f'%{keyword}%') |
TransBorrow.borrow_no.ilike(f'%{keyword}%'))
q = q.order_by(desc(TransBorrow.expected_return_time))
q = q.order_by(nullslast(asc(TransBorrow.expected_return_time)))
pagination = q.paginate(page=page, per_page=limit, error_out=False)
return {