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

chenlu

2025-03-07 3ab330b8aefb3cd781c9b8730b4ab7ac65e7e9d7

 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,a.child_width,b.width
        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
        where a.order_id = #{orderId}
          and a.order_number = #{orderNumber}
        group by child_width,child_height) as c
          and a.child_width != b.width
        ) as c
    </select>

    <select id="getOrderGlassDetailByProductIdGlassChild" >