From 4ecafe1bbc2f5da577f1f5dff307983f9fd71bde Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 24 九月 2025 16:57:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

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

diff --git a/north-glass-erp/src/main/resources/mapper/sd/BomDataMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/BomDataMapper.xml
index b50e245..05ee854 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/BomDataMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/BomDataMapper.xml
@@ -28,10 +28,13 @@
     </insert>
 
     <select id="getOrderBomDataMp">
-        SELECT DISTINCT product_id,product_name from sd.order_detail where order_id=#{orderId}
+        SELECT  product_id,product_name,SUM(quantity) as quantity,
+            SUM(gross_area) as area,SUM(perimeter) as perimeter from sd.order_detail where order_id=#{orderId}
+            GROUP BY product_id
     </select>
 
     <select id="getBOMDetails">
-        
+        select *,(consume*price) as materialPric from sd.bom_product as bp left join sd.bom_base as bb on bb.id=bp.base_id
+            where bp.product_id = #{productId} ORDER BY product_layer
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0