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

huang

2024-11-12 54c2f0fda44123782e5241ff7d1ad6e81c95f2b2

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

@@ -27,6 +27,7 @@
                            arch_rise,
                            weight,
                            perimeter,
                            monolithic_perimeter,
                            other_columns
                          )
        values
@@ -53,6 +54,7 @@
            #{orderDetail.archRise},
            #{orderDetail.weight},
            #{orderDetail.perimeter},
            #{orderDetail.monolithicPerimeter},
            #{orderDetail.otherColumns}
             )
        </foreach>
@@ -63,7 +65,8 @@
            update order_detail as a
            set
                a.price = #{item.price},
                a.gross_amount = #{item.grossAmount}
                a.gross_amount = #{item.grossAmount},
                a.other_columns = #{item.otherColumns}
            where
                a.order_id = #{item.orderId} and
                a.order_number =  #{item.orderNumber}