From 6a7a643404860a26415eeeb69140c158c771b742 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Tue, 26 Nov 2024 16:42:07 +0800
Subject: [PATCH] 20241126

---
 .../xujie/sys/modules/quote/entity/QuoteDetail.java  |  8 ++++++++
 .../modules/quote/service/impl/QuoteServiceImpl.java |  5 ++++-
 .../resources/mapper/quote/QuoteDetailMapper.xml     | 12 ++++++++++--
 src/main/resources/mapper/quote/QuoteMapper.xml      | 11 ++++-------
 4 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/quote/entity/QuoteDetail.java b/src/main/java/com/xujie/sys/modules/quote/entity/QuoteDetail.java
index 322e1909..d03d7e78 100644
--- a/src/main/java/com/xujie/sys/modules/quote/entity/QuoteDetail.java
+++ b/src/main/java/com/xujie/sys/modules/quote/entity/QuoteDetail.java
@@ -148,6 +148,14 @@ public class QuoteDetail {
 
     private String moq; // 最小起订量
 
+    private BigDecimal currencyTotalCost1;
+
+    private BigDecimal currencyTotalCost2;
+
+    private BigDecimal quoteCurrencyTotalCost1;
+
+    private BigDecimal quoteCurrencyTotalCost2;
+
     @TableField(exist = false)
     private Integer engChgLevel;
 
diff --git a/src/main/java/com/xujie/sys/modules/quote/service/impl/QuoteServiceImpl.java b/src/main/java/com/xujie/sys/modules/quote/service/impl/QuoteServiceImpl.java
index 669c72f0..8da8d405 100644
--- a/src/main/java/com/xujie/sys/modules/quote/service/impl/QuoteServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/quote/service/impl/QuoteServiceImpl.java
@@ -292,7 +292,10 @@ public class QuoteServiceImpl extends ServiceImpl<QuoteMapper, Quote> implements
             detail.setQuoteTaxRate(BigDecimal.ZERO);
             detail.setQuoteTaxTotalPrice(BigDecimal.ZERO);
             detail.setQuoteTaxUnitPrice(BigDecimal.ZERO);
-
+            detail.setCurrencyTotalCost1(BigDecimal.ZERO);
+            detail.setCurrencyTotalCost2(BigDecimal.ZERO);
+            detail.setQuoteCurrencyTotalCost1(BigDecimal.ZERO);
+            detail.setQuoteCurrencyTotalCost2(BigDecimal.ZERO);
             detail.setMoq("Standard 250K");
             quoteDetailService.saveQuoteDetail(detail);
 
diff --git a/src/main/resources/mapper/quote/QuoteDetailMapper.xml b/src/main/resources/mapper/quote/QuoteDetailMapper.xml
index 93d633b8..07d94d73 100644
--- a/src/main/resources/mapper/quote/QuoteDetailMapper.xml
+++ b/src/main/resources/mapper/quote/QuoteDetailMapper.xml
@@ -66,7 +66,11 @@
                qd.exchange_rate1,
                qd.currency2,
                qd.exchange_rate2,
-               qd.moq
+               qd.moq,
+               qd.currency_total_cost1,
+               qd.currency_total_cost2,
+               qd.quote_currency_total_cost1,
+               qd.quote_currency_total_cost2
         from plm_quote_detail qd
                  left join part pp on qd.part_id = pp.id
         <where>
@@ -156,7 +160,11 @@
                qd.exchange_rate1,
                qd.currency2,
                qd.exchange_rate2,
-               qd.moq
+               qd.moq,
+               qd.currency_total_cost1,
+               qd.currency_total_cost2,
+               qd.quote_currency_total_cost1,
+               qd.quote_currency_total_cost2
         from plm_quote_detail qd
                  left join plm_project_part pp on qd.part_id = pp.id
         <where>
diff --git a/src/main/resources/mapper/quote/QuoteMapper.xml b/src/main/resources/mapper/quote/QuoteMapper.xml
index 45e3fa2b..fd9c6aa4 100644
--- a/src/main/resources/mapper/quote/QuoteMapper.xml
+++ b/src/main/resources/mapper/quote/QuoteMapper.xml
@@ -51,9 +51,6 @@
             <if test="params.quoteNo != null and params.quoteNo != ''">
                 and q.quote_no = #{params.quoteNo}
             </if>
-            <if test="params.quoteVersionNo != null and params.quoteVersionNo != ''">
-                and q.quote_version_no = #{params.quoteVersionNo}
-            </if>
             <if test="params.buNo != null and params.buNo != ''">
                 and q.bu_no = #{params.buNo}
             </if>
@@ -67,7 +64,7 @@
                 and q.status = #{params.status}
             </if>
             <if test="params.quoteVersionNo != null and params.quoteVersionNo != ''">
-                and q.quote_version_no = #{params.quoteVersionNo}
+                and q.quote_version_no like #{params.quoteVersionNo}
             </if>
             <if test="params.customerDesc != null and params.customerDesc != ''">
                 and c.customer_desc like #{params.customerDesc}
@@ -85,7 +82,7 @@
                 and q.customer_inquiry_no like #{params.customerInquiryNo}
             </if>
             <if test="params.insideInquiryNo != null and params.insideInquiryNo != ''">
-                and q.customer_inquiry_no like #{params.insideInquiryNo}
+                and q.inside_inquiry_no like #{params.insideInquiryNo}
             </if>
             <if test="params.startDate != null">
                 and q.quote_date &gt;= #{params.startDate}
@@ -166,7 +163,7 @@
                 and q.status = #{ status}
             </if>
             <if test="quoteVersionNo != null and quoteVersionNo != ''">
-                and q.quote_version_no = #{ quoteVersionNo}
+                and q.quote_version_no like #{ quoteVersionNo}
             </if>
             <if test="customerDesc != null and customerDesc != ''">
                 and c.customer_desc like #{ customerDesc}
@@ -184,7 +181,7 @@
                 and q.customer_inquiry_no like #{ customerInquiryNo}
             </if>
             <if test="insideInquiryNo != null and insideInquiryNo != ''">
-                and q.customer_inquiry_no like #{ insideInquiryNo}
+                and q.inside_inquiry_no like #{ insideInquiryNo}
             </if>
             <if test="startDate != null">
                 and q.quote_date &gt;= #{ startDate}