From 91acbe8b56194bbd834b1169b5578de8a5ed442c Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期六, 14 三月 2026 17:53:10 +0800
Subject: [PATCH] fix: BOM产品查询调整、重命名字段

---
 src/main/resources/mapper/production/ProductStructureMapper.xml |   42 +++++++++++++++++++++---------------------
 1 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/main/resources/mapper/production/ProductStructureMapper.xml b/src/main/resources/mapper/production/ProductStructureMapper.xml
index e4a0795..8a707ba 100644
--- a/src/main/resources/mapper/production/ProductStructureMapper.xml
+++ b/src/main/resources/mapper/production/ProductStructureMapper.xml
@@ -11,33 +11,33 @@
         <result property="unit" column="unit"/>
         <result property="tenantId" column="tenant_id"/>
     </resultMap>
-    <select id="listBybomId" resultType="com.ruoyi.production.dto.ProductStructureDto">
+
+    <select id="listByBomId" resultType="com.ruoyi.production.dto.ProductStructureDto">
         select ps.*,
-               p.product_name,
-               pp.name as  process_name,
-               pm.product_id,
-               pm.model
-        from
-            product_structure ps
-                left join product_model pm on ps.product_model_id = pm.id
-                left join product p on pm.product_id = p.id
-                left join product_process pp on ps.process_id = pp.id
+               pm.product_name as product_name,
+               pp.name         as process_name,
+               pms.product_id as product_id,
+               pms.model       as model
+        from product_structure ps
+                 left join product_material_sku pms on ps.product_model_id = pms.id
+                 left join product_material pm on pms.product_id = pm.id
+                 left join product_process pp on ps.process_id = pp.id
         where ps.bom_id = #{bomId}
         order by ps.id
     </select>
-    <select id="listBybomAndProcess" resultType="com.ruoyi.production.dto.ProductStructureDto">
+
+    <select id="listByBomAndProcess" resultType="com.ruoyi.production.dto.ProductStructureDto">
         select ps.*,
-               p.product_name,
-               pp.name as  process_name,
-               pm.product_id,
-               pm.model
-        from
-            product_structure ps
-                left join product_model pm on ps.product_model_id = pm.id
-                left join product p on pm.product_id = p.id
-                left join product_process pp on ps.process_id = pp.id
+               pm.product_name as product_name,
+               pp.name         as process_name,
+               pms.product_id as product_id,
+               pms.model       as model
+        from product_structure ps
+                 left join product_material_sku pms on ps.product_model_id = pms.id
+                 left join product_material pm on pms.product_id = pm.id
+                 left join product_process pp on ps.process_id = pp.id
         where ps.bom_id = #{bomId}
-        and ps.process_id=#{processId}
+          and ps.process_id = #{processId}
         order by ps.id
     </select>
 </mapper>

--
Gitblit v1.9.3