From 2a87be20c75eb04be11192e1b0830dc588217773 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 18 五月 2026 13:35:54 +0800
Subject: [PATCH] refactor(account): 重构包结构以规范模块划分
---
src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml b/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
index 06ffffe..961d783 100644
--- a/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
@@ -54,7 +54,7 @@
where pro.id = #{id}
</select>
<select id="listPageAccountPurchaseReturn"
- resultType="com.ruoyi.account.bean.vo.PurchaseReturnVo">
+ resultType="com.ruoyi.account.bean.vo.purchase.PurchaseReturnVo">
select pro.id,
pro.no returnNo,
t.inboundBatches,
@@ -88,7 +88,7 @@
SELECT
sir.id,
sir.product_model_id,
- slp.id saleLedgerProductId,
+ slp.id salesLedgerProductId,
slp.product_category,
slp.specification_model,
slp.unit,
@@ -132,7 +132,7 @@
slp.tax_inclusive_unit_price,
prop.return_quantity,
prop.purchase_return_order_id,
- GREATEST(sir.stock_in_num - COALESCE(prop.return_quantity, 0), 0) AS un_quantity,
+ GREATEST(sir.stock_in_num - COALESCE(rs1.total_return_num1, 0), 0) AS un_quantity,
COALESCE(rs.total_return_num, 0) AS total_return_num
from purchase_return_order_products prop
left join purchase_return_orders pro on prop.purchase_return_order_id = pro.id
@@ -141,8 +141,13 @@
LEFT JOIN (SELECT stock_in_record_id,
SUM(return_quantity) AS total_return_num
FROM purchase_return_order_products
- WHERE 1 = 1 and purchase_return_order_id != #{id}
+ WHERE 1 = 1 and purchase_return_order_id = #{id}
GROUP BY stock_in_record_id) rs ON rs.stock_in_record_id = sir.id
+ LEFT JOIN (SELECT stock_in_record_id,
+ SUM(return_quantity) AS total_return_num1
+ FROM purchase_return_order_products
+ WHERE 1 = 1 and purchase_return_order_id = #{id}
+ GROUP BY stock_in_record_id) rs1 ON rs1.stock_in_record_id = sir.id
where pro.id = #{id}
</select>
</mapper>
--
Gitblit v1.9.3