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

guoyujie

2025-07-25 6de868b732a7d76c3a9cc735e88d93eecf7322d2

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

@@ -47,7 +47,7 @@
        from sd.order_detail  as od
        left join `order` as o
        on o.order_id=od.order_id
        where o.production_order!=2 and o.order_review=2
        where o.production_order!=2 and o.order_review=2 and o.create_order>0

        <if test="orderGlassDetail.orderId != null and orderGlassDetail.orderId != ''">
            and o.order_id regexp #{orderGlassDetail.orderId}