From e5977257949f2b59be2523c4c8d42c0a2a4555c6 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 10 七月 2025 16:09:34 +0800
Subject: [PATCH] yys  修改导入导出bug

---
 src/main/resources/mapper/purchase/ProductRecordMapper.xml |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/purchase/ProductRecordMapper.xml b/src/main/resources/mapper/purchase/ProductRecordMapper.xml
index 980727c..e1646b8 100644
--- a/src/main/resources/mapper/purchase/ProductRecordMapper.xml
+++ b/src/main/resources/mapper/purchase/ProductRecordMapper.xml
@@ -27,7 +27,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 &gt;= date_format(#{c.createdAtStart},'%Y-%m-%d hh:mm:ss')
@@ -39,4 +39,24 @@
             and tr.purchase_contract_number like concat('%',#{c.purchaseContractNumber},'%')
         </if>
     </select>
+    <select id="getProductRecordById" resultType="com.ruoyi.purchase.dto.ProductRecordDto">
+        SELECT
+            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.id = pr.ticket_registration_id
+                 left join product_model pm on pm.id = pr.product_model_id
+
+        WHERE type = 2 and pr.id = #{id}
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3