From 7d253993d7d9fe2fdfa287a6cec76e32bf0754c7 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 16 三月 2026 13:37:11 +0800
Subject: [PATCH] bom添加产品编码

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

diff --git a/src/main/resources/mapper/production/ProductStructureMapper.xml b/src/main/resources/mapper/production/ProductStructureMapper.xml
index 255173e..e5e692e 100644
--- a/src/main/resources/mapper/production/ProductStructureMapper.xml
+++ b/src/main/resources/mapper/production/ProductStructureMapper.xml
@@ -9,21 +9,36 @@
         <result property="unitQuantity" column="unit_quantity"/>
         <result property="demandedQuantity" column="demanded_quantity"/>
         <result property="unit" column="unit"/>
-        <result property="diskQuantity" column="disk_quantity"/>
         <result property="tenantId" column="tenant_id"/>
     </resultMap>
 
-    <select id="listByproductModelId" resultType="com.ruoyi.production.dto.ProductStructureDto">
+    <select id="listByBomId" resultType="com.ruoyi.production.dto.ProductStructureDto">
         select ps.*,
-        pm.speculative_trading_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_process pp on ps.process_id = pp.id
-        where pm.id = #{productId}
+               pm.product_name as product_name,
+               pp.name         as process_name,
+               pms.product_id as product_id,
+               pms.model       as model,
+               pms.material_code       as productCode
+        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 ps.*,
+               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}
         order by ps.id
     </select>
 </mapper>

--
Gitblit v1.9.3