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

wuyouming666

2025-03-06 e39a1f7cd00553c2eca8b9cc6ac9fbb8ef2ff532

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

@@ -168,11 +168,14 @@

    <select id="getDifferentSizeNumber">
       select if(count(id)>1,1,0) from (select
          id
          a.id
        from order_glass_detail as a
        left join order_detail as b
        on a.order_id = b.order_id and a.order_number = b.order_number
        and a.child_width != b.width
        where a.order_id = #{orderId}
          and a.order_number = #{orderNumber}
        group by child_width,child_height) as c
        ) as c
    </select>

    <select id="getOrderGlassDetailByProductIdGlassChild" >