Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

chenlu

2024-05-30 4ee53f8b43e850d2b35d5b1eb979d7b0bc2fbcd4

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

@@ -424,6 +424,7 @@
        select * from  sd.order where create_time between #{selectTime1} and #{selectTime2} and
                                      position(#{orderId} in order_id ) and position(#{project} in project)
        and processing_card=2
        order by create_time desc
    </select>

    <select id="selectPrintMp">
@@ -434,8 +435,8 @@
               o.project,
               ogd.technology_number,
               ogd.glass_address,
               od.quantity,
               ogd.total_area,
               sum(od.quantity) as quantity,
               sum(ogd.total_area) as total_area,
               od.product_name,
               ogd.glass_child,
               fc.founder,
@@ -515,4 +516,32 @@
        set fc.layout_status=1
        where fc.process_id = #{processId}
    </update>

    <select id="getPrintLabel">
        select c.customer_name,
               c.order_id,
               e.type_name,
               b.remarks,
               c.project,
                a.child_width,
               a.child_height,
               sum(b.quantity) as quantity,
               a.glass_child,
               b.processing_note
        from sd.order_glass_detail as a
                 left join sd.order_detail as b
                           on a.order_id = b.order_id
                               and a.order_number = b.order_number
                 left join sd.`order` as c
                           on c.order_id = a.order_id
                 left join flow_card as d
                           on d.order_id = a.order_id and d.order_number = a.order_number and
                              d.technology_number = a.technology_number
                 left join sd.product e
                           on e.id = b.product_id
        where d.process_id = #{processId}
          and d.technology_number = #{technologyNumber}
        group by a.glass_child, a.child_width, a.child_height
        order by d.technology_number
    </select>
</mapper>