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

chenlu

2025-07-25 a9ffa322f0cf794a7da8182e1be4ca34f5ea19b6

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

@@ -167,14 +167,14 @@
    </update>

    <select id="getDifferentSizeNumber">
       select if(count(id)>1,1,0) from (select
       select if(count(id)>0,1,0) from (select
          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}
          and a.child_width != b.width
          and(a.child_width != b.width or a.child_height != b.height)
        ) as c
    </select>

@@ -202,4 +202,29 @@

    </select>

    <select id="getMaxIdByGroup" >
        select max(id) from sd.order_glass_detail as a
        where a.order_id = #{orderId}
          and a.order_number = #{orderNumber}
          and a.`group` = #{group}

    </select>


    <select id="getMinTechnologyNumberByGroup" >
        select min(technology_number) from sd.order_glass_detail as a
        where a.order_id = #{orderId}
          and a.order_number = #{orderNumber}
          and a.`group` = #{group}

    </select>

    <select id="getMaxTechnologyNumberByGroup" >
        select max(technology_number) from sd.order_glass_detail as a
        where a.order_id = #{orderId}
          and a.order_number = #{orderNumber}
          and a.`group` = #{group}

    </select>

</mapper>