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

chenlu

2024-12-05 a7cc9c3be58bccd868bc8c12ed57c2b90fedc6b8

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

@@ -92,6 +92,7 @@
        <result column="glass_child" property="glassChild"/>
        <result column="child_width" property="childWidth"/>
        <result column="child_height" property="childHeight"/>
        <result column="arc" property="arc"/>
        <result column="icon" property="icon"/>
        <result column="process" property="process"/>
        <result column="area" property="area"/>
@@ -130,7 +131,7 @@
           a.total_area,
           b.edging_type,
           a.child_width,
           a.child_height,
           a.child_height,a.arc,
           a.icon,
           a.area,
           b.quantity,
@@ -154,7 +155,8 @@
                a.area = #{item.area},
                a.total_area = #{item.area}*b.quantity,
                a.icon = #{item.icon},
                a.process = #{item.process}
                a.process = #{item.process},
                a.arc = #{item.arc}
            where
                a.order_id = b.order_id
                and a.order_id = #{item.orderId}