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

guoyuji

2024-07-02 1558c2fa4a3a1479d53977a4b46c1dda18192243

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

@@ -563,6 +563,30 @@
        order by opd.stock_id
    </select>

    <select id="getPrintLabel1">
        select o.order_id ,
               o.project,
               o.customer_id ,
               od.width,
               od.height,
               od.quantity,
               od.order_number as orderNumber,
               fc.technology_number as technologyNumber,
               ogd.glass_child,
               c.customer_abbreviation as customer_name,
               ifnull(od.processing_note,'') as processing_note
        from sd.order as o
                 left join sd.order_detail as od on o.order_id = od.order_id
                 left join pp.flow_card as fc on o.order_id = fc.order_id and
                                                 od.order_number = fc.order_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.order_glass_detail ogd on ogd.order_id=od.order_id and ogd.order_number=od.order_number
        where fc.process_id = #{processId}
          and fc.technology_number=#{technologyNumber}
        group by od.order_number,od.width,od.height
    </select>

    <select id="printFlowCardDetailsMp">
        SELECT fc.process_id,
               fc.order_number,