From 3faae0563d4bf5a2139c6d8aac3b1e2ec952adf9 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 13 三月 2026 13:52:18 +0800
Subject: [PATCH] yys 退货详情返回产品单位
---
src/main/resources/mapper/sales/ShippingInfoMapper.xml | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/sales/ShippingInfoMapper.xml b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
index 34073ef..82c67b2 100644
--- a/src/main/resources/mapper/sales/ShippingInfoMapper.xml
+++ b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
@@ -2,7 +2,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.sales.mapper.ShippingInfoMapper">
- <select id="listPage" resultType="com.ruoyi.sales.pojo.ShippingInfo">
+ <select id="listPage" resultType="com.ruoyi.sales.dto.ShippingInfoDto">
SELECT
s.id,
s.sales_ledger_id,
@@ -19,9 +19,14 @@
s.update_user,
s.tenant_id,
sl.sales_contract_no,
+ slp.specification_model,
+ p.product_name,
sl.customer_name
FROM shipping_info s
LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
+ LEFT JOIN sales_ledger_product slp ON s.sales_ledger_product_id = slp.id and slp.type = 1
+ left join product_model pm on slp.product_model_id = pm.id
+ left join product p on pm.product_id = p.id
WHERE 1=1
<if test="req.salesContractNo != null and req.salesContractNo != ''">
AND sl.sales_contract_no LIKE CONCAT('%',#{req.salesContractNo},'%')
@@ -53,4 +58,32 @@
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
+ 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,
+ 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
+ <where>
+ <if test="shippingId != null">
+ si.id = #{shippingId}
+ </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
+ where si.status = '宸插彂璐�' and sl.customer_name = #{customerName}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3