|
|
@@ -21,10 +21,10 @@ class WeighExceptedController extends Controller
|
|
|
$paginate=$request->input('paginate');
|
|
|
if ($paginate){
|
|
|
$weightExcepteds=Package::select('id','status','logistic_number','logistic_id','measuring_machine_id','created_at','weight','length','width','height','bulk','paper_box_id')->
|
|
|
- where('status','上传异常')->orWhere('status','测量异常')->orWhere('status','记录异常')->orWhere('status','已上传异常')->orderBy('created_at','DESC')->paginate($paginate);
|
|
|
+ where('status','上传异常')->orWhere('status','测量异常')->orderBy('created_at','DESC')->paginate($paginate);
|
|
|
}else{
|
|
|
$weightExcepteds=Package::select('id','status','logistic_number','logistic_id','measuring_machine_id','created_at','weight','length','width','height','bulk','paper_box_id')->
|
|
|
- where('status','上传异常')->orWhere('status','测量异常')->orWhere('status','记录异常')->orWhere('status','已上传异常')->orderBy('created_at','DESC')->paginate(50);
|
|
|
+ where('status','上传异常')->orWhere('status','测量异常')->orderBy('created_at','DESC')->paginate(50);
|
|
|
};
|
|
|
return view('weight.weightExcepted.index',['weightExcepteds'=>$weightExcepteds,'view'=>'indexCreate']);
|
|
|
}
|
|
|
@@ -34,10 +34,10 @@ class WeighExceptedController extends Controller
|
|
|
$paginate=$request->input('paginate');
|
|
|
if ($paginate){
|
|
|
$weightExcepteds=Package::select('id','owner_id','logistic_number','created_at','delivery_number','batch_number','batch_rule','recipient','recipient_mobile','logistic_id')->
|
|
|
- where('status','下发异常')->orderBy('created_at','DESC')->paginate($paginate);
|
|
|
+ where('status','下发异常')->orWhere('status','记录异常')->orWhere('status','已上传异常')->orderBy('created_at','DESC')->paginate($paginate);
|
|
|
}else{
|
|
|
$weightExcepteds=Package::select('id','owner_id','logistic_number','created_at','delivery_number','batch_number','batch_rule','recipient','recipient_mobile','logistic_id')->
|
|
|
- where('status','下发异常')->orderBy('created_at','DESC')->paginate(50);
|
|
|
+ where('status','下发异常')->orWhere('status','记录异常')->orWhere('status','已上传异常')->orderBy('created_at','DESC')->paginate(50);
|
|
|
};
|
|
|
return view('weight.weightExcepted.index',['weightExcepteds'=>$weightExcepteds,'view'=>'indexIssued']);
|
|
|
}
|