From 663120b055dfdced4a67ce1d4160ae8ca19b4190 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期四, 12 三月 2026 18:04:21 +0800
Subject: [PATCH] 修改工单所需数量

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

diff --git a/src/main/resources/mapper/production/ProductStructureMapper.xml b/src/main/resources/mapper/production/ProductStructureMapper.xml
index 1833487..1dd30cd 100644
--- a/src/main/resources/mapper/production/ProductStructureMapper.xml
+++ b/src/main/resources/mapper/production/ProductStructureMapper.xml
@@ -10,6 +10,7 @@
         <result property="demandedQuantity" column="demanded_quantity"/>
         <result property="unit" column="unit"/>
         <result property="tenantId" column="tenant_id"/>
+        <result property="materialType" column="material_type"/>
     </resultMap>
     <select id="listBybomId" resultType="com.ruoyi.production.dto.ProductStructureDto">
         select ps.*,
@@ -25,7 +26,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 +34,11 @@
                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>
 </mapper>

--
Gitblit v1.9.3