|
@@ -180,6 +180,10 @@ class WareHouse extends BaseController
|
|
|
if($companyNo!=""){
|
|
|
$condition[]=["a.companyNo","like","%{$companyNo}%"];
|
|
|
}
|
|
|
+ $wsm_type = isset($post['wsm_type'])&&$post['wsm_type']!="" ? (int)($post['wsm_type']) :0;
|
|
|
+ if($wsm_type){
|
|
|
+ $condition[]=["a.wsm_type",'=',$wsm_type];
|
|
|
+ }
|
|
|
$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")
|