Refactor pallet number query to filter by prefix and change sorting order
This commit is contained in:
@@ -310,11 +310,15 @@ class PalletValidationResource extends Resource
|
|||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
return PalletValidation::where('plant_id', $plantId)
|
return PalletValidation::where('plant_id', $plantId)
|
||||||
->whereNotNull('pallet_number')
|
// ->whereNotNull('pallet_number')
|
||||||
->where('pallet_number','!=', '')
|
// ->where('pallet_number', '!=', '')
|
||||||
->orderBy('pallet_number', 'asc')
|
->where('pallet_number', 'like', 'EP-' . '%')
|
||||||
|
// ->where(function($query) {
|
||||||
|
// $query->where('pallet_number', '!=', null)->where('pallet_number', '!=', '');
|
||||||
|
// })
|
||||||
|
->orderBy('pallet_number', 'desc')
|
||||||
->get()
|
->get()
|
||||||
->unique('pallet_number')
|
//->unique('pallet_number')
|
||||||
->pluck('pallet_number', 'pallet_number')
|
->pluck('pallet_number', 'pallet_number')
|
||||||
->toArray();
|
->toArray();
|
||||||
})
|
})
|
||||||
@@ -528,6 +532,7 @@ class PalletValidationResource extends Resource
|
|||||||
->required()
|
->required()
|
||||||
->reactive()
|
->reactive()
|
||||||
->columnSpan(1)
|
->columnSpan(1)
|
||||||
|
//->optionsLimit(500)
|
||||||
->options(function (callable $get) {
|
->options(function (callable $get) {
|
||||||
$plantId = $get('plant');
|
$plantId = $get('plant');
|
||||||
|
|
||||||
@@ -535,13 +540,13 @@ class PalletValidationResource extends Resource
|
|||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
|
|
||||||
return PalletValidation::query()
|
return PalletValidation::query()->where('plant_id', $plantId)
|
||||||
->where('plant_id', $plantId)
|
// ->whereNotNull('pallet_number')
|
||||||
->whereNotNull('pallet_number')
|
// ->where('pallet_number', '!=', '')
|
||||||
->where('pallet_number', '!=', '')
|
->where('pallet_number', 'like', 'EP-' . '%')
|
||||||
->select('pallet_number')
|
->select('pallet_number')
|
||||||
->distinct()
|
->distinct()
|
||||||
->orderBy('pallet_number')
|
->orderBy('pallet_number', 'desc')
|
||||||
->pluck('pallet_number', 'pallet_number')
|
->pluck('pallet_number', 'pallet_number')
|
||||||
->toArray();
|
->toArray();
|
||||||
}),
|
}),
|
||||||
|
|||||||
Reference in New Issue
Block a user