Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyujie

2025-06-06 c4b9a339caff12e95f61c3d5dc950aafcc8c566c

 north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml

@@ -215,7 +215,7 @@
        LEFT JOIN sd.order_glass_detail AS ogd
        ON od.order_id = ogd.order_id
        AND od.order_number = ogd.order_number
        <if test="laminating == 'stepA'" >
        <if test="laminating == 'stepA' || laminating == 'stepC'" >
            AND ogd.`group` = (select `group`
            from sd.order_glass_detail
            where order_id = ogd.order_id
@@ -952,7 +952,7 @@
        LEFT JOIN sd.order_glass_detail AS ogd
        ON od.order_id = ogd.order_id
        AND od.order_number = ogd.order_number
        <if test="laminating == 'stepA'" >
        <if test="laminating == 'stepA' || laminating == 'stepC'" >
            AND ogd.`group` = (select `group`
            from sd.order_glass_detail
            where order_id = ogd.order_id