From 3c83bac9f2f447b6f1c77fa53d9df9e7c20d6041 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期六, 18 四月 2026 10:38:06 +0800
Subject: [PATCH] feat: 退货台账客户列表返回已发货客户
---
src/main/resources/mapper/sales/ShippingInfoMapper.xml | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/sales/ShippingInfoMapper.xml b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
index 82c67b2..1134c45 100644
--- a/src/main/resources/mapper/sales/ShippingInfoMapper.xml
+++ b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
@@ -58,13 +58,17 @@
FROM shipping_info s
LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
</select>
+
<select id="getReturnManagementDtoById" resultType="com.ruoyi.sales.dto.SalesLedgerProductDto">
SELECT
slp.*,
GREATEST(slp.quantity - COALESCE(rs.total_return_num, 0), 0) AS un_quantity,
- COALESCE(rs.total_return_num, 0) AS total_return_num
+ COALESCE(rs.total_return_num, 0) AS total_return_num,
+ pm.unit AS product_model_unit,
+ pm.thickness AS thickness
FROM shipping_info si
LEFT JOIN sales_ledger_product slp ON si.sales_ledger_product_id = slp.id and slp.type = 1
+ LEFT JOIN product_model pm ON slp.product_model_id = pm.id
LEFT JOIN (
SELECT
return_sale_ledger_product_id,
@@ -81,6 +85,7 @@
</if>
</where>
</select>
+
<select id="getShippingInfoByCustomerName" resultType="com.ruoyi.sales.pojo.ShippingInfo">
select * from shipping_info si
left join sales_ledger sl on si.sales_ledger_id = sl.id
--
Gitblit v1.9.3