From ac79dfd8d661dbe166553ff80fbdbfee64e8134e Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 28 四月 2026 16:02:20 +0800
Subject: [PATCH] feat(production): 添加工序ID字段支持
---
src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml b/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
index 70f7543..fa06173 100644
--- a/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
+++ b/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
@@ -191,14 +191,15 @@
IFNULL( SUM(T2.current_payment_amount) , 0 ) AS paymentAmount,
IFNULL((IFNULL(SUM(contract_amount),0) - IFNULL(SUM(T2.current_payment_amount),0)),0) AS payableAmount
FROM purchase_ledger T1
- LEFT JOIN payment_registration T2 ON T1.id = T2.sales_ledger_id
+ LEFT JOIN payment_registration T2 ON T1.id = T2.purchase_ledger_id
<where>
<if test="req.supplierName != null and req.supplierName != '' ">
T1.supplier_name LIKE CONCAT ('%',#{req.supplierName},'%')
</if>
</where>
- GROUP BY T1.supplier_name
+ GROUP BY T1.supplier_name,T1.supplier_id
</select>
+
<select id="supplierNameListPageDetails" resultType="com.ruoyi.purchase.dto.PaymentRegistrationDto">
SELECT
T1.supplier_id,
@@ -209,14 +210,14 @@
T1.purchase_contract_number,
T2.payment_date
FROM purchase_ledger T1
- LEFT JOIN payment_registration T2 ON T1.id = T2.sales_ledger_id
+ INNER JOIN payment_registration T2 ON T1.id = T2.purchase_ledger_id
<where>
T1.supplier_id = #{req.supplierId}
<if test="req.supplierName != null and req.supplierName != '' ">
T1.supplier_name LIKE CONCAT ('%',#{req.supplierName},'%')
</if>
</where>
- GROUP BY T1.purchase_contract_number,T2.payment_date
+ GROUP BY T1.purchase_contract_number,T2.payment_date,T1.supplier_id,T1.supplier_name
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3