|
@@ -173,10 +173,10 @@ class WareHouse extends Base
|
|
|
|
|
|
$condition= [['a.is_del',"=",0],["b.is_del","=",0]];
|
|
|
|
|
|
-// $supplier = isset($post['supplierNo'])&&$post['supplierNo']!="" ? trim($post['supplierNo']) :"";
|
|
|
-// if($supplier!=""){
|
|
|
-// $condition[]=["supplierNo","=",$supplier];
|
|
|
-// }
|
|
|
+ $supplier = isset($post['supplierNo'])&&$post['supplierNo']!="" ? trim($post['supplierNo']) :"";
|
|
|
+ if($supplier!=""){
|
|
|
+ $condition[]=["supplierNo","=",$supplier];
|
|
|
+ }
|
|
|
// $companyNo = isset($post['companyNo'])&&$post['companyNo']!="" ? trim($post['companyNo']) :"";
|
|
|
// if($companyNo!=""){
|
|
|
// $condition[]=["companyNo","=",$companyNo];
|