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

app/admin/controller/Project.php

@@ -304,45 +304,50 @@ class Project extends Base
         $data=[];
         foreach ($list as $value){
             $value['can']=isset($value['cat_id'])&&$value['cat_id']!=""?made($value['cat_id']):"";
+
             if($value['data_source']==1){
                 $good=Db::name("good_platform")->alias("a")->leftJoin("good b","a.spuCode=b.spuCode")->where
-                (["a.skuCode"=>$value['skuCode'],"a.is_del"=>0])->select()->toArray();
+                (["a.skuCode"=>$value['skuCode'],"a.is_del"=>0])->find();
                 $good['unit_id'] = isset($good['good_unit'])?$good['good_unit']:"";
                 $good['cost_desc'] = isset($good['craft_desc'])?$good['craft_desc']:"";
                 $good['pakge_fee'] = isset($good['packing_fee'])?$good['packing_fee']:"0";
                 $good['nake_fee'] = isset($good['nake_price'])?$good['nake_price']:"0";
                 $good['metal_id'] = isset($good['noble_metal'])?$good['noble_metal']:"0";
             }else{
-                $good=Db::name("consult_bids")->where(["spuCode"=>$value['spuCode'],"is_del"=>0])->select()->toArray();
+                $good=Db::name("consult_bids")->where(["spuCode"=>$value['spuCode'],"is_del"=>0])->find();
             }
-            $value['good_name'] = iseet($good['good_name'])?$good['good_name']:"";
-            $value['brand_id'] = iseet($good['brand_id'])?$good['brand_id']:"";
-            $value['specinfo'] = iseet($good['specinfo'])?$good['specinfo']:"";
-            $value['unit_id'] = iseet($good['unit_id'])?$good['unit_id']:"";
-            $value['cost_desc'] = iseet($good['cost_desc'])?$good['cost_desc']:"";
-            $value['work_day'] = iseet($good['work_day'])?$good['work_day']:"";
-            $value['good_img'] = iseet($good['good_img'])?$good['good_img']:"";
-            $value['expire_day'] = iseet($good['expire_day'])?$good['expire_day']:"";
-            $value['origin_place'] = iseet($good['origin_place'])?$good['origin_place']:"";
-            $value['supplierNo'] = iseet($good['supplierNo'])?$good['supplierNo']:"";
-            $value['pay_way'] = iseet($good['pay_way'])?$good['pay_way']:"";
-            $value['tax'] = iseet($good['tax'])?$good['tax']:"";
-            $value['send_way'] = iseet($good['send_way'])?$good['send_way']:"";
-            $value['metal_id'] = iseet($good['metal_id'])?$good['metal_id']:"";
-            $value['is_gold_price'] = iseet($good['is_gold_price'])?$good['is_gold_price']:"";
-            $value['config'] = iseet($good['config'])?$good['config']:"";
-            $value['weight'] = iseet($good['weight'])?$good['weight']:"";
-            $value['is_diff'] = iseet($good['is_diff'])?$good['is_diff']:"0";
-            $value['demo_fee'] = iseet($good['demo_fee'])?$good['demo_fee']:"0";
-            $value['deivery_fee'] = iseet($good['deivery_fee'])?$good['deivery_fee']:"0";
-            $value['open_fee'] = iseet($good['open_fee'])?$good['open_fee']:"0";
-            $value['pakge_fee'] = iseet($good['pakge_fee'])?$good['pakge_fee']:"0";
-            $value['nake_fee'] = iseet($good['nake_fee'])?$good['nake_fee']:"0";
-            $value['mark_fee'] = iseet($good['mark_fee'])?$good['mark_fee']:"0";
-            $value['cert_fee'] = iseet($good['cert_fee'])?$good['cert_fee']:"0";
-            $value['cost_fee'] = iseet($good['cost_fee'])?$good['cost_fee']:"0";
-            //$value['total_fee'] = iseet($good['total_fee'])?$good['total_fee']:"0";
-            $value['supply_area'] = iseet($good['supply_area'])?$good['supply_area']:"";
+            $value['good_name'] = isset($good['good_name'])?$good['good_name']:"";
+            $value['brand_id'] = isset($good['brand_id'])?$good['brand_id']:"";
+            $brand = Db::name("brand")->where(['id'=>$value["brand_id"]])->find();
+            $value['brand_name'] =isset($brand['brand_name']) ? $brand['brand_name']:"";
+            $value['specinfo'] = isset($good['specinfo'])?json_decode($good['specinfo'],true):"";
+            $value['unit_id'] = isset($good['unit_id'])?$good['unit_id']:"";
+            $unit = Db::name("unit")->where(['id'=>$value["unit_id"]])->find();
+            $value["unit_name"]=isset($unit['unit'])?$unit['unit']:"";
+            $value['cost_desc'] = isset($good['cost_desc'])?$good['cost_desc']:"";
+            $value['work_day'] = isset($good['work_day'])?$good['work_day']:"";
+            $value['good_img'] = isset($good['good_img'])?$good['good_img']:"";
+            $value['expire_day'] = isset($good['expire_day'])?$good['expire_day']:"";
+            $value['origin_place'] = isset($good['origin_place'])?$good['origin_place']:"";
+            $value['supplierNo'] = isset($good['supplierNo'])?$good['supplierNo']:"";
+            $value['pay_way'] = isset($good['pay_way'])?$good['pay_way']:"";
+            $value['tax'] = isset($good['tax'])?$good['tax']:"";
+            $value['send_way'] = isset($good['send_way'])?$good['send_way']:"";
+            $value['metal_id'] = isset($good['metal_id'])?$good['metal_id']:"";
+            $value['is_gold_price'] = isset($good['is_gold_price'])?$good['is_gold_price']:"";
+            $value['config'] = isset($good['config'])?$good['config']:"";
+            $value['weight'] = isset($good['weight'])?$good['weight']:"";
+            $value['is_diff'] = isset($good['is_diff'])?$good['is_diff']:"0";
+            $value['demo_fee'] = isset($good['demo_fee'])?$good['demo_fee']:"0";
+            $value['deivery_fee'] = isset($good['deivery_fee'])?$good['deivery_fee']:"0";
+            $value['open_fee'] = isset($good['open_fee'])?$good['open_fee']:"0";
+            $value['pakge_fee'] = isset($good['pakge_fee'])?$good['pakge_fee']:"0";
+            $value['nake_fee'] = isset($good['nake_fee'])?$good['nake_fee']:"0";
+            $value['mark_fee'] = isset($good['mark_fee'])?$good['mark_fee']:"0";
+            $value['cert_fee'] = isset($good['cert_fee'])?$good['cert_fee']:"0";
+            $value['cost_fee'] = isset($good['cost_fee'])?$good['cost_fee']:"0";
+            //$value['total_fee'] = isset($good['total_fee'])?$good['total_fee']:"0";
+            $value['supply_area'] = isset($good['supply_area'])?$good['supply_area']:"";
             $data[]=$value;
         }
         return app_show(0,"获取成功",['list'=>$data,'count'=>$count]);
@@ -561,7 +566,7 @@ class Project extends Base
                         $count = Db::name("project_info")->where(["projectNo"=>$value['projectNo'],"status"=>2])
                             ->count();
                         if($count==0){
-                            $proc =Db::name("project")->where(["projectNo"=>$value['projectNo'],"status"=>2])->save
+                            $proc =Db::name("project")->where(["projectNo"=>$value['projectNo']])->save
                             (["status"=>3,"updatetime"=>date("Y-m-d H:i:s")]);
                             if(!$proc){
                                 Db::rollback();

app/admin/controller/Purch.php

@@ -552,35 +552,35 @@ class Purch extends Base
 
     }
 
-    public function create(){
-        $customer = isset($this->post['customer_code'])&&$this->post['customer_code']!="" ?trim($this->post['customer_code']):"";
-        if($customer==""){
-            return error_show(1004,"参数customer_code不能为空");
-        }
-        $supplier = isset($this->post['supplier_code'])&&$this->post['supplier_code']!="" ?trim($this->post['supplier_code']):"";
-        if($supplier==""){
-            return error_show(1004,"参数supplier_code不能为空");
-        }
-        $good_code = isset($this->post['good_code']) && $this->post['good_code']!=""?trim($this->post['good_code']):"";
-        if($good_code==""){
-            return error_show(1004,"参数good_code不能为空");
-        }
-        $good_num = isset($this->post['good_num'])&& $this->post['good_num']!==""? intval($this->post['good_num']):"";
-        if($good_num===""){
-            return error_show(1004,"参数good_code不能为空");
-        }
-        $file_url = isset($this->post['file_url'])&& $this->post['file_url']!==""? trim($this->post['file_url']):"";
-        if($file_url===""){
-            return error_show(1004,"参数file_url不能为空");
-        }
-        $mark =isset($this->post['remark'])&&$this->post['remark']!=""?trim($this->post['remark']):"";
-        if($mark==""){
-            return error_show(1004,"参数remark不能为空");
-        }
-
-        $data=[
-            ""
-        ];
-    }
+//    public function create(){
+//        $customer = isset($this->post['customer_code'])&&$this->post['customer_code']!="" ?trim($this->post['customer_code']):"";
+//        if($customer==""){
+//            return error_show(1004,"参数customer_code不能为空");
+//        }
+//        $supplier = isset($this->post['supplier_code'])&&$this->post['supplier_code']!="" ?trim($this->post['supplier_code']):"";
+//        if($supplier==""){
+//            return error_show(1004,"参数supplier_code不能为空");
+//        }
+//        $good_code = isset($this->post['good_code']) && $this->post['good_code']!=""?trim($this->post['good_code']):"";
+//        if($good_code==""){
+//            return error_show(1004,"参数good_code不能为空");
+//        }
+//        $good_num = isset($this->post['good_num'])&& $this->post['good_num']!==""? intval($this->post['good_num']):"";
+//        if($good_num===""){
+//            return error_show(1004,"参数good_code不能为空");
+//        }
+//        $file_url = isset($this->post['file_url'])&& $this->post['file_url']!==""? trim($this->post['file_url']):"";
+//        if($file_url===""){
+//            return error_show(1004,"参数file_url不能为空");
+//        }
+//        $mark =isset($this->post['remark'])&&$this->post['remark']!=""?trim($this->post['remark']):"";
+//        if($mark==""){
+//            return error_show(1004,"参数remark不能为空");
+//        }
+//
+//        $data=[
+//            ""
+//        ];
+//    }
 
 }