From bfda179b25eb3f121cc827485ae2b8be1fee3449 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 11 五月 2026 18:00:28 +0800
Subject: [PATCH] refactor(database): 重构产品信息查询以使用关联表结构
---
src/main/resources/mapper/sales/ShippingInfoMapper.xml | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/sales/ShippingInfoMapper.xml b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
index 82c67b2..ee384ed 100644
--- a/src/main/resources/mapper/sales/ShippingInfoMapper.xml
+++ b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
@@ -19,7 +19,8 @@
s.update_user,
s.tenant_id,
sl.sales_contract_no,
- slp.specification_model,
+ pm.model as specification_model,
+ pm.unit,
p.product_name,
sl.customer_name
FROM shipping_info s
@@ -61,20 +62,21 @@
<select id="getReturnManagementDtoById" resultType="com.ruoyi.sales.dto.SalesLedgerProductDto">
SELECT
slp.*,
+ si.shipping_no,
GREATEST(slp.quantity - COALESCE(rs.total_return_num, 0), 0) AS un_quantity,
COALESCE(rs.total_return_num, 0) AS total_return_num
FROM shipping_info si
LEFT JOIN sales_ledger_product slp ON si.sales_ledger_product_id = slp.id and slp.type = 1
LEFT JOIN (
SELECT
- return_sale_ledger_product_id,
+ return_sales_ledger_product_id,
SUM(num) AS total_return_num
FROM return_sale_product rsp
left join return_management rm on rm.id = rsp.return_management_id
left join shipping_info si on si.id = rm.shipping_id
WHERE 1=1
- GROUP BY return_sale_ledger_product_id
- ) rs ON rs.return_sale_ledger_product_id = slp.id
+ GROUP BY return_sales_ledger_product_id
+ ) rs ON rs.return_sales_ledger_product_id = slp.id
<where>
<if test="shippingId != null">
si.id = #{shippingId}
@@ -86,4 +88,4 @@
left join sales_ledger sl on si.sales_ledger_id = sl.id
where si.status = '宸插彂璐�' and sl.customer_name = #{customerName}
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3