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

guoyuji

2024-06-25 f94dec7ddbd0aa96f642f04d41d0f74ca0edfdc7

 north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml

@@ -764,5 +764,29 @@
        group by a.glass_child,a.child_width,a.child_height
    </select>

    <select id="getOrderProductDistinctById">
        select

            (a.product_id) as 'productId',
                    a.product_name as 'productName',
                    a.order_number as 'orderNumber'
        from order_detail as a
        where a.order_id = #{orderId}
        group by a.product_id
    </select>

    <select id="getOrderProductByProductId">
        select
            *
        from order_detail as a
        where a.order_id = #{orderId}
        and a.product_id = #{productId}
        order by id;
    </select>






</mapper>