合并相关文件

你好啊

2024-08-06 a27ce393f9924c044dfe743b220f0300f33e79d3

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

@@ -154,11 +154,11 @@

    <insert id="insertDeliveryDetail"  useGeneratedKeys="true" >
        insert into sd.delivery_detail (delivery_id,delivery_number,order_number,
                                        area,order_id,quantity,money,delivery_detail_remakes,delivery_detail_state,other_columns,create_time,price)
                                        area,order_id,quantity,money,delivery_detail_remakes,delivery_detail_state,other_columns,create_time,price,other_money)
        values (
                   #{number} ,#{deliveryNumber},#{orderDetail.orderNumber},#{orderDetail.computeArea}*#{orderDetail.deliveryDetail.quantity},
                #{orderDetail.orderId},#{orderDetail.deliveryDetail.quantity},
                #{deliveryDetailMoney},'',1,#{orderDetail.otherColumns},now(),#{orderDetail.price}
                #{deliveryDetailMoney},'',1,#{orderDetail.otherColumns},now(),#{orderDetail.price},#{otherMoneys}
               )
    </insert>

@@ -183,6 +183,7 @@
               od.height,
               od.shape,
               fgi.actual_signal_area,
               od.area,
               od.gross_area,
               od.compute_area,
               od.compute_gross_area,
@@ -372,6 +373,7 @@
               od.height,
               od.shape,
               fgi.actual_signal_area,
               od.area,
               od.gross_area,
               od.compute_area,
               od.compute_gross_area,