Merge remote-tracking branch 'origin/dev' into dev

huangjiayang

2025-04-27 b2d338ddc68db5b9bb824574c76d2b9b4fb07da9

Merge remote-tracking branch 'origin/dev' into dev

 aps-modules/aps-core/src/main/resources/mapper/core/ApsPartRouteStatMapper.xml

@@ -124,7 +124,6 @@
            left join aps_process_route as rt on pl.document_number=rt.work_order_no
            left join aps_resource_group as rs on rs.resource_group_name=rt.process_name
        where pl.document_number is not null and rt.work_order_no is not null
             and pl.del_flag='0'
             and  rt.process_plan_start_day  <= rs.request_date
            order by rt.work_order_no,process_plan_start_day
    </select>