From 7b2c57746cf87ebc6079c3bc055fadf554642e84 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 26 六月 2026 09:59:08 +0800
Subject: [PATCH] 采购台账退货数量计算
---
src/main/resources/mapper/basic/SupplierManageMapper.xml | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/basic/SupplierManageMapper.xml b/src/main/resources/mapper/basic/SupplierManageMapper.xml
index 5c5af54..810e137 100644
--- a/src/main/resources/mapper/basic/SupplierManageMapper.xml
+++ b/src/main/resources/mapper/basic/SupplierManageMapper.xml
@@ -35,6 +35,7 @@
AND T1.is_white = #{supplierManageDto.isWhite}
</if>
</where>
+ order by T1.id desc
</select>
<select id="supplierExportList" resultType="com.ruoyi.basic.excel.SupplierManageExcelDto">
@@ -74,7 +75,7 @@
T1.contractAmounts,
IFNULL(T2.paymentAmount, 0) AS paymentAmount,
IFNULL(T3.InboundAmount, 0) - IFNULL(T4.returnAmount, 0) AS payableAmount
- from (select supplier_id, sum(contract_amount) as contractAmounts from purchase_ledger group by supplier_id) T1
+ from (select supplier_id, sum(COALESCE(net_contract_amount, contract_amount)) as contractAmounts from purchase_ledger group by supplier_id) T1
left join (select supplier_id, sum(payment_amount) as paymentAmount from account_purchase_payment group by supplier_id) T2 on T1.supplier_id = T2.supplier_id
left join (
SELECT
@@ -106,13 +107,14 @@
AND sm.supplier_name LIKE CONCAT('%',#{supplierName},'%')
</if>
</where>
+ order by T1.supplier_id desc
</select>
<select id="supplierTransactionsDetails"
resultType="com.ruoyi.purchase.vo.SupplierTransactionsDetailsVo">
select pl.id purchaseLedgerId,
pl.purchase_contract_number,
pl.execution_date,
- pl.contract_amount,
+ COALESCE(pl.net_contract_amount, pl.contract_amount) AS contract_amount,
IFNULL(T1.paymentAmount, 0) AS paymentAmount,
IFNULL(T2.InboundAmount, 0) - IFNULL(T3.returnAmount, 0) AS payableAmount
from purchase_ledger pl
@@ -157,6 +159,7 @@
group by pl.id
)T3 on T3.id = pl.id
where pl.supplier_id = #{supplierId}
+ order by pl.id desc
</select>
</mapper>
--
Gitblit v1.9.3