From 0997eacb098ca63a7e83d08a0d40140bef72b18b Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 23 六月 2026 09:55:29 +0800
Subject: [PATCH] fix: 供应商与客户往来修改

---
 src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml |   85 +++++++++++++++++++++---------------------
 1 files changed, 42 insertions(+), 43 deletions(-)

diff --git a/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml b/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
index bd3339f..0eebf30 100644
--- a/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
+++ b/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
@@ -185,61 +185,60 @@
     </select>
     <select id="supplierNameListPage" resultType="com.ruoyi.purchase.dto.PaymentRegistrationDto">
         SELECT
-        T1.supplier_id,
-        T1.supplier_name,
-        T1.invoiceAmount,
-        IFNULL(T2.paymentAmount, 0) AS paymentAmount,
-        (T1.invoiceAmount - IFNULL(T2.paymentAmount, 0)) AS payableAmount
+            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
+            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
-        supplier_id,
-        SUM(current_payment_amount) AS paymentAmount
-        FROM payment_registration
-        GROUP BY supplier_id
+            SELECT
+                pl.supplier_id,
+                SUM(IFNULL(slp.stocked_quantity, 0) * IFNULL(slp.tax_inclusive_unit_price, 0)) AS paymentAmount,
+                SUM((IFNULL(slp.quantity, 0) - IFNULL(slp.stocked_quantity, 0)) * IFNULL(slp.tax_inclusive_unit_price, 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
-        T2.id,
-        T1.purchase_contract_number,
-        T1.contract_amount AS invoiceAmount,
-        IFNULL(T2.current_payment_amount, 0) AS paymentAmount,
-        IFNULL((
-        T1.contract_amount - IFNULL((
-        SELECT SUM(T3.current_payment_amount)
-        FROM payment_registration T3
-        WHERE T3.purchase_ledger_id = T1.id
-        AND (
-        T3.payment_date &lt; T2.payment_date
-        OR (T3.payment_date = T2.payment_date AND T3.id &lt;= T2.id)
-        )
-        ), 0)
-        ), 0) AS payableAmount,
-        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) * IFNULL(tax_inclusive_unit_price, 0)) AS paymentAmount,
+                SUM((IFNULL(quantity, 0) - IFNULL(stocked_quantity, 0)) * IFNULL(tax_inclusive_unit_price, 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 != '' ">
-                AND T1.supplier_name LIKE CONCAT ('%', #{req.supplierName}, '%')
+                AND pl.supplier_name LIKE CONCAT ('%', #{req.supplierName}, '%')
             </if>
         </where>
-        ORDER BY T2.payment_date ASC, T2.id ASC
-
+        ORDER BY pl.entry_date ASC, pl.id ASC
     </select>
 
 </mapper>

--
Gitblit v1.9.3