|
|
@@ -356,18 +356,18 @@ class Whlabelfz extends Start_Controller
|
|
|
|
|
|
}
|
|
|
|
|
|
- $user = $this->user->get_api($_SESSION['api']);
|
|
|
- $warehouses = $user['warehouse'];
|
|
|
- if(empty($warehouses)){
|
|
|
- exit('没有仓库权限！！！');
|
|
|
- }
|
|
|
- $warehouses = explode('|',trim($warehouses,'|'));
|
|
|
- $ware_list = [];
|
|
|
- foreach ($warehouses as $v) {
|
|
|
- if(!empty($v)){
|
|
|
- $ware_list[] = $v;
|
|
|
- }
|
|
|
- }
|
|
|
+ // $user = $this->user->get_api($_SESSION['api']);
|
|
|
+ // $warehouses = $user['warehouse'];
|
|
|
+ // if(empty($warehouses)){
|
|
|
+ // exit('没有仓库权限！！！');
|
|
|
+ // }
|
|
|
+ // $warehouses = explode('|',trim($warehouses,'|'));
|
|
|
+ // $ware_list = [];
|
|
|
+ // foreach ($warehouses as $v) {
|
|
|
+ // if(!empty($v)){
|
|
|
+ // $ware_list[] = $v;
|
|
|
+ // }
|
|
|
+ // }
|
|
|
|
|
|
$category = $this->input->get('category', true);
|
|
|
$size = $this->input->get('size', true);
|
|
|
@@ -381,18 +381,25 @@ class Whlabelfz extends Start_Controller
|
|
|
$jtime = $this->input->get('jtime', true);
|
|
|
$ktime = strtotime($ktime);
|
|
|
$jtime = strtotime($jtime);
|
|
|
- $where = "";
|
|
|
- if ($warehouse) {
|
|
|
- if(in_array($warehouse,$ware_list)){
|
|
|
- $where .= " warehouse = '$warehouse' ";
|
|
|
- }else{
|
|
|
- $where .= " warehouse = 0 ";
|
|
|
- }
|
|
|
+ $where = " ";
|
|
|
+ // if ($warehouse) {
|
|
|
+ // if(in_array($warehouse,$ware_list)){
|
|
|
+ // $where .= " warehouse = '$warehouse' ";
|
|
|
+ // }else{
|
|
|
+ // $where .= " warehouse = 0 ";
|
|
|
+ // }
|
|
|
|
|
|
|
|
|
+ // }else{
|
|
|
+ // $where .= " warehouse in (".implode(',',$ware_list).")";
|
|
|
+ // }
|
|
|
+ if($warehouse){
|
|
|
+ $where .= " warehouse = '$warehouse' ";
|
|
|
}else{
|
|
|
- $where .= " warehouse in (".implode(',',$ware_list).")";
|
|
|
+ $where .=" 1 = 1 ";
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
if ($category) {
|
|
|
$where .= " and features like '%-$category-%'";
|
|
|
}
|
