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

huangjiayang

2025-05-12 c26bb1aef89d6d0c3301dbcac638b1fc9e0e63d1

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

@@ -123,7 +123,7 @@
        from aps_part_plan  as pl
            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.work_order_no is not null
        where pl.document_number is not null and rt.work_order_no is not null
             and  rt.process_plan_start_day  <= rs.request_date
            order by rt.work_order_no,process_plan_start_day
    </select>