From da78c6cd6cfa63c09fc8b41c18af6f06393847aa Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 26 一月 2026 15:53:53 +0800
Subject: [PATCH] yys 修改采购审核模块

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

diff --git a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
index b513ac1..efeda16 100644
--- a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
@@ -18,18 +18,21 @@
         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,
+        sum(tr.invoice_amount)as receipt_payment_amount,
+        pl.contract_amount-sum(tr.invoice_amount) AS unReceipt_payment_amount,
         pl.entry_date,
+        pl.execution_date,
         pl.recorder_id,
         pl.recorder_name,
         pl.template_name,
-        pl.approver_id,
+        pl.approve_user_ids,
         sm.is_white,
         pl.approval_status,
         pl.payment_method
         from purchase_ledger pl
+        left join sales_ledger_product slp on slp.sales_ledger_id = pl.id and slp.type=2
         left join product_record pr on pl.id = pr.purchase_ledger_id
+        left join ticket_registration tr on tr.id = pr.ticket_registration_id
         left join supplier_manage sm on pl.supplier_id = sm.id
         <where>
             1 = 1
@@ -77,8 +80,7 @@
             supplier_manage T2 ON T1.supplier_id = T2.id
                 LEFT JOIN
             sys_user T3 ON T3.user_id = T1.registrant_id
-        left join ticket_registration T4 on T1.ticket_registration_id = T4.id
         WHERE
-            T4.id = #{id}
+            T1.sales_ledger_product_id = #{id}
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3