|
@@ -654,14 +654,14 @@ class Whlabelfz1 extends Start_Controller
|
|
|
$type = $this->input->get('type',true);
|
|
$type = $this->input->get('type',true);
|
|
|
$timetk = strtotime($timetk);
|
|
$timetk = strtotime($timetk);
|
|
|
$timetj = strtotime($timetj);
|
|
$timetj = strtotime($timetj);
|
|
|
-
|
|
|
|
|
|
|
+ $orderinfo = $this->input->get('orderinfo',true);
|
|
|
$where_sql = " 1=1 ";
|
|
$where_sql = " 1=1 ";
|
|
|
if($timetk&&$timetj){
|
|
if($timetk&&$timetj){
|
|
|
$where_sql .= " and scantime >= ".$timetk ." and scantime <= ".$timetj." ";
|
|
$where_sql .= " and scantime >= ".$timetk ." and scantime <= ".$timetj." ";
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
- if(!empty($post['orderinfo'])){
|
|
|
|
|
- $where_sql .=" and orderinfo = '".$post['orderinfo']."' ";
|
|
|
|
|
|
|
+ if(!empty($orderinfo)){
|
|
|
|
|
+ $where_sql .=" and orderinfo = '".$orderinfo."' ";
|
|
|
}
|
|
}
|
|
|
if($type){
|
|
if($type){
|
|
|
$where_sql .=" and type = ".$type." ";
|
|
$where_sql .=" and type = ".$type." ";
|
