From b1fc3014dbf16636b251a5d618fadb670b81a049 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Mon, 15 Sep 2025 15:58:10 +0800
Subject: [PATCH] =?UTF-8?q?2025-09-15=20=E9=94=80=E5=94=AE=E6=8A=A5?=
 =?UTF-8?q?=E4=BB=B7=E7=9A=84=E6=B1=87=E7=8E=87=E9=BB=98=E8=AE=A4=E5=80=BC?=
 =?UTF-8?q?=E6=94=B9=E6=88=901=20=E5=BE=85=E6=8A=A5=E4=BB=B7=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E9=87=8C=EF=BC=8C=E6=8A=A5=E4=BB=B7=E7=BB=84=E5=B7=B2?=
 =?UTF-8?q?=E7=BB=8F=E6=8A=A5=E5=AE=8C=E4=BB=B7=E7=9A=84=EF=BC=8C=E4=B9=9F?=
 =?UTF-8?q?=E8=BF=98=E6=98=BE=E7=A4=BA=EF=BC=8C=E8=BF=87=E6=BB=A4=E4=B8=80?=
 =?UTF-8?q?=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quote/service/impl/QuoteGroupDetailServiceImpl.java      | 5 +++++
 .../mapper/quotation/QuotationInformationMapper.xml          | 1 +
 2 files changed, 6 insertions(+)

diff --git a/src/main/java/com/spring/modules/quote/service/impl/QuoteGroupDetailServiceImpl.java b/src/main/java/com/spring/modules/quote/service/impl/QuoteGroupDetailServiceImpl.java
index b054321f..ab8aa0f4 100644
--- a/src/main/java/com/spring/modules/quote/service/impl/QuoteGroupDetailServiceImpl.java
+++ b/src/main/java/com/spring/modules/quote/service/impl/QuoteGroupDetailServiceImpl.java
@@ -70,11 +70,16 @@ public class QuoteGroupDetailServiceImpl extends ServiceImpl<QuoteGroupDetailMap
         // 获取 ItemNo
         quoteGroupDetail.setItemNo(baseMapper.queryItemNo(quoteGroupDetail));
         QuoteDetail quoteDetail = new QuoteDetail();
+
+        // 2025-09-15 将汇率设置为1
+        quoteGroupDetail.setExchangeRate2(BigDecimal.ONE);
+
         // 复制属性
         BeanUtils.copyProperties(quoteGroupDetail,quoteDetail);
 
         // 两个币种同步
         quoteGroupDetail.setCurrency2(quoteGroupDetail.getCurrency1());
+
         save(quoteGroupDetail);// 新增并返回ID
         quoteDetail.setQuoteGroupDetailId(quoteGroupDetail.getId());
         return quoteDetailService.saveQuoteDetail(quoteDetail);
diff --git a/src/main/resources/mapper/quotation/QuotationInformationMapper.xml b/src/main/resources/mapper/quotation/QuotationInformationMapper.xml
index 57dd25a4..c13ea62a 100644
--- a/src/main/resources/mapper/quotation/QuotationInformationMapper.xml
+++ b/src/main/resources/mapper/quotation/QuotationInformationMapper.xml
@@ -138,6 +138,7 @@
         left join plm_customer_part_info pcpi on a.site = pcpi.site and a.test_part_no = pcpi.part_no and a.customer_no = pcpi.customer_no
         <where>
             a.site = #{query.site}
+            and a.quotation_no not in (select inside_inquiry_no from  plm_quote where  site = #{query.site})
             <if test="query.createBy != null and query.createBy != ''">
                 and vpp.bu_no in (select bu_No from dbo.Get_Now_BU_chooseAble(a.site, #{query.createBy}))
             </if>