|
@@ -1517,7 +1517,7 @@ class FinishedOrderService extends Service
|
|
$model->where('b.dispatch_time_start','>=',$data['dispatch_time'][0]);
|
|
$model->where('b.dispatch_time_start','>=',$data['dispatch_time'][0]);
|
|
$model->where('b.dispatch_time_end','<=',$data['dispatch_time'][1]);
|
|
$model->where('b.dispatch_time_end','<=',$data['dispatch_time'][1]);
|
|
}
|
|
}
|
|
- if(! empty($data['pc_number'])) $model->where('b.out_order_no', 'LIKE', '%'.$data['out_order_no'].'%');
|
|
|
|
|
|
+ if(! empty($data['pc_number'])) $model->where('b.out_order_no', 'LIKE', '%'.$data['pc_number'].'%');
|
|
if(! empty($data['team_id'])) $model->where('b.team_id',$data['team_id']);
|
|
if(! empty($data['team_id'])) $model->where('b.team_id',$data['team_id']);
|
|
if(! empty($data['device_id'])) $model->where('b.device_id',$data['device_id']);
|
|
if(! empty($data['device_id'])) $model->where('b.device_id',$data['device_id']);
|
|
if(! empty($data['equipment_id'])) $model->where('b.device_id',$data['equipment_id']);
|
|
if(! empty($data['equipment_id'])) $model->where('b.device_id',$data['equipment_id']);
|