From 78c0d6c79dcd5a8e2e2f99199dbcf5504fe8687b Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期六, 24 五月 2025 15:45:56 +0800
Subject: [PATCH] 采购管理模块

---
 src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml b/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
index 9f21eff..c4636e5 100644
--- a/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
+++ b/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
@@ -9,7 +9,7 @@
         <result property="saleLedgerId" column="sale_ledger_id"/>
         <result property="purchaseLedgerId" column="purchase_ledger_id"/>
         <result property="supplierId" column="supplier_id"/>
-        <result property="invoicePurchaseId" column="invoice_purchase_id"/>
+        <result property="ticketRegistrationId" column="ticket_registration_id"/>
         <result property="currentPaymentAmount" column="current_payment_amount"/>
         <result property="paymentMethod" column="payment_method"/>
         <result property="registrantId" column="registrant_id"/>
@@ -17,6 +17,7 @@
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
         <result property="tenantId" column="tenant_id"/>
+        <result property="registrationtDate" column="registrationt_date"/>
     </resultMap>
 
     <resultMap type="com.ruoyi.purchase.dto.PaymentRegistrationDto" id="PaymentRegistrationDtoResult">
@@ -24,7 +25,7 @@
         <result property="saleLedgerId" column="sale_ledger_id"/>
         <result property="purchaseLedgerId" column="purchase_ledger_id"/>
         <result property="supplierId" column="supplier_id"/>
-        <result property="invoicePurchaseId" column="invoice_purchase_id"/>
+        <result property="ticketRegistrationId" column="ticket_registration_id"/>
         <result property="currentPaymentAmount" column="current_payment_amount"/>
         <result property="paymentMethod" column="payment_method"/>
         <result property="registrantId" column="registrant_id"/>
@@ -38,6 +39,7 @@
         <result property="taxRate" column="tax_rate"/>
         <result property="invoiceAmount" column="invoice_amount"/>
         <result property="tenantId" column="tenant_id"/>
+        <result property="registrationtDate" column="registrationt_date"/>
     </resultMap>
 
     <sql id="selectPaymentRegistrationVo">
@@ -45,7 +47,7 @@
                pr.sale_ledger_id,
                pr.purchase_ledger_id,
                pr.supplier_id,
-               pr.invoice_purchase_id,
+               pr.ticket_registration_id,
                pr.current_payment_amount,
                pr.payment_method,
                pr.registrant_id,
@@ -57,13 +59,15 @@
                pl.purchase_contract_number as purchase_contract_number,
                sm.supplier_name as supplier_name,
                ip.invoice_number as invoice_number,
-               ip.tax_rate as tax_rate,
-               ip.invoice_amount as invoice_amount
+               ip.invoice_amount as invoice_amount,
+               pr.tax_rate,
+               pr.registrationt_date,
+               su.nick_name as registrant
         from payment_registration pr
                  left join sales_ledger sl on pr.sale_ledger_id = sl.id
                  left join purchase_ledger pl on pr.purchase_ledger_id = pl.id
                  left join supplier_manage sm on pr.supplier_id = sm.id
-                 left join invoice_purchase ip on pr.invoice_purchase_id = ip.id
+                 left join ticket_registration ip on pr.ticket_registration_id = ip.id
                  left join sys_user su on pr.registrant_id = su.user_id
     </sql>
 

--
Gitblit v1.9.3