From 0d217eeff1f9d23844a54e8dd2ffebd8b4c2c1c7 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 20 一月 2026 16:20:30 +0800
Subject: [PATCH] feat(production): 迁移生产管控

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

diff --git a/src/main/resources/mapper/production/ProductStructureMapper.xml b/src/main/resources/mapper/production/ProductStructureMapper.xml
index 1833487..baa2ac7 100644
--- a/src/main/resources/mapper/production/ProductStructureMapper.xml
+++ b/src/main/resources/mapper/production/ProductStructureMapper.xml
@@ -25,7 +25,7 @@
         where ps.bom_id = #{bomId}
         order by ps.id
     </select>
-    <select id="listByproductModelId" 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,
@@ -33,11 +33,26 @@
                pm.model
         from
             product_structure ps
-                left join product_bom pb on ps.bom_id = pb.id
                 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
-        where pb.product_model_id = #{productModelId}
+        where ps.bom_id = #{bomId}
+        and ps.process_id=#{processId}
+        order by ps.id
+    </select>
+    <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
+        where ps.bom_id = #{bomId}
+          and ps.process_id=#{processId}
         order by ps.id
     </select>
 </mapper>

--
Gitblit v1.9.3