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

huangjiayang

2025-05-12 c26bb1aef89d6d0c3301dbcac638b1fc9e0e63d1

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

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

@@ -51,7 +51,7 @@
            left join aps_plate_plan plan on detail.doc_no = plan.document_number
        <where>  
            <if test="workOrderNo != null  and workOrderNo != ''"> and detail.doc_no = #{workOrderNo}</if>
            <if test="requireTrackId != null  and requireTrackId != ''"> and detail.require_track_id = #{requireTrackId}</if>
            <if test="requireTrackId != null  and requireTrackId != ''"> and detail.require_track_id = '${requireTrackId}'</if>
            <if test="mainPartNumber != null  and mainPartNumber != ''"> and plan.main_part_number = #{mainPartNumber}</if>
            <if test="hasDelayRisk != null  and hasDelayRisk != ''"> and require.has_delay_risk = #{hasDelayRisk}</if>
        </where>