From dbb0f900574ebb7d9d07793515b97deb855ec356 Mon Sep 17 00:00:00 2001 From: 15066119699 Date: Fri, 14 Mar 2025 14:38:36 +0800 Subject: [PATCH] 1 --- .../src/main/resources/mapper/app/AppLocationMapper.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ruoyi-system/src/main/resources/mapper/app/AppLocationMapper.xml b/ruoyi-system/src/main/resources/mapper/app/AppLocationMapper.xml index 4b28b6a7..ba5e6edf 100644 --- a/ruoyi-system/src/main/resources/mapper/app/AppLocationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/app/AppLocationMapper.xml @@ -84,9 +84,10 @@ where location_status = 0 and is_working = 0 and is_enable = 0 and location_id NOT IN ( SELECT DISTINCT ( t.location_id ) FROM app_stock t UNION SELECT DISTINCT ( p.location_id ) FROM app_task p where p.location_id is not null) ORDER BY - w_depth DESC, - w_layer ASC, - w_col asc + w_layer asc, + w_depth desc, + w_col asc, + w_row asc