|
@@ -172,6 +172,10 @@ class WareHouse extends BaseController
|
|
|
if($wsm_name!=""){
|
|
|
$condition[]=["a.name","like","%{$wsm_name}%"];
|
|
|
}
|
|
|
+ $companyNo = isset($post['companyNo'])&&$post['companyNo']!="" ? trim($post['companyNo']) :"";
|
|
|
+ if($companyNo!=""){
|
|
|
+ $condition[]=["a.companyNo","like","%{$companyNo}%"];
|
|
|
+ }
|
|
|
$page = isset($post['page']) &&$post['page']!=='' ?intval($post['page']) :1;
|
|
|
$size = isset($post['size']) &&$post['size']!=='' ?intval($post['size']) :10;
|
|
|
$count = Db::name("warehouse_info")->alias("a")->join("warehouse_addr b ","a.wsm_code=b.wsm_code","left")
|