|
@@ -255,9 +255,7 @@ class ScrappService extends Service
|
|
|
->orderBy('dispatch_sub_id','desc')
|
|
|
->groupBy('order_number');
|
|
|
|
|
|
- if(! empty($data['order_number'])) {
|
|
|
- if(! empty($order_number)) $model->where('order_number', 'LIKE', '%'.$order_number.'%');
|
|
|
- }
|
|
|
+ if(! empty($data['order_number'])) $model->where('order_number', 'LIKE', '%'.$data['order_number'].'%');
|
|
|
if(! empty($data['dispatch_no'])) {
|
|
|
$dispatch_id = DispatchSub::where('del_time',0)
|
|
|
->where('dispatch_no', 'LIKE', '%'.$data['dispatch_no'].'%')
|