1

app/Model/InquiryItemsReportModel.php

@@ -130,19 +130,20 @@ class InquiryItemsReportModel extends Model
         $quote_id = $data["quote_id"]; #报价id
         $quote_id = $data["quote_id"]; #报价id
         $status = $data["status"]; #状态： 2 选中 3 确定
         $status = $data["status"]; #状态： 2 选中 3 确定
         $delivery_time = $data["delivery_time"]; #货期
         $delivery_time = $data["delivery_time"]; #货期
-        $price = @$data["price"] ? $data["price"] : 0; #销售报价
+        $sale_price = @$data["price"] ? $data["price"] : 0; #销售报价
 
 
         if ($inquiry_items_id <= 0) return [1001,"询价明细ID不得为空"];
         if ($inquiry_items_id <= 0) return [1001,"询价明细ID不得为空"];
         if ($quote_id <= 0) return [1001,"报价ID不得为空"];
         if ($quote_id <= 0) return [1001,"报价ID不得为空"];
 
 
         $QuoteModel =  new QuoteModel();
         $QuoteModel =  new QuoteModel();
+        $CommonModel =  new CommonModel();
         $InquiryItemsModel =  new InquiryItemsModel();
         $InquiryItemsModel =  new InquiryItemsModel();
         $quoteItem = $QuoteModel->where("id",$quote_id)->first()->toArray();
         $quoteItem = $QuoteModel->where("id",$quote_id)->first()->toArray();
         $currency = $quoteItem["currency"]; #报价币种
         $currency = $quoteItem["currency"]; #报价币种
 
 
         $inquiry = (new InquiryModel())->select("currency")->where("id",$quoteItem["inquiry_id"])->first()->toArray();
         $inquiry = (new InquiryModel())->select("currency")->where("id",$quoteItem["inquiry_id"])->first()->toArray();
         $mainCurrency = $inquiry["currency"]; #询价主单币种
         $mainCurrency = $inquiry["currency"]; #询价主单币种
-        $rate = (new CommonModel())->getRate($mainCurrency); #获取汇率
+
 
 
         $itemInfo = $InquiryItemsModel->select("status","goods_name")->where("id",$inquiry_items_id)->first()->toArray(); #询价明细
         $itemInfo = $InquiryItemsModel->select("status","goods_name")->where("id",$inquiry_items_id)->first()->toArray(); #询价明细
 
 
@@ -157,12 +158,16 @@ class InquiryItemsReportModel extends Model
             return [1007,"请先撤销已确认的报价"];
             return [1007,"请先撤销已确认的报价"];
         }
         }
 
 
-        $price_rmb = $price_origin =  "" ;
-        if ($mainCurrency == 1  ){ #询价币种人民币
-            $price_rmb = $currency != $mainCurrency  ? round($price*$rate,6):$price;
+        $price_rmb = $price_origin =  "";
+        if ($mainCurrency == 1 && $currency != $mainCurrency ){ #询价币种人民币
+            $rate1 = $CommonModel->getRate($currency); #获取汇率
+            $price_rmb = round($sale_price*$rate1,6);
         }
         }
-        if ($mainCurrency >1 ){ #询价币种美金
-            $price_origin = $currency != $mainCurrency  ? round($price/$rate,6):$price;
+        if ($mainCurrency >1 && $currency != $mainCurrency ){ #询价单其他币种转人民币
+            $rate2 = $CommonModel->getRate($currency); #转人民币汇率
+            $rate3 = $CommonModel->getRate($mainCurrency); #获取汇率
+            $salePrice = $sale_price*$rate2;
+            $price_origin = round($salePrice/$rate3,6);
         }
         }
 
 
         $temp = [
         $temp = [
@@ -182,7 +187,7 @@ class InquiryItemsReportModel extends Model
             "raw_brand_name"=>$quoteItem["raw_brand_name"],
             "raw_brand_name"=>$quoteItem["raw_brand_name"],
             "price_rmb"=>$price_rmb,
             "price_rmb"=>$price_rmb,
             "price_origin"=>$price_origin,
             "price_origin"=>$price_origin,
-            "price_profile"=>$price,
+            "price_profile"=>$sale_price,
             "inquiry_number"=>$quoteItem["quote_number"],
             "inquiry_number"=>$quoteItem["quote_number"],
             "delivery_time"=>$delivery_time,
             "delivery_time"=>$delivery_time,
             "batch"=>$quoteItem["batch"],
             "batch"=>$quoteItem["batch"],