From 9d42f647f5589e4a560d745d6b359ae6c273bd8d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 11 五月 2026 13:08:52 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/resources/mapper/sales/ShippingInfoMapper.xml | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/sales/ShippingInfoMapper.xml b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
index 71bce20..cd7dc3e 100644
--- a/src/main/resources/mapper/sales/ShippingInfoMapper.xml
+++ b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
@@ -61,6 +61,7 @@
<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
@@ -86,4 +87,33 @@
left join sales_ledger sl on si.sales_ledger_id = sl.id
where si.status = '宸插彂璐�' and sl.customer_name = #{customerName}
</select>
+ <select id="listPageByOutbound" resultType="com.ruoyi.account.bean.vo.SalesOutboundVo">
+ SELECT
+ sor.id,
+ sor.outbound_batches,
+ sl.customer_name,
+ s.shipping_date,
+ p.product_name,
+ slp.specification_model,
+ slp.stock_out_num,
+ s.shipping_no,
+ sl.sales_contract_no
+ 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
+ left join stock_out_record sor on sor.record_id = s.id and sor.record_type='13'
+ WHERE s.status='宸插彂璐�'
+ <if test="req.outboundBatches != null and req.outboundBatches != ''">
+ AND sor.outbound_batches LIKE CONCAT('%',#{req.outboundBatches},'%')
+ </if>
+ <if test="req.customerName != null and req.customerName != ''">
+ AND sl.customer_name LIKE CONCAT('%',#{req.customerName},'%')
+ </if>
+ <if test="req.startDate != null and req.endDate != null">
+ AND s.shipping_date BETWEEN #{startDate} AND #{endDate}
+ </if>
+ order by sor.id DESC
+ </select>
</mapper>
--
Gitblit v1.9.3