功能：新增托盘业务报表页面

2026-07-27 11:14:36 +08:00
parent 85faef213e
commit 8361c11c4c
9 changed files with 1049 additions and 2 deletions
@@ -490,6 +490,6 @@ class ReportDao:
            .outerjoin(after_line, after_line.line_id == BizPalletEvent.after_line_id)
            .outerjoin(operator_user, operator_user.user_id == BizPalletEvent.operator_id)
            .where(*conditions)
-            .order_by(BizPalletEvent.pallet_id, BizPalletEvent.event_seq, BizPalletEvent.event_id)
+            .order_by(BizPalletEvent.occurred_at, BizPalletEvent.event_id)
        )
        return await cls._paginate(db, statement, query_object)
@@ -603,7 +603,7 @@ class TestReportDaoQueries(unittest.IsolatedAsyncioTestCase):
            self.assertIn('biz_pallet_event.occurred_at >=', sql)
            self.assertIn('biz_pallet_event.occurred_at <', sql)
            self.assertIn(
-                'order by biz_pallet_event.pallet_id, biz_pallet_event.event_seq, biz_pallet_event.event_id',
+                'order by biz_pallet_event.occurred_at, biz_pallet_event.event_id',
                sql,
            )