diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml index 7ab9440..535cae6 100644 --- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml @@ -262,7 +262,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.target_cargo_space_id, ROW_NUMBER() OVER ( PARTITION BY b.the_floor, b.group_coding_no - ORDER BY CASE WHEN a.in_or_out = 30 THEN 0 ELSE 1 END, a.create_time ASC, a.job_id ASC + ORDER BY b.group_coding DESC, + CASE WHEN a.in_or_out = 30 THEN 0 ELSE 1 END, + a.create_time ASC, + a.job_id ASC ) AS rn FROM mydo_job_wcs a INNER JOIN bas_cargo_space b