From 1fcaf7919db7ec3350e9bf953c0d651d4d85fac2 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 23 六月 2025 11:45:48 +0800
Subject: [PATCH] 2025-06-23 回款登记导出+分页查询条件问题修复+【采购管理】-【来票登记】,合同金额列后面增加已开票金额、待开票金额两列

---
 src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
index f007228..ddd0082 100644
--- a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
@@ -9,4 +9,29 @@
         SET contract_amount = #{totalTaxInclusiveAmount}
         WHERE id = #{id}
     </update>
+    <select id="selectPurchaseLedgerListPage" resultType="com.ruoyi.purchase.pojo.PurchaseLedger">
+        select
+        pl.id,
+        pl.purchase_contract_number ,
+        pl.sales_contract_no,
+        pl.supplier_name,
+        pl.project_name,
+        pl.contract_amount,
+        sum(pr.tickets_amount)as receipt_payment_amount,
+        pl.contract_amount-sum(pr.tickets_amount) AS unReceipt_payment_amount,
+        pl.entry_date,
+        pl.recorder_name
+        from purchase_ledger pl
+        left join product_record pr on pl.id = pr.purchase_ledger_id
+        <where>
+            <if test="c.purchaseContractNumber != null and c.purchaseContractNumber != ''">
+                pl.purchase_contract_number like concat('%',#{c.purchaseContractNumber},'%')
+            </if>
+        </where>
+        group by pl.id, pl.purchase_contract_number, pl.sales_contract_no, pl.supplier_name,
+        pl.project_name,pl.entry_date,
+        pl.recorder_name,
+        pl.contract_amount
+
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3