blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
guoyujie
2025-08-11 e51e45f2cabcc4628ce93e55c7c3806b1b760161 
 north-glass-erp/src/main/resources/mapper/pp/Report.xml


@@ -2198,6 +2198,9 @@


        <if test="teamOutputDTO.edgingType != null and teamOutputDTO.edgingType != ''">


            and od.edging_type regexp #{teamOutputDTO.edgingType}


        </if>


        <if test="teamOutputDTO.deviceName != null and teamOutputDTO.deviceName != ''">


            and rw.device_name regexp #{teamOutputDTO.deviceName}


        </if>


        <choose>


            <when test="laminating == ''">


                GROUP BY


@@ -2760,6 +2763,7 @@


                       where


                           e.id is not null


                         and (e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num)>0 group by f.process_id, f.order_number,


        f.technology_number ORDER BY f.process_id, f.order_number,


        f.technology_number) as g


                            <choose>


                                <when test="laminating == 'stepC' and process == '预压'">