From fbda2f16d63dcad15de13ab0997ef51257e5815b Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 26 六月 2026 10:53:52 +0800
Subject: [PATCH] feat: 更新定时任务调度逻辑，支持启用状态下重新调度任务
---
src/main/resources/mapper/stock/StockOutRecordMapper.xml | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockOutRecordMapper.xml b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
index 3e72c71..784e2b3 100644
--- a/src/main/resources/mapper/stock/StockOutRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
@@ -45,6 +45,16 @@
<if test="params.productName != null and params.productName != ''">
and p.product_name like concat('%',#{params.productName},'%')
</if>
+ <if test="params.topParentProductId != null and params.topParentProductId > 0">
+ and p.id in (
+ WITH RECURSIVE product_tree AS (
+ SELECT id FROM product WHERE id = #{params.topParentProductId}
+ UNION ALL
+ SELECT p2.id FROM product p2 INNER JOIN product_tree pt ON p2.parent_id = pt.id
+ )
+ SELECT id FROM product_tree
+ )
+ </if>
<if test="params.salesContractNo != null and params.salesContractNo != ''">
and (
(sor.record_type IN ('9', '16', '12') and pl.purchase_contract_number like concat('%',#{params.salesContractNo},'%'))
@@ -65,6 +75,7 @@
SELECT
sor.*,
p.product_name as productName,
+ pm.thickness,
pm.model,
pm.unit,
u.nick_name as createBy,
@@ -88,6 +99,16 @@
<if test="params.productName != null and params.productName != ''">
and p.product_name like concat('%',#{params.productName},'%')
</if>
+ <if test="params.topParentProductId != null and params.topParentProductId > 0">
+ and p.id in (
+ WITH RECURSIVE product_tree AS (
+ SELECT id FROM product WHERE id = #{params.topParentProductId}
+ UNION ALL
+ SELECT p2.id FROM product p2 INNER JOIN product_tree pt ON p2.parent_id = pt.id
+ )
+ SELECT id FROM product_tree
+ )
+ </if>
<if test="params.salesContractNo != null and params.salesContractNo != ''">
and (
(sor.record_type IN ('9', '16', '12') and pl.purchase_contract_number like concat('%',#{params.salesContractNo},'%'))
--
Gitblit v1.9.3