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

guoyujie

2025-03-27 d898b8a901f94aad9498bb2c4e54c328e0a14c95

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

@@ -174,7 +174,7 @@
        on a.order_id = b.order_id and a.order_number = b.order_number
        where a.order_id = #{orderId}
          and a.order_number = #{orderNumber}
          and a.child_width != b.width
          and(a.child_width != b.width or a.child_height != b.height)
        ) as c
    </select>