From 62af65df5cb991a29fcca1be433c1fdddff03b78 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 18 二月 2025 14:33:13 +0800
Subject: [PATCH] 流程卡合架功能完善

---
 north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
index b6d8398..2477586 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
+++ b/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>
@@ -1003,8 +1005,9 @@
 
             (a.product_id) as 'productId',
                     a.product_name as 'productName',
+                    p.remarks as 'remarks',
                     a.order_number as 'orderNumber'
-        from order_detail as a
+        from order_detail as a left join sd.product p on a.product_id=p.id
         where a.order_id = #{orderId}
         group by a.product_id
     </select>
@@ -1014,8 +1017,9 @@
 
         (a.product_id) as 'productId',
         a.product_name as 'productName',
+        p.remarks as 'remarks',
         a.order_number as 'orderNumber'
-        from order_detail as a
+        from sd.order_detail as a left join sd.product p on a.product_id=p.id
         where a.order_id = #{orderId} and a.product_id IN
         <foreach item="item" index="index" collection="productId" open="(" separator="," close=")">
             #{item}

--
Gitblit v1.8.0