1、代码补充提交

ZengTao

2025-09-11 924ce82faeec6d896fcdc360b279215e84b69fb9

 hangzhoumesParent/common/servicebase/src/main/resources/mapper/FlowCardMapper.xml

@@ -26,9 +26,7 @@
        left join sd.product_detail as pd
        on pd.prod_id = od.product_id and pd.glass_sort = ogd.technology_number
        where fc.process_id = #{processId}
        <if test="technologyNumber != 0">
            and a.layer = #{technologyNumber}
        </if>

        <if test="technologyNumber != 0">
            and position(fc.technology_number in #{technologyNumber})
        </if>
@@ -91,35 +89,43 @@

    <select id="selectLabel" resultType="java.util.Map">
        select fc.process_id,
               o.order_id,
               o.project,
               o.customer_id,
               ogd.child_width                as width,
               ogd.child_height               as height,
               od.quantity,
               od.order_number                as orderNumber,
               fc.technology_number           as technologyNumber,
               ogd.glass_child,
               ogd.process,
               c.customer_abbreviation        as customer_name,
               ifnull(od.processing_note, '') as processing_note,
               bgt.type_name,
               od.other_columns,
               od.building_number,
               od.bend_radius
        o.order_id,
        o.project,
        o.customer_id,
        ogd.child_width as width,
        ogd.child_height as height,
        od.quantity,
        od.order_number as orderNumber,
        fc.technology_number as technologyNumber,
        ogd.glass_child,
        ogd.process,
        c.customer_abbreviation as customer_name,
        ifnull(od.processing_note, '') as processing_note,
        bgt.type_name,
        od.other_columns,
        od.building_number,
        od.bend_radius
        from sd.order as o
                 left join sd.order_detail as od on o.order_id = od.order_id
                 left join sd.order_glass_detail as ogd
                           on ogd.order_id = od.order_id and ogd.order_number = od.order_number
                 left join pp.flow_card as fc on o.order_id = fc.order_id and
                                                 od.order_number = fc.order_number and
                                                 fc.technology_number = ogd.technology_number
                 left join sd.product pt on pt.id = od.product_id
                 left join sd.customer c on c.id = o.customer_id
                 left join sd.basic_glass_type bgt on bgt.type_id = pt.type_id
        where fc.process_id = #{processId}
          and fc.technology_number = #{technologyNumber}
        group by od.order_number, od.width, od.height
        left join sd.order_detail as od on o.order_id = od.order_id
        left join sd.order_glass_detail as ogd
        on ogd.order_id = od.order_id and ogd.order_number = od.order_number
        left join pp.flow_card as fc on o.order_id = fc.order_id and
        od.order_number = fc.order_number and
        fc.technology_number = ogd.technology_number
        left join sd.product pt on pt.id = od.product_id
        left join sd.customer c on c.id = o.customer_id
        left join sd.basic_glass_type bgt on bgt.type_id = pt.type_id
        where fc.process_id in (
        <foreach collection="processId" item="item" separator=",">
        #{item}
    </foreach>
        )
        and fc.technology_number in (
        <foreach collection="technologyNumber" item="items" separator=",">
            #{items}
        </foreach>
        )
        group by fc.process_id, fc.technology_number, od.order_number, od.width, od.height
    </select>