From da068b4738f50cdb37a8aa27d417283b2a4f11a8 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 27 四月 2026 16:32:47 +0800
Subject: [PATCH] feat(stock): 添加产品模型ID查询功能并优化库存服务

---
 src/main/resources/mapper/basic/ProductModelMapper.xml |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/basic/ProductModelMapper.xml b/src/main/resources/mapper/basic/ProductModelMapper.xml
index 317f5d9..f91fd3e 100644
--- a/src/main/resources/mapper/basic/ProductModelMapper.xml
+++ b/src/main/resources/mapper/basic/ProductModelMapper.xml
@@ -9,7 +9,6 @@
         <result column="product_id" property="productId" />
         <result column="model" property="model" />
         <result column="unit" property="unit" />
-        <result column="speculative_trading_name" property="speculativeTradingName" />
         <result column="tenant_id" property="tenantId" />
         <result column="product_name" property="productName" />
         <result column="product_id" property="productId" />
@@ -24,6 +23,22 @@
             </if>
             <if test="c.productName != null and c.productName != ''">
                 and p.product_name  like  concat('%',#{c.productName},'%')
+            </if>
+            <if test="c.topProductParentId != null and c.topProductParentId > 0">
+                and p.id in (
+                    WITH RECURSIVE product_tree AS (
+                        SELECT id
+                        FROM product
+                        WHERE id = #{c.topProductParentId}
+                        
+                        UNION ALL
+                        
+                        SELECT p.id
+                        FROM product p
+                        INNER JOIN product_tree pt ON p.parent_id = pt.id
+                    )
+                    select id from product_tree
+                )
             </if>
         </where>
         order by  pm.id
@@ -106,5 +121,10 @@
         left join product p on p.id = pm.product_id
         order by p.id,pm.id desc
     </select>
+    <select id="selectProductModelById" resultType="com.ruoyi.basic.pojo.ProductModel">
+        select pm.model,p.product_name,pm.id from product_model pm
+                 left join product p on p.id = pm.product_id
+                 where pm.id = #{productModelId}
+    </select>
 
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3