From 0ac445694a8ffc0e26e54d788d889b3797edf7a0 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 26 六月 2026 09:48:33 +0800
Subject: [PATCH] feat: 添加备件领用记录功能，包括数据库表
---
src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml | 73 +++++++++++++++++++++++-------------
1 files changed, 47 insertions(+), 26 deletions(-)
diff --git a/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml b/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
index c5c007e..40a29ff 100644
--- a/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
+++ b/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
@@ -185,39 +185,60 @@
</select>
<select id="supplierNameListPage" resultType="com.ruoyi.purchase.dto.PaymentRegistrationDto">
SELECT
- T1.supplier_id,
- T1.supplier_name,
- SUM(contract_amount) AS invoiceAmount,
- 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.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
+ T1.supplier_id,
+ T1.supplier_name,
+ T1.invoiceAmount,
+ IFNULL(T2.paymentAmount, 0) AS paymentAmount,
+ IFNULL(T2.payableAmount, 0) AS payableAmount
+ FROM (
+ SELECT
+ supplier_id,
+ supplier_name,
+ SUM(contract_amount) AS invoiceAmount
+ FROM purchase_ledger
+ <where>
+ <if test="req.supplierName != null and req.supplierName != '' ">
+ AND supplier_name LIKE CONCAT ('%',#{req.supplierName},'%')
+ </if>
+ </where>
+ GROUP BY supplier_id, supplier_name
+ ) T1
+ LEFT JOIN (
+ SELECT
+ pl.supplier_id,
+ SUM(IFNULL(slp.stocked_quantity, 0) * IF(IFNULL(slp.quantity, 0) > 0, slp.tax_inclusive_total_price / slp.quantity, 0)) AS paymentAmount,
+ SUM((IFNULL(slp.quantity, 0) - IFNULL(slp.stocked_quantity, 0)) * IF(IFNULL(slp.quantity, 0) > 0, slp.tax_inclusive_total_price / slp.quantity, 0)) AS payableAmount
+ FROM purchase_ledger pl
+ JOIN sales_ledger_product slp ON pl.id = slp.sales_ledger_id AND slp.type = 2
+ GROUP BY pl.supplier_id
+ ) T2 ON T1.supplier_id = T2.supplier_id
</select>
<select id="supplierNameListPageDetails" resultType="com.ruoyi.purchase.dto.PaymentRegistrationDto">
SELECT
- T1.supplier_id,
- T1.supplier_name,
- SUM(contract_amount) AS invoiceAmount,
- 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,
- T1.purchase_contract_number,
- T2.payment_date
- FROM purchase_ledger T1
- INNER JOIN payment_registration T2 ON T1.id = T2.purchase_ledger_id
+ pl.id,
+ pl.purchase_contract_number,
+ pl.contract_amount AS invoiceAmount,
+ pl.entry_date AS payment_date,
+ IFNULL(T2.payableAmount, 0) AS paymentAmount,
+ IFNULL(T2.paymentAmount, 0) AS payableAmount
+ FROM purchase_ledger pl
+ LEFT JOIN (
+ SELECT
+ sales_ledger_id,
+ SUM(IFNULL(stocked_quantity, 0) * IF(IFNULL(quantity, 0) > 0, tax_inclusive_total_price / quantity, 0)) AS paymentAmount,
+ SUM((IFNULL(quantity, 0) - IFNULL(stocked_quantity, 0)) * IF(IFNULL(quantity, 0) > 0, tax_inclusive_total_price / quantity, 0)) AS payableAmount
+ FROM sales_ledger_product
+ WHERE type = 2
+ GROUP BY sales_ledger_id
+ ) T2 ON pl.id = T2.sales_ledger_id
<where>
- T1.supplier_id = #{req.supplierId}
+ pl.supplier_id = #{req.supplierId}
<if test="req.supplierName != null and req.supplierName != '' ">
- T1.supplier_name LIKE CONCAT ('%',#{req.supplierName},'%')
+ AND pl.supplier_name LIKE CONCAT ('%', #{req.supplierName}, '%')
</if>
</where>
- GROUP BY T1.purchase_contract_number,T2.payment_date
+ ORDER BY pl.entry_date ASC, pl.id ASC
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3