Merge branch 'master' of http://bore.pub:10439/r/ERP_override

chenlu

2024-07-12 c88b41e9b5853e754dab02e344cf20e386582a8c

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

@@ -582,18 +582,19 @@

    <select id="getPrintLabel">
        select o.order_id,
               o.customer_name,
               c.customer_abbreviation as customer_name,
               o.project,
               od.building_number,
               od.processing_note,
               od.width,
               od.height,
               ogd.child_width as width,
               ogd.child_height as height,
               ogd.glass_child,
               ogd.process,
               e.type_name,
               opd.stock_id,
               od.quantity,
               od.other_columns
               od.other_columns,
               od.bend_radius
        from pp.optimize_detail opd
                 left join sd.`order` o on SUBSTR(opd.process_id, 1, 10) = o.order_id
                 left join sd.order_detail od
@@ -602,6 +603,7 @@
                           on SUBSTR(opd.process_id, 1, 10) = ogd.order_id and opd.order_sort = ogd.order_number and opd.layer=ogd.technology_number
                 left join sd.product p on od.product_id = p.id
                 left join sd.basic_glass_type e on e.type_id = p.type_id
        left join sd.customer c on c.id=o.customer_id
        where opd.project_no = #{projectNo}
        order by opd.stock_id
    </select>
@@ -610,8 +612,8 @@
        select o.order_id ,
               o.project,
               o.customer_id ,
               od.width,
               od.height,
               ogd.child_width as width,
               ogd.child_height as height,
               od.quantity,
               od.order_number as orderNumber,
               fc.technology_number as technologyNumber,
@@ -621,7 +623,8 @@
               ifnull(od.processing_note,'') as processing_note,
               bgt.type_name,
               od.other_columns,
               od.building_number
               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