From 59edc2caf81ad578d95a000cc98a9902fadb4a6c Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 16 一月 2026 16:00:59 +0800
Subject: [PATCH] 库存调整

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

diff --git a/src/main/resources/mapper/production/ProductStructureMapper.xml b/src/main/resources/mapper/production/ProductStructureMapper.xml
index bf69ed9..e4a0795 100644
--- a/src/main/resources/mapper/production/ProductStructureMapper.xml
+++ b/src/main/resources/mapper/production/ProductStructureMapper.xml
@@ -2,15 +2,42 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.production.mapper.ProductStructureMapper">
 
-
-    <select id="listByProductId" resultType="com.ruoyi.production.pojo.ProductStructure">
+    <resultMap id="basicMap" type="com.ruoyi.production.pojo.ProductStructure">
+        <id property="id" column="id"/>
+        <result property="productModelId" column="product_model_id"/>
+        <result property="processId" column="process_id"/>
+        <result property="unitQuantity" column="unit_quantity"/>
+        <result property="demandedQuantity" column="demanded_quantity"/>
+        <result property="unit" column="unit"/>
+        <result property="tenantId" column="tenant_id"/>
+    </resultMap>
+    <select id="listBybomId" resultType="com.ruoyi.production.dto.ProductStructureDto">
         select ps.*,
-        p.product_name as product_name,
-        pp.name as  process_name
+               p.product_name,
+               pp.name as  process_name,
+               pm.product_id,
+               pm.model
         from
-        product_structure ps
-        left join product p on ps.process_id = p.id
-        left join product_process pp on ps.process_id = pp.process_id
-        where p.id = #{productId}
+            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}
+        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