From dc3a872dd2f2cfcddd3db4e722efa376705482ec Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 05 一月 2026 16:04:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hxsj' into hxsj
---
src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
index bc6c38a..8eb9370 100644
--- a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
@@ -14,16 +14,23 @@
pl.id,
pl.purchase_contract_number ,
pl.sales_contract_no,
+ pl.supplier_id,
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_id,
pl.recorder_name,
+ pl.template_name,
+ pl.approver_id,
+ sm.is_white,
+ pl.approval_status,
pl.payment_method
from purchase_ledger pl
left join product_record pr on pl.id = pr.purchase_ledger_id
+ left join supplier_manage sm on pl.supplier_id = sm.id
<where>
1 = 1
<if test="c.purchaseContractNumber != null and c.purchaseContractNumber != ''">
@@ -49,6 +56,7 @@
pl.project_name,pl.entry_date,
pl.recorder_name,
pl.contract_amount
+ order by pl.entry_date desc
</select>
<select id="getPaymentRegistrationDtoById" resultType="com.ruoyi.purchase.dto.PaymentRegistrationDto">
--
Gitblit v1.9.3