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

guoyuji

2024-07-11 51f4a4b53b8ee179c573cf3b122913f18706d4ca

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

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

@@ -583,7 +583,7 @@

    <select id="getPrintLabel">
        select o.order_id,
               o.customer_name,
               c.customer_abbreviation as customer_name,
               o.project,
               od.building_number,
               od.processing_note,
@@ -603,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>