提交扫码枪相关程序

guoyujie

2025-05-21 d6db1b52d9ca9ee17fd5f28ad2b7ac9570f5a2a0

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

@@ -1339,7 +1339,7 @@
        rw.examine_time,
--         GROUP_CONCAT(ogd.glass_child SEPARATOR '+') as workProcessName
        CASE
        WHEN #{laminating} = 'laminating' THEN GROUP_CONCAT(ogd.glass_child SEPARATOR '+')
        WHEN LOCATE('step',#{laminating})>0 THEN GROUP_CONCAT(ogd.glass_child SEPARATOR '+')
        ELSE MAX( ogd.glass_child )
        END AS workProcessName
        FROM
@@ -1368,12 +1368,25 @@
            and od.edging_type regexp #{teamOutputDTO.edgingType}
        </if>

        GROUP BY
        rw.reporting_work_id,
        rw.process_id,
        rw.this_process,
        rw.teams_groups_name,
        rwd.order_number
        <choose>
            <when test="laminating == ''">
                GROUP BY
                rw.reporting_work_id,
                rw.process_id,
                rw.this_process,
                rw.teams_groups_name,
                rwd.order_number,
                rwd.technology_number
            </when>
            <otherwise>
                GROUP BY
                rw.reporting_work_id,
                rw.process_id,
                rw.this_process,
                rw.teams_groups_name,
                rwd.order_number
            </otherwise>
        </choose>
        ORDER BY
        rw.this_process,
        rw.process_id,
@@ -1468,12 +1481,25 @@
            and od.edging_type regexp #{teamOutputDTO.edgingType}
        </if>

        GROUP BY
        rw.reporting_work_id,
        rw.process_id,
        rw.this_process,
        rw.teams_groups_name,
        rwd.order_number
        <choose>
            <when test="laminating == ''">
                GROUP BY
                rw.reporting_work_id,
                rw.process_id,
                rw.this_process,
                rw.teams_groups_name,
                rwd.order_number,
                rwd.technology_number
            </when>
            <otherwise>
                GROUP BY
                rw.reporting_work_id,
                rw.process_id,
                rw.this_process,
                rw.teams_groups_name,
                rwd.order_number
            </otherwise>
        </choose>
        ORDER BY
        rw.this_process,
        rw.process_id,
@@ -2070,12 +2096,25 @@
        <if test="teamOutputDTO.edgingType != null and teamOutputDTO.edgingType != ''">
            and od.edging_type regexp #{teamOutputDTO.edgingType}
        </if>
        GROUP BY
        rw.reporting_work_id,
        rw.process_id,
        rw.this_process,
        rw.teams_groups_name,
        rwd.order_number
        <choose>
            <when test="laminating == ''">
                GROUP BY
                rw.reporting_work_id,
                rw.process_id,
                rw.this_process,
                rw.teams_groups_name,
                rwd.order_number,
                rwd.technology_number
            </when>
            <otherwise>
                GROUP BY
                rw.reporting_work_id,
                rw.process_id,
                rw.this_process,
                rw.teams_groups_name,
                rwd.order_number
            </otherwise>
        </choose>
        ORDER BY
        rw.this_process,
        rw.process_id,