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

廖井涛

2024-07-01 50efd9f19463da742e8c7b751bb4ab2c97acbf61

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

@@ -24,6 +24,7 @@
                            remarks,
                            bend_radius,
                            edging_type,
                            arch_rise,
                            weight,
                            perimeter,
                            other_columns
@@ -49,6 +50,7 @@
            #{orderDetail.remarks},
            #{orderDetail.bendRadius},
            #{orderDetail.edgingType},
            #{orderDetail.archRise},
            #{orderDetail.weight},
            #{orderDetail.perimeter},
            #{orderDetail.otherColumns}
@@ -762,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>