From b2859e20392f07094ec84166b83e6189665404c2 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期六, 12 七月 2025 17:09:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim_yys'
---
src/main/resources/mapper/purchase/ProductRecordMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/purchase/ProductRecordMapper.xml b/src/main/resources/mapper/purchase/ProductRecordMapper.xml
index dd5aac6..6db5f75 100644
--- a/src/main/resources/mapper/purchase/ProductRecordMapper.xml
+++ b/src/main/resources/mapper/purchase/ProductRecordMapper.xml
@@ -15,6 +15,9 @@
pl.supplier_name,
pr.*,
tr.invoice_number,
+ tr.iss_uer_id,
+ tr.iss_uer,
+ tr.id as ticketRegistrationId,
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
@@ -27,7 +30,7 @@
and sl.sales_contract_no = #{c.salesContractNo}
</if>
<if test="c.supplierName != null and c.supplierName != ''">
- and sl.supplier_name = #{c.supplierName}
+ and pl.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')
--
Gitblit v1.9.3