ad

app/admin/controller/Good.php

@@ -81,6 +81,10 @@ class Good extends \app\BaseController
         if($supplierNo!==""){
             $where[]=['supplierNo',"=",$supplierNo];
         }
+        $companyNo = isset($this->post['companyNo']) && $this->post['companyNo'] !=="" ? trim($this->post['companyNo']) :"";
+        if($companyNo!==""){
+            $where[]=['companyNo',"like","%$companyNo%"];
+        }
         $platform_code = isset($this->post['platform_code']) && $this->post['platform_code'] !=="" ? trim($this->post['platform_code'])
             :"";
         if($platform_code!==""){
@@ -101,6 +105,12 @@ class Good extends \app\BaseController
             $value['platform_name'] = isset($platform['platform_name']) ? $platform['platform_name']:"";
             $supplier = Db::name("supplier")->where(["code"=>$value['supplierNo']])->find();
             $value['supplier_name'] = isset($supplier['name']) ? $supplier['name']:"";
+            $brand=Db::name("brand")->where(["id"=>$value['brand_id']])->find();
+            $value["brand_name"]=isset($brand['brand_name'])?$brand['brand_name']:"";
+            $unit = Db::name("unit")->where(["id"=>$value['good_unit']])->find();
+            $value['unit'] =isset($unit['unit'])?$unit['unit']:"";
+            $company = Db::name("business")->where(["companyNo"=>$value['companyNo']])->find();
+            $value['company'] = isset($company['company'])?$company['company']:"";
             $data[]=$value;
         }
         return app_show(0,"获取成功",['list'=>$data,'count'=>$count]);

app/admin/controller/Goodup.php

@@ -39,7 +39,7 @@ class Goodup extends BaseController
         $companyNo = isset($this->post['companyNo']) && $this->post['companyNo'] !=="" ? trim($this->post['companyNo'])
             :"";
         if($companyNo!==""){
-            $where[]=['company_id',"like","%$companyNo%"];
+            $where[]=['companyNo',"like","%$companyNo%"];
         }
         $supplierNo = isset($this->post['supplierNo']) && $this->post['supplierNo'] !=="" ? trim($this->post['supplierNo'])
             :"";
@@ -70,7 +70,7 @@ class Goodup extends BaseController
                 $value["brand_name"]=isset($brand['brand_name'])?$brand['brand_name']:"";
                 $unit = Db::name("unit")->where(["id"=>$value['good_unit']])->find();
                 $value['unit'] =isset($unit['unit'])?$unit['unit']:"";
-                $company = Db::name("business")->where(["companyNo"=>$value['company_id']])->find();
+                $company = Db::name("business")->where(["companyNo"=>$value['companyNo']])->find();
                 $value['company'] = isset($company['company'])?$company['company']:"";
                 $supplier = Db::name("supplier")->where(['code'=>$value['supplierNo']])->find();
                 $value['supplier_name']=isset($supplier['name'])?$supplier['name']:"";
@@ -258,7 +258,7 @@ class Goodup extends BaseController
                 "moq"=>$moq,
                 "is_exclusive"=>$is_exclusive,
                 "customized"=>$customized,
-                "company_id"=>$company_id,
+                "companyNo"=>$company_id,
                 "tax"=>$tax,
                 "supplierNo"=>$supplierNo,
                 "is_auth"=>$is_auth,
@@ -507,7 +507,7 @@ class Goodup extends BaseController
             'brand_id'=>$brandid,
             "good_unit"=>$unit,
             "good_type"=>$good_type,
-            "company_id"=>$company_id,
+            "companyNo"=>$company_id,
             "moq"=>$moq,
             "is_exclusive"=>$is_exclusive,
             "customized"=>$customized,