From 105cdb032c3cfa04a7131c2ef1bcf3b33b39ce7e Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 02 十二月 2024 11:39:20 +0800
Subject: [PATCH] 补片流程卡调整

---
 north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
index 678fe83..6f8eac5 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
+++ b/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}

--
Gitblit v1.8.0