From 47f575c443bdc35a2b1a9e0e7ab39ffbe9e995ff Mon Sep 17 00:00:00 2001
From: yanyan <513352169@qq.com>
Date: Tue, 21 Apr 2026 10:09:27 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A8=8E=E7=8E=87=E4=BB=8E=E8=AF=A2=E4=BB=B7?=
 =?UTF-8?q?=E5=8D=95=E4=B8=AD=E5=8F=96=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PurQuotationReplyHistServiceImpl.java     | 2 ++
 .../resources/mapper/supplier/PurQuotationDetailMapper.xml | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/xujie/modules/supplier/service/impl/PurQuotationReplyHistServiceImpl.java b/src/main/java/com/xujie/modules/supplier/service/impl/PurQuotationReplyHistServiceImpl.java
index 076741f..2e2a97e 100644
--- a/src/main/java/com/xujie/modules/supplier/service/impl/PurQuotationReplyHistServiceImpl.java
+++ b/src/main/java/com/xujie/modules/supplier/service/impl/PurQuotationReplyHistServiceImpl.java
@@ -97,7 +97,9 @@ public class PurQuotationReplyHistServiceImpl extends ServiceImpl<PurQuotationRe
         if(Objects.equals("已接受", model.getStatus())){
             purQuoDetailData.setActReplyDate(new Date());
         }
+        //更新物料状态
         purQuotationDetailMapper.updatePurDetailStatus(purQuoDetailData);
+        //更新报价状态
         baseMapper.updateById(model);
     }
 
diff --git a/src/main/resources/mapper/supplier/PurQuotationDetailMapper.xml b/src/main/resources/mapper/supplier/PurQuotationDetailMapper.xml
index b19516a..6d5dcbb 100644
--- a/src/main/resources/mapper/supplier/PurQuotationDetailMapper.xml
+++ b/src/main/resources/mapper/supplier/PurQuotationDetailMapper.xml
@@ -136,7 +136,7 @@
         , round((round(round(B.qty, 2) * round(B.price, 4), 2) + round(B.additional_cost, 2)) *
         round(A.currency_rate, 6), 2)   as total_vale_base
         , (round(round(B.qty, 2) * round(B.price, 4), 2) + round(B.additional_cost, 2)) as total_vale
-        , (SELECT dbo.Get_Tax_TaxRate(A.site, D.taxCode))  as taxRate
+        , (SELECT dbo.Get_Tax_TaxRate(A.site, A.tax_code))  as taxRate
 
         from PurQuotationHeader as A
         left join PurQuotationDetail B on A.site = B.site and A.order_no = B.order_no
@@ -258,7 +258,7 @@
         , round((round(round(B.qty, 2) * round(B.price, 4), 2) + round(B.additional_cost, 2)) *
         round(A.currency_rate, 6), 2)   as total_vale_base
         , (round(round(B.qty, 2) * round(B.price, 4), 2) + round(B.additional_cost, 2)) as total_vale
-        , (SELECT dbo.Get_Tax_TaxRate(A.site, D.taxCode))  as taxRate
+        , (SELECT dbo.Get_Tax_TaxRate(A.site, A.tax_code))  as taxRate
 
         from PurQuotationHeader as A
         left join PurQuotationDetail B on A.site = B.site and A.order_no = B.order_no
@@ -312,8 +312,9 @@
         , P.part_spec as spec
 
         ,H.qty,H.umid,H.convert_factor,H.price
-        ,H.tax_rate,H.tax,H.material_cost ,H.produce_fee,H.profit,H.additional_cost,H.freight,H.duty
+        ,H.tax,H.material_cost ,H.produce_fee,H.profit,H.additional_cost,H.freight,H.duty
         ,H.surface_fee ,H.purchase_cycle ,H.mould_fee ,H.reason, H.remark
+        , (SELECT dbo.Get_Tax_TaxRate(A.site, A.tax_code))  as taxRate
 
         from PurQuotationHeader as A
         left join PurQuotationDetail B on A.site = B.site and A.order_no = B.order_no