税率从询价单中取值

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);
     }
 

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