From c81008c462d2dff5689a942cfb9adaf58b257c56 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 21 一月 2026 10:07:50 +0800
Subject: [PATCH] 浪潮对接单点登录:质量检测管理系统

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

diff --git a/src/main/resources/mapper/purchase/ProductRecordMapper.xml b/src/main/resources/mapper/purchase/ProductRecordMapper.xml
index 5fadd64..d3360d7 100644
--- a/src/main/resources/mapper/purchase/ProductRecordMapper.xml
+++ b/src/main/resources/mapper/purchase/ProductRecordMapper.xml
@@ -7,7 +7,9 @@
 
     <select id="productRecordPage" resultType="com.ruoyi.purchase.dto.ProductRecordDto">
         SELECT
-        pl.sales_contract_no,
+        sl.sales_contract_no,
+        sl.customer_contract_no,
+        sl.customer_name,
         pm.model AS product_model,
         pl.purchase_contract_number,
         pl.supplier_name,
@@ -21,20 +23,21 @@
         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
         <if test="c.salesContractNo != null and c.salesContractNo != ''">
-            and pl.sales_contract_no = #{c.salesContractNo}
+            and sl.sales_contract_no like concat('%',#{c.salesContractNo},'%')
         </if>
         <if test="c.supplierName != null and c.supplierName != ''">
-            and pl.supplier_name = #{c.supplierName}
+            and pl.supplier_name like concat('%',#{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')
+            and pr.created_at &gt;= str_to_date(#{c.createdAtStart}, '%Y-%m-%d')
         </if>
         <if test="c.createdAtEnd != null and c.createdAtEnd != ''">
-            and pr.created_at &lt;= date_format(#{c.createdAtEnd},'%Y-%m-%d hh:mm:ss')
+            and pr.created_at &lt; date_add(str_to_date(#{c.createdAtEnd}, '%Y-%m-%d'), interval 1 day)
         </if>
         <if test="c.purchaseContractNumber != null and c.purchaseContractNumber != ''">
             and tr.purchase_contract_number like concat('%',#{c.purchaseContractNumber},'%')
@@ -60,7 +63,12 @@
                  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}
+        WHERE type = 2
+        <if test="c.purchaseLedgerId != null and c.purchaseLedgerId != ''">
+            and pr.purchase_ledger_id = #{c.purchaseLedgerId}
+        </if>
+        <if test="c.productModelId != null and c.productModelId != ''">
+            and pm.id = #{c.productModelId}
+        </if>
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3