|
|
@@ -46,6 +46,19 @@ class Goodup extends BaseController
|
|
|
if($supplierNo!==""){
|
|
|
$where[]=['supplierNo',"like","%$supplierNo%"];
|
|
|
}
|
|
|
+ $supplier = isset($this->post['supplier']) && $this->post['supplier'] !=="" ? trim($this->post['supplier'])
|
|
|
+ :"";
|
|
|
+ if($supplier!==""){
|
|
|
+ $suppliernos = Db::name("supplier")->where([["name","like","%$supplier%"]])->column("code");
|
|
|
+ $where[]=['supplierNo',"in",$suppliernos];
|
|
|
+ }
|
|
|
+ $company = isset($this->post['company']) && $this->post['company'] !=="" ? trim($this->post['company'])
|
|
|
+ :"";
|
|
|
+ if($company!==""){
|
|
|
+ $companyNos = Db::name("business")->where([["company","like","%$company%"]])->column("companyNo");
|
|
|
+ $where[]=['companyNo',"in",$companyNos];
|
|
|
+ }
|
|
|
+
|
|
|
$brandid = isset($this->post['brandid']) && $this->post['brandid'] !=="" ? intval($this->post['brandid'])
|
|
|
:"";
|
|
|
if($brandid!==""){
|
