From f488a83954c1ca79d127fc43977d1f3d730c9dde Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 25 六月 2026 13:40:12 +0800
Subject: [PATCH] fix: 原材料入库移除审批
---
src/main/resources/mapper/stock/StockInRecordMapper.xml | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockInRecordMapper.xml b/src/main/resources/mapper/stock/StockInRecordMapper.xml
index f9c2b44..63b0fe5 100644
--- a/src/main/resources/mapper/stock/StockInRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockInRecordMapper.xml
@@ -34,6 +34,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 (
(sir.record_type IN ('6', '7', '18', '19', '20') and pl.purchase_contract_number like concat('%',#{params.salesContractNo},'%'))
@@ -55,6 +65,7 @@
sir.*,
p.product_name as product_name,
pm.model,
+ pm.thickness,
pm.unit,
u.nick_name as createBy,
CASE
@@ -81,6 +92,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 (
(sir.record_type IN ('6', '7', '18', '19', '20') and pl.purchase_contract_number like concat('%',#{params.salesContractNo},'%'))
--
Gitblit v1.9.3