1

app/Model/InquiryItemsReportModel.php

@@ -27,15 +27,12 @@ class InquiryItemsReportModel extends Model
             $con = DB::connection('rfq');
             $con->beginTransaction();
 
-            $report_sn = generateSnWithPreStringShort("R"); //报表单号
             $inquiry_id = $input["inquiry_id"];
             $currency = $input["currency"]; #币种
 
             $insertArr = []; //批量插入数组
             foreach ($input["items"] as $k=>$inquiry_items_id){
                $temp = [
-                    "types"=>$types ,
-                    "report_sn"=>$report_sn ,
                     "inquiry_id"=>$inquiry_id ,
                     "inquiry_items_id"=>$inquiry_items_id,
                     "goods_name"=>@$input["goods_name"][$k] ? $input["goods_name"][$k] : "" ,
@@ -62,18 +59,18 @@ class InquiryItemsReportModel extends Model
             $this->insert($insertArr); //批量插入
 
             $con->commit();
-            return [0,"成功",["report_sn"=>$report_sn]];
+            return [0,"成功",["inquiry_id"=>$inquiry_id]];
         }catch (\Exception $e) {
             return [1001,"提交失败，请重试！".$e->getMessage()];
         }
     }
 
     //生成报价pdf
-    public function createSalePdf($report_sn = ""){
-        if($report_sn == ""){
-            return [1001,"报表单号不得为空!"];
+    public function createSalePdf($inquiry_id = ""){
+        if($inquiry_id == ""){
+            return [1001,"询价单号不得为空!"];
         }
-        $itemsArr  = $this->where("report_sn",$report_sn)->get()->toArray();
+        $itemsArr  = $this->where("inquiry_id",$inquiry_id)->get()->toArray();
         $quote_price_count = 0;
         foreach ($itemsArr as $k=>&$v){
             $v["quote_account"] = $v["price_rmb"] > 0 ? $v["price_rmb"]*$v["inquiry_number"] : $v["price_origin"]*$v["inquiry_number"];