From fb4f2c9223a17aaefaa27a59d1d2b61460157c7d Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 25 六月 2026 11:22:08 +0800
Subject: [PATCH] fix: 库存修改为大类展示
---
src/main/resources/mapper/stock/StockOutRecordMapper.xml | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 56 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockOutRecordMapper.xml b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
index a441de9..784e2b3 100644
--- a/src/main/resources/mapper/stock/StockOutRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
@@ -23,17 +23,44 @@
p.product_name as productName,
pm.model,
pm.unit,
- u.nick_name as createBy
+ pm.thickness,
+ u.nick_name as createBy,
+ CASE
+ WHEN sor.record_type IN ('9', '16', '12') THEN pl.purchase_contract_number
+ ELSE sl.sales_contract_no
+ END as salesContractNo
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 sys_user as u on sor.create_user = u.user_id
+ LEFT JOIN sales_ledger_product as slp_link on slp_link.id = COALESCE(sor.sales_ledger_product_id, sor.record_id)
+ LEFT JOIN sales_ledger as sl on sl.id = COALESCE(sor.sales_ledger_id, slp_link.sales_ledger_id, sor.record_id)
+ and sor.record_type NOT IN ('9', '16', '12')
+ LEFT JOIN purchase_ledger as pl on pl.id = COALESCE(sor.sales_ledger_id, slp_link.sales_ledger_id, sor.record_id)
+ and sor.record_type IN ('9', '16', '12')
<where>
<if test="params.timeStr != null and params.timeStr != ''">
and sor.create_time like concat('%',#{params.timeStr},'%')
</if>
<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},'%'))
+ or
+ (sor.record_type NOT IN ('9', '16', '12') and sl.sales_contract_no like concat('%',#{params.salesContractNo},'%'))
+ )
</if>
<if test="params.type != null and params.type != ''">
and sor.type = #{params.type}
@@ -48,13 +75,23 @@
SELECT
sor.*,
p.product_name as productName,
+ pm.thickness,
pm.model,
pm.unit,
- u.nick_name as createBy
+ u.nick_name as createBy,
+ CASE
+ WHEN sor.record_type IN ('9', '16', '12') THEN pl.purchase_contract_number
+ ELSE sl.sales_contract_no
+ END as salesContractNo
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 sys_user as u on sor.create_user = u.user_id
+ LEFT JOIN sales_ledger_product as slp_link on slp_link.id = COALESCE(sor.sales_ledger_product_id, sor.record_id)
+ LEFT JOIN sales_ledger as sl on sl.id = COALESCE(sor.sales_ledger_id, slp_link.sales_ledger_id, sor.record_id)
+ and sor.record_type NOT IN ('9', '16', '12')
+ LEFT JOIN purchase_ledger as pl on pl.id = COALESCE(sor.sales_ledger_id, slp_link.sales_ledger_id, sor.record_id)
+ and sor.record_type IN ('9', '16', '12')
<where>
<if test="params.timeStr != null and params.timeStr != ''">
and sor.create_time like concat('%',#{params.timeStr},'%')
@@ -62,6 +99,23 @@
<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},'%'))
+ or
+ (sor.record_type NOT IN ('9', '16', '12') and sl.sales_contract_no like concat('%',#{params.salesContractNo},'%'))
+ )
+ </if>
<if test="params.type != null and params.type != ''">
and sor.type = #{params.type}
</if>
--
Gitblit v1.9.3