1

app/Model/InquiryItemsModel.php

@@ -356,6 +356,7 @@ class InquiryItemsModel extends Model
             $con->beginTransaction();
 
             $assignInsert = []; #指定领取人
+            $c = 0; #重复
             foreach ($goodsData[1] as $k=>&$b){
 
                 $insertArr= [
@@ -377,7 +378,13 @@ class InquiryItemsModel extends Model
                 #判断是否已经存在此品牌+型号
                 $check = $this->where(["inquiry_id"=>$inquiry_id,"goods_name"=>$b["goods_name"],"brand_name"=>$b["brand_name"]])->count();
                 if ($check >0){
-                    throw new Exception("型号：".$b["goods_name"]." 品牌：".$b["brand_name"]."不得重复上传");
+                    $c ++;
+                    continue;
+                    #throw new Exception("型号：".$b["goods_name"]." 品牌：".$b["brand_name"]."不得重复上传");
+                }
+
+                if (count($goodsData[1]) == $c){
+                    throw new Exception("所有数据都存在重复！");
                 }
 
 
@@ -470,8 +477,9 @@ class InquiryItemsModel extends Model
              $b2["inquiry_id"] = $inquiry_id;
 
              $hang = $a2+2; #对应excel第几行
+             $lie = 0;
              foreach ($b2 as $key=>$val) {
-                 $lie = $key+1;
+                 $lie = $lie+1;
                  $str_msg = '第'.$hang.'行'.$lie.'列:';
                  if (in_array($key, $filer_need) && empty($val)) {
                      $err[] = $str_msg.'数据不得为空';

app/Model/InquiryItemsReportModel.php

@@ -112,18 +112,19 @@ class InquiryItemsReportModel extends Model
     }
 
     /*
-     * 选中或者确定报价
+     * 选中或者确定 报价
      */
     public function OpQuote($data){
         $inquiry_items_id = $data["inquiry_items_id"]; #询价明细id
         $quote_id = $data["quote_id"]; #报价id
+        $status = $data["status"]; #状态： 2 选中 3 确定
+        $price = @$data["price"] ? $data["price"] : 0; #销售报价
 
         if ($inquiry_items_id <= 0) return [1001,"询价明细ID不得为空"];
         if ($quote_id <= 0) return [1001,"报价ID不得为空"];
 
-        $price = @$data["price"] ? $data["price"] : 0; #销售报价
-
         $QuoteModel =  new QuoteModel();
+        $InquiryItemsModel =  new InquiryItemsModel();
         $quoteItem = $QuoteModel->where("id",$quote_id)->first()->toArray();
         $currency = $quoteItem["currency"]; #报价币种
 
@@ -131,6 +132,19 @@ class InquiryItemsReportModel extends Model
         $mainCurrency = $inquiry["currency"]; #询价主单币种
         $rate = (new CommonModel())->getRate("美元"); #获取美元汇率
 
+        $itemInfo = $InquiryItemsModel->select("status")->where("id",$inquiry_items_id)->first()->toArray(); #询价明细
+
+        if ($status == 1){ #撤销
+            $InquiryItemsModel->where("id",$inquiry_items_id)->update(["status"=>1]); #更新报价待报价
+            #更新关联除了当前询价单 此询价明细的报价单状态
+            $QuoteModel->where("inquiry_items_id",$inquiry_items_id)->update(["status"=>1]); #重启其他所有状态为 已报价
+            return [0,"撤销成功"];
+        }
+
+        if ($status == 2 && $itemInfo["status"] == 5 ){ #选中之前判断有没有确定的报价
+            return [1007,"请先撤销已确认的报价"];
+        }
+
         $price_rmb = $price_origin =  "" ;
         if ($mainCurrency == 1  ){ #询价币种人民币
             $price_rmb = $currency != $mainCurrency  ? round($price*$rate,6):$price;
@@ -157,10 +171,12 @@ class InquiryItemsReportModel extends Model
 
         #更新报价报表
         (new InquiryItemsReportModel())->where("inquiry_items_id",$inquiry_items_id)->update($temp);
-        #更新报价单
-        (new QuoteModel())->where("id",$data["quote_id"])->update(["status"=>$data["status"]]); #更新报价选中
+        #更新当前报价单状态
+        $QuoteModel->where("id",$data["quote_id"])->update(["status"=>$status]); #更新报价选中
+        #更新关联除了当前询价单 此询价明细的报价单状态
+        $QuoteModel->where("inquiry_items_id",$inquiry_items_id)->whereNotIn("id",[$quote_id])->update(["status"=>1]); #重启其他所有状态为 已报价
         #更新询价明细表状态
-        (new InquiryItemsModel())->where("id",$inquiry_items_id)->update(["status"=>$data["status"] == 2 ? 3:5]);
+        (new InquiryItemsModel())->where("id",$inquiry_items_id)->update(["status"=>$status == 2 ? 3:5]);
 
         return [0,"成功"];
     }

app/Model/InquiryModel.php

@@ -135,7 +135,7 @@ class InquiryModel extends Model
 
             $currency_sign = $v['currency'] == 1 ? '￥' : '$';
 
-            $v['target_price'] = $currency_sign . $v['target_price']; // 客户目标报价
+            $v['target_price'] = $currency_sign . $v['target_price']."\t"; // 客户目标报价
 
             #查询所有报价
             $v['quote_price'] = "--";

app/Model/QuoteModel.php

@@ -700,37 +700,28 @@ class QuoteModel extends Model
             ->count();
     }
 
-    //询价： 选中  撤销  确认 -》 报价
+    //询价：  撤销 报价
     public function updateStatus($input)
     {
-        $id = $input['id'];
+        $quote_id = $input['id'];
         $status = $input['status'];
-        if (!$id) return [-1, '参数缺失'];
+        if (!$quote_id) return [-1, '参数缺失'];
 
         try {
+            $QuoteModel =  new QuoteModel();
+            $InquiryItemsModel =  new InquiryItemsModel();
 
-            $rqpConn = DB::connection('rfq');
-            $res = $this->where('id', $id)->update(['status' => $status, 'update_time'=>time()]);
-            $quote_info = $this->find($id);
-
+            $info = $QuoteModel->select("inquiry_items_id")->where("id",$quote_id)->first()->toArray();
+            $inquiry_items_id = $info["inquiry_items_id"];
             #更新询价明细表状态
-            $inquiry_items_id = $quote_info["inquiry_items_id"];
-            $sql = "select status from lie_quote where inquiry_items_id=$inquiry_items_id and status in (1,2,3) and id not in ($id)";
-            $has =$rqpConn->select($sql);
-            $check = 1;
-            if ($has){
-                $check = 0;
-            }
-
-            if($check){
-                (new InquiryItemsModel())->where("id",$quote_info["inquiry_items_id"])->update(["status"=>$status]);
-            }
+            $InquiryItemsModel->where("id",$inquiry_items_id)->update(["status"=>1, 'update_time'=>time()]); #更新报价待报价
+            #更新
+            $QuoteModel->where("inquiry_items_id",$inquiry_items_id)->update(["status"=>2, 'update_time'=>time()]); #重启其他所有状态为 已报价
 
             $data = [];
             $data['types']       = 1;
-            $data['relation_id'] = $id;
-            $data['relation_sn'] = $quote_info['quote_sn'];
-            $data['content']     = '询价操作报价：'.QuoteMap::$status[$status];
+            $data['relation_id'] = $inquiry_items_id;
+            $data['content']     = '撤销报价：'.QuoteMap::$status[$status];
             $data['create_uid']  = $input['user_id'];
             $data['create_name'] = $input["user_name"];