From b9ff70814c4f8fffb7646fb0ea72a2a60b4068b0 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期三, 14 十月 2026 14:11:09 +0800
Subject: [PATCH] fix: 更新出库金额计算逻辑，确保按销售明细的含税总额折算，避免因小数位数导致的应收差异
---
src/main/resources/mapper/sales/SalesLedgerMapper.xml | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/sales/SalesLedgerMapper.xml b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
index c145e0a..ba6b5bd 100644
--- a/src/main/resources/mapper/sales/SalesLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
@@ -40,6 +40,7 @@
T1.customer_name LIKE CONCAT('%',#{salesLedgerDto.customerName},'%')
</if>
</where>
+ order by T1.entry_date desc
</select>
<select id="selectSalesLedgerListPage" resultType="com.ruoyi.sales.vo.SalesLedgerVo">
@@ -94,6 +95,12 @@
<if test="salesLedgerDto.entryDateEnd != null and salesLedgerDto.entryDateEnd != '' ">
AND T1.entry_date <= DATE_FORMAT(#{salesLedgerDto.entryDateEnd},'%Y-%m-%d')
</if>
+ <if test="salesLedgerDto.ids != null and salesLedgerDto.ids.size() > 0">
+ AND T1.id IN
+ <foreach collection="salesLedgerDto.ids" item="ledgerId" open="(" separator="," close=")">
+ #{ledgerId}
+ </foreach>
+ </if>
</where>
order by T1.entry_date desc
</select>
@@ -132,10 +139,12 @@
from sales_ledger sl
left join purchase_ledger pl on sl.id = pl.sales_ledger_id
left join customer c on sl.customer_id = c.id
- where 1=1
- <if test="customerName != null and customerName != '' ">
- and c.customer_name like concat('%',#{customerName},'%')
- </if>
+ <where>
+ <if test="customerName != null and customerName != '' ">
+ and c.customer_name like concat('%',#{customerName},'%')
+ </if>
+ </where>
+ order by sl.entry_date desc
</select>
</mapper>
--
Gitblit v1.9.3