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

chenlu

2024-06-19 3760bb766253ea2b2291e00d7bc5147bdee9bb44

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

@@ -615,7 +615,7 @@
               order_type,
               order_classify,
               batch,
               icon,
               o.icon,
               pack_type,
               delivery_date,
               al_type,
@@ -625,15 +625,23 @@
               contacts,
               delivery_address,
               od.processing_note,
               width,
               height,
               od.quantity
                width,
                height,
               od.quantity,
               od.order_number,
               fc.technology_number

        from sd.order as o
                 left join sd.order_detail as od on o.order_id = od.order_id
        where o.order_id = #{orderId}
          and od.order_number = #{orderNumber}
        left join flow_card as fc on o.order_id = fc.order_id and
                                                    od.order_number = fc.order_number
        where fc.process_id = #{processId}
        and fc.technology_number=#{technologyNumber}
       group by od.order_number,width,height

    </select>

    <select id="getPrintLabelCount">

    </select>