From 8272786d79aa04ab8ec9d37e2aab2108b7d56a94 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Mon, 22 Sep 2025 14:21:19 +0800
Subject: [PATCH] =?UTF-8?q?2025-09-22=20=E6=8A=A5=E4=BB=B7=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/spring/modules/quote/entity/Quote.java  |  4 ++++
 .../resources/mapper/quote/QuoteDetailMapper.xml     | 12 ++++--------
 src/main/resources/mapper/quote/QuoteMapper.xml      | 10 ++++++++++
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/spring/modules/quote/entity/Quote.java b/src/main/java/com/spring/modules/quote/entity/Quote.java
index 8402de2e..64bd62b9 100644
--- a/src/main/java/com/spring/modules/quote/entity/Quote.java
+++ b/src/main/java/com/spring/modules/quote/entity/Quote.java
@@ -182,6 +182,10 @@ public class Quote extends QueryPage {
 
     @TableField(exist = false)
     private String currencyDesc;
+
     @TableField(exist = false)
     private String projectId;
+
+    @TableField(exist = false)
+    private String searchPartNo;
 }
diff --git a/src/main/resources/mapper/quote/QuoteDetailMapper.xml b/src/main/resources/mapper/quote/QuoteDetailMapper.xml
index 053e2d45..42a7accf 100644
--- a/src/main/resources/mapper/quote/QuoteDetailMapper.xml
+++ b/src/main/resources/mapper/quote/QuoteDetailMapper.xml
@@ -64,12 +64,10 @@
                qd.quote_tax_total_price,
                qd.quote_tax_unit_price,
                qd.currency1,
-               dbo.plm_get_dictDataLabel('plm_customer_information_customer_customer_currency', qd.currency1,
-                                         qd.site) as currencyDesc1,
+               dbo.plm_get_dictDataLabel('plm_customer_information_customer_customer_currency', qd.currency1, qd.site) as currencyDesc1,
                qd.exchange_rate1,
                qd.currency2,
-               dbo.plm_get_dictDataLabel('plm_customer_information_customer_customer_currency', qd.currency2,
-                                         qd.site) as currencyDesc2,
+               dbo.plm_get_dictDataLabel('plm_customer_information_customer_customer_currency', qd.currency2, qd.site) as currencyDesc2,
                qd.exchange_rate2,
                qd.moq,
                qd.currency_total_cost1,
@@ -84,11 +82,9 @@
                pp.plm_part_no,
                pp.ifs_part_no,
                convert(decimal(20,6),(case when exchange_rate2 = 0 or exchange_rate2 is null then 0 else unit_price/exchange_rate2 end))  as unitPriceRate
-
         from plm_quote_detail qd
-                 left join plm_quote q on qd.quote_id = q.id
-                 left join part pp
-                           on qd.part_no = pp.part_no and qd.site = pp.site
+        left join plm_quote q on qd.quote_id = q.id
+        left join part pp on qd.part_no = pp.part_no and qd.site = pp.site
         <where>
             <if test="id != null">
                 and qd.id = #{id}
diff --git a/src/main/resources/mapper/quote/QuoteMapper.xml b/src/main/resources/mapper/quote/QuoteMapper.xml
index 0115a748..41348779 100644
--- a/src/main/resources/mapper/quote/QuoteMapper.xml
+++ b/src/main/resources/mapper/quote/QuoteMapper.xml
@@ -99,6 +99,16 @@
                 </foreach>
                 )
             </if>
+            <if test="params.searchPartNo != null and params.searchPartNo != ''">
+                AND EXISTS (
+                SELECT 1
+                FROM plm_quote_detail b
+                left join part pp on b.part_no = pp.part_no and b.site = pp.site
+                left join plm_customer_part_info as pc on b.part_no = pc.part_no and b.site = pc.site
+                WHERE b.quote_id = q.id
+                AND (pp.plm_part_no like #{params.searchPartNo} or pp.ifs_part_no like #{params.searchPartNo} or pc.customer_part_no like #{params.searchPartNo})
+                )
+            </if>
         </where>
         order by q.id desc
     </select>