廖井涛
2025-07-18 585335a28844a969e3efe55389e5b9862513575b
north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -1433,6 +1433,7 @@
        rw.reviewed,
        rw.examine_time,
        rw.device_name,
        --         GROUP_CONCAT(ogd.glass_child SEPARATOR '+') as workProcessName
        CASE
        WHEN LOCATE('step',#{laminating})>0 THEN GROUP_CONCAT(ogd.glass_child SEPARATOR '+')
        ELSE MAX( ogd.glass_child )
@@ -1444,9 +1445,9 @@
        left join sd.order_glass_detail as ogd on ogd.order_id=fc.order_id and ogd.order_number=fc.order_number and ogd.technology_number=fc.technology_number
        left join sd.order_detail as od  on od.order_id=ogd.order_id and od.order_number=ogd.order_number
        left join sd.`order` as o on o.order_id=od.order_id
        where o.create_order>0 and rw.reviewed_state>=0 and rwd.completed_quantity>0
        and date(rw.reporting_work_time) >= #{date[0]}
        and date(rw.reporting_work_time) <= #{date[1]}
        where o.create_order>0 and rw.reviewed_state>=0 and rwd.completed_quantity>0 and
        rw.reporting_work_time >= #{date[0]}
        AND rw.reporting_work_time <  #{date[1]}
        and position(#{process} in rw.this_process)
        <choose>
            <when test="laminating == ''">