From 1178037a16d0c738550961424362a86bb247a156 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Thu, 27 Mar 2025 13:48:27 +0800
Subject: [PATCH] 2025-03-27

---
 .../com/spring/modules/quote/entity/QuoteDetail.java  |  2 ++
 src/main/resources/mapper/quote/QuoteDetailMapper.xml | 11 ++++++++---
 .../resources/mapper/quote/QuoteGroupDetailMapper.xml |  7 +++++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/spring/modules/quote/entity/QuoteDetail.java b/src/main/java/com/spring/modules/quote/entity/QuoteDetail.java
index 76701b75..8d54f8f8 100644
--- a/src/main/java/com/spring/modules/quote/entity/QuoteDetail.java
+++ b/src/main/java/com/spring/modules/quote/entity/QuoteDetail.java
@@ -230,6 +230,8 @@ public class QuoteDetail {
     @TableField(exist = false)
     private String currencyDesc1;
     @TableField(exist = false)
+    private String currencyDesc2;
+    @TableField(exist = false)
     private String projectNo;
 
     @TableField(exist = false)
diff --git a/src/main/resources/mapper/quote/QuoteDetailMapper.xml b/src/main/resources/mapper/quote/QuoteDetailMapper.xml
index 39a62b5b..b8c975ba 100644
--- a/src/main/resources/mapper/quote/QuoteDetailMapper.xml
+++ b/src/main/resources/mapper/quote/QuoteDetailMapper.xml
@@ -67,6 +67,8 @@
                                          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,
                qd.exchange_rate2,
                qd.moq,
                qd.currency_total_cost1,
@@ -101,7 +103,7 @@
             <if test="versionNo != null and versionNo != ''">
                 and qd.version_no = #{versionNo}
             </if>
-            <if test="quoteGroupDetailId != null ">
+            <if test="quoteGroupDetailId != null">
                 and qd.quote_group_detail_id = #{quoteGroupDetailId}
             </if>
         </where>
@@ -280,6 +282,8 @@
                                          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,
                qd.exchange_rate2,
                qd.moq,
                qd.currency_total_cost1,
@@ -294,8 +298,8 @@
                qd.adjust_test_cost,
                qd.else_cost,
                qd.adjust_else_cost
-        from plm_quote_detail qd
-                 left join plm_quote q on qd.quote_id = q.id
+        from plm_quote q
+                 left join plm_quote_detail qd on qd.quote_id = q.id
                  left join view_Project_Part pp
                            on q.project_no = pp.project_id and qd.part_no = pp.test_part_no and qd.site = pp.site
         <where>
@@ -311,6 +315,7 @@
             <if test="partNo != null and partNo != ''">
                 and qd.part_no = #{partNo}
             </if>
+            order by qd.part_no
         </where>
     </select>
 </mapper>
diff --git a/src/main/resources/mapper/quote/QuoteGroupDetailMapper.xml b/src/main/resources/mapper/quote/QuoteGroupDetailMapper.xml
index 2f1fd0db..b01081ff 100644
--- a/src/main/resources/mapper/quote/QuoteGroupDetailMapper.xml
+++ b/src/main/resources/mapper/quote/QuoteGroupDetailMapper.xml
@@ -67,6 +67,8 @@
                                          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,
                qd.exchange_rate2,
                qd.moq,
                qd.currency_total_cost1,
@@ -294,8 +296,8 @@
                qd.else_cost,
                qd.adjust_else_cost
 <!--               qd.current_quote_detail_item_no-->
-        from plm_quote_detail qd
-                 left join plm_quote q on qd.quote_id = q.id
+        from plm_quote q
+                 left join plm_quote_detail qd on qd.quote_id = q.id
                  left join view_Project_Part pp
                            on q.project_no = pp.project_id and qd.part_no = pp.test_part_no and qd.site = pp.site
         <where>
@@ -311,6 +313,7 @@
             <if test="partNo != null and partNo != ''">
                 and qd.part_no = #{partNo}
             </if>
+            order by qd.part_no
         </where>
     </select>