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

chenlu

2024-12-02 9866aa9501cd64269857bcc6c75a77a2fcd4c9d4

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

@@ -1011,7 +1011,8 @@
               ifnull(od.processing_note,"") as processingNote,
               ifnull(od.building_number,"") as buildingNumber,
               dd.price,
               od.other_columns
               od.other_columns,
               od.remarks
        from delivery_detail dd
                 left join order_detail od on dd.order_id = od.order_id and dd.order_number = od.order_number
                 left join product p on od.product_id = p.id
@@ -1047,10 +1048,12 @@
               od.quantity,
               od.gross_amount,
               od.compute_gross_area,
               od.area,
               ifnull(od.processing_note,"") as processingNote,
               ifnull(od.building_number,"") as buildingNumber,
               od.price,
               od.other_columns
               od.other_columns,
               od.remarks
        from  order_detail od
        where  od.order_id = #{orderId}
          and od.product_id = #{productId}