From 4d99e718536ac77dff26dde8da7a59cdc9b52de8 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 20 五月 2026 10:13:57 +0800
Subject: [PATCH] fix:1.生产报工优化
---
src/main/resources/mapper/stock/StockOutRecordMapper.xml | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockOutRecordMapper.xml b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
index 6b50711..3c21f33 100644
--- a/src/main/resources/mapper/stock/StockOutRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
@@ -18,19 +18,29 @@
</resultMap>
<select id="listPage" resultType="com.ruoyi.stock.dto.StockOutRecordDto">
+ WITH RECURSIVE product_tree AS (
+ SELECT id
+ FROM product
+ WHERE id = #{params.topParentProductId}
+
+ UNION ALL
+
+ SELECT p.id
+ FROM product p
+ INNER JOIN product_tree pt ON p.parent_id = pt.id
+ )
SELECT
sor.*,
p.product_name as productName,
pm.model,
pm.unit,
+ pm.material_code as materialCode,
u.nick_name as createBy
FROM stock_out_record as sor
LEFT JOIN product_model as pm on sor.product_model_id = pm.id
LEFT JOIN product as p on pm.product_id = p.id
- LEFT JOIN product p2 ON p.parent_id = p2.id
LEFT JOIN sys_user as u on sor.create_user = u.user_id
<where>
- (p2.product_name != '鍗婃垚鍝�' OR p2.product_name IS NULL)
<if test="params.timeStr != null and params.timeStr != ''">
and sor.create_time like concat('%',#{params.timeStr},'%')
</if>
@@ -42,16 +52,31 @@
</if>
<if test="params.recordType != null and params.recordType != ''">
and sor.record_type = #{params.recordType}
+ </if>
+ <if test="params.topParentProductId != null and params.topParentProductId > 0">
+ and p.id in (select id from product_tree)
</if>
</where>
order by sor.id desc
</select>
<select id="listStockOutRecordExportData" resultType="com.ruoyi.stock.execl.StockOutRecordExportData">
+ WITH RECURSIVE product_tree AS (
+ SELECT id
+ FROM product
+ WHERE id = #{params.topParentProductId}
+
+ UNION ALL
+
+ SELECT p.id
+ FROM product p
+ INNER JOIN product_tree pt ON p.parent_id = pt.id
+ )
SELECT
sor.*,
p.product_name as productName,
pm.model,
pm.unit,
+ pm.material_code as materialCode,
u.nick_name as createBy
FROM stock_out_record as sor
LEFT JOIN product_model as pm on sor.product_model_id = pm.id
@@ -70,8 +95,11 @@
<if test="params.recordType != null and params.recordType != ''">
and sor.record_type = #{params.recordType}
</if>
+ <if test="params.topParentProductId != null and params.topParentProductId > 0">
+ and p.id in (select id from product_tree)
+ </if>
</where>
order by sor.id desc
</select>
-</mapper>
+</mapper>
\ No newline at end of file
--
Gitblit v1.9.3