From 03ffc2598a261d1dc19e77b559268bb84032a389 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 21 四月 2026 08:51:45 +0800
Subject: [PATCH] feat(approve): 新增销售审批功能并优化审批流程
---
src/main/resources/mapper/stock/StockOutRecordMapper.xml | 39 +++++++++++++++++++++++++++------------
1 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockOutRecordMapper.xml b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
index a441de9..0cb970c 100644
--- a/src/main/resources/mapper/stock/StockOutRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
@@ -18,32 +18,47 @@
</resultMap>
<select id="listPage" resultType="com.ruoyi.stock.dto.StockOutRecordDto">
+ WITH RECURSIVE product_tree AS (
+ SELECT id, product_name, parent_id, 1 as level
+ FROM product
+ WHERE id = #{ew.topParentProductId}
+
+ UNION ALL
+
+ SELECT p.id, p.product_name, p.parent_id, pt.level + 1
+ 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,
- u.nick_name as createBy
+ u.nick_name as createBy,
+ p.id as product_id,
+ pt.level as product_level
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
+ INNER JOIN product_model as pm on sor.product_model_id = pm.id
+ INNER JOIN product as p on pm.product_id = p.id
LEFT JOIN sys_user as u on sor.create_user = u.user_id
+ INNER JOIN product_tree pt on p.id = pt.id
<where>
- <if test="params.timeStr != null and params.timeStr != ''">
- and sor.create_time like concat('%',#{params.timeStr},'%')
+ <if test="ew.productName != null and ew.productName !=''">
+ AND (p.product_name LIKE CONCAT('%',#{ew.productName},'%') OR pm.model LIKE CONCAT('%',#{ew.productName},'%'))
</if>
- <if test="params.productName != null and params.productName != ''">
- and p.product_name like concat('%',#{params.productName},'%')
+ <if test="ew.recordType != null and ew.recordType !=''">
+ AND sor.record_type = #{ew.recordType}
</if>
- <if test="params.type != null and params.type != ''">
- and sor.type = #{params.type}
+ <if test="ew.model != null and ew.model !=''">
+ AND pm.model = #{ew.model}
</if>
- <if test="params.recordType != null and params.recordType != ''">
- and sor.record_type = #{params.recordType}
+ <if test="ew.timeStr != null and ew.timeStr !=''">
+ AND DATE(sor.create_time) = #{ew.timeStr}
</if>
</where>
- order by sor.id desc
+ ORDER BY pt.level ASC, sor.create_time DESC
</select>
+
<select id="listStockOutRecordExportData" resultType="com.ruoyi.stock.execl.StockOutRecordExportData">
SELECT
sor.*,
--
Gitblit v1.9.3