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

guoyuji

2024-10-12 acaf8ca38cd32bc474bb46b593db2a8d75b9bfdd

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

@@ -142,7 +142,7 @@
        from sd.order_detail as od
        left join sd.order as o
        on od.order_id =o.order_id
        where od.order_id = #{orderId} and o.production_order!=2
        where FIND_IN_SET(od.order_id,#{orderId})    and o.production_order!=2
        <if test="orderDetail.orderId != null and orderDetail.orderId != ''">
            and od.order_id regexp #{orderDetail.orderId}
        </if>