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/ProductRecordMapper.xml | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/purchase/ProductRecordMapper.xml b/src/main/resources/mapper/purchase/ProductRecordMapper.xml
index c135606..80133ac 100644
--- a/src/main/resources/mapper/purchase/ProductRecordMapper.xml
+++ b/src/main/resources/mapper/purchase/ProductRecordMapper.xml
@@ -5,7 +5,37 @@
<mapper namespace="com.ruoyi.purchase.mapper.ProductRecordMapper">
- <select id="productRecordPage" resultType="com.ruoyi.purchase.pojo.ProductRecord">
+ <select id="productRecordPage" resultType="com.ruoyi.purchase.dto.ProductRecordDto">
+ SELECT
+ distinct
+ sl.sales_contract_no,
+ sl.customer_contract_no,
+ sl.customer_name,
+ pm.model AS product_model,
+ pl.purchase_contract_number,
+ pl.supplier_name,
+ pr.*,
+ tr.invoice_number,
+ ROUND(pr.tickets_amount/(1+pr.tax_rate/100),2 ) as un_tickets_price,
+ ROUND(pr.tickets_amount-pr.tickets_amount/(1+pr.tax_rate/100),2 )as invoice_amount
+ FROM product_record pr
+ left join purchase_ledger pl on pl.id = pr.purchase_ledger_id
+ left join sales_ledger sl on sl.id = pl.sales_ledger_id
+ left join ticket_registration tr on tr.purchase_ledger_id = pl.id
+ left join product_model pm on pm.id = pr.product_model_id
+ WHERE type = 2
+ <if test="c.salesContractNo != null and c.salesContractNo != ''">
+ and sl.sales_contract_no = #{c.salesContractNo}
+ </if>
+ <if test="c.supplierName != null and c.supplierName != ''">
+ and sl.supplier_name = #{c.supplierName}
+ </if>
+ <if test="c.createdAtStart != null and c.createdAtStart != ''">
+ and pr.created_at >= date_format(#{c.createdAtStart},'%Y-%m-%d hh:mm:ss')
+ </if>
+ <if test="c.createdAtEnd != null and c.createdAtEnd != ''">
+ and pr.created_at <= date_format(#{c.createdAtEnd},'%Y-%m-%d hh:mm:ss')
+ </if>
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3