Merge branch 'version1.5' of ssh://192.168.10.210:10022/wugg/stock into version1.5

app/admin/controller/Consult.php

@@ -1058,6 +1058,10 @@ class Consult extends Base
         if($info==false){
             return error_show(1004,"未找到商品数据");
         }
+        $bargain_price =  isset($this->post['bargain_price'])&& $this->post['bargain_price']!=""?floatval($this->post['bargain_price']):"";
+        if($bargain_price===""){
+            return error_show(1004,"参数bargain_price不能为空");
+        }
 
         $infos =Db::name("consult_info")->where(['infoNo'=>$info['infoNo'],"is_del"=>0])->find();
         if($infos==false){
@@ -1073,8 +1077,8 @@ class Consult extends Base
         }
         $createrid= isset($user["data"]['id']) ?  $user["data"]['id'] : "";
         $creater= isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
-        $bargainNo =makeNo("BAR");
-        Db::startTrans();
+        $bargainNo =makeNo("BA");
+        Db::startTrans();//::todo 金价 毛利计算
         try{
             $data=[
                 "bidsNo"=>$bidNo,
@@ -1085,7 +1089,7 @@ class Consult extends Base
                 "cost_after_price"=>$info['cost_fee'],
                 "before_rate"=>$info['cost_fee'],
                 "after_rate"=>$info['cost_fee'],
-                "after_price"=>$infos['budget_price'],
+                "after_price"=>$bargain_price,
                 "status"=>1,
                 "is_del"=>0,
                 "creater"=>$creater,

app/admin/controller/Project.php

@@ -290,6 +290,10 @@ class Project extends Base
         if($pgNo!==""){
           $where[]=["pgNo","=",$pgNo];
         }
+        $projectNo =isset($this->post['projectNo'])&&$this->post['projectNo']!==""?trim($this->post['projectNo']):"";
+        if($projectNo!==""){
+            $where[]=["projectNo","=",$projectNo];
+        }
         $source =isset($this->post['source'])&&$this->post['source']!==""?intval($this->post['source']):"";
         if($source!==""){
             $where[]=["data_source","=",$source];