From f5c9d4c54da8d60d8b798f67679263a8aec1607f Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 15 四月 2026 11:16:48 +0800
Subject: [PATCH] feat: 库存区分产品大类
---
src/main/resources/mapper/basic/ProductModelMapper.xml | 53 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 47 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/basic/ProductModelMapper.xml b/src/main/resources/mapper/basic/ProductModelMapper.xml
index e12b63c..cb80816 100644
--- a/src/main/resources/mapper/basic/ProductModelMapper.xml
+++ b/src/main/resources/mapper/basic/ProductModelMapper.xml
@@ -9,25 +9,57 @@
<result column="product_id" property="productId" />
<result column="model" property="model" />
<result column="unit" property="unit" />
+ <result column="thickness" property="thickness" />
<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" />
</resultMap>
+
<select id="listPageProductModel" resultType="com.ruoyi.basic.pojo.ProductModel">
- select pm.*,p.product_name
- from product_model pm
- left join product p on pm.product_id = p.id
+ WITH RECURSIVE product_tree AS (
+ SELECT
+ id,
+ product_name,
+ id AS top_id,
+ product_name AS top_name
+ FROM product
+ WHERE parent_id IS NULL OR parent_id = 0
+
+ UNION ALL
+
+ SELECT
+ p.id,
+ p.product_name,
+ t.top_id,
+ t.top_name
+ FROM product p
+ INNER JOIN product_tree t ON p.parent_id = t.id
+ )
+ SELECT
+ pm.*,
+ pt.product_name AS productName,
+ pt.top_name AS parentName
+ FROM product_model pm
+ LEFT JOIN product_tree pt ON pm.product_id = pt.id
<where>
+ <if test="c.parentId != null">
+ AND pt.top_id = #{c.parentId}
+ </if>
+
<if test="c.model != null and c.model != ''">
- and pm.model like concat('%',#{c.model},'%')
+ AND pm.model LIKE CONCAT('%', #{c.model}, '%')
</if>
<if test="c.productName != null and c.productName != ''">
- and p.product_name like concat('%',#{c.productName},'%')
+ AND pt.product_name LIKE CONCAT('%', #{c.productName}, '%')
+ </if>
+ <if test="c.parentName != null and c.parentName != ''">
+ AND pt.top_name LIKE CONCAT('%', #{c.parentName}, '%')
</if>
</where>
- order by pm.id
+ ORDER BY pm.id DESC
</select>
+
<select id="selectLatestRecord" resultType="com.ruoyi.basic.pojo.ProductModel">
SELECT * FROM product_model
ORDER BY create_time DESC, id DESC
@@ -97,5 +129,14 @@
ORDER BY pm.id DESC
</select>
+ <select id="getProductAndModelList" resultType="java.util.Map">
+ select p.id as id,
+ pm.id as modelId,
+ p.product_name as productName ,
+ pm.model as model
+ from product_model pm
+ left join product p on p.id = pm.product_id
+ order by p.id,pm.id desc
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3