diff --git a/app/Filament/Imports/LocatorImporter.php b/app/Filament/Imports/LocatorImporter.php index 7f589e8..ad97431 100644 --- a/app/Filament/Imports/LocatorImporter.php +++ b/app/Filament/Imports/LocatorImporter.php @@ -52,22 +52,31 @@ class LocatorImporter extends Importer public function resolveRecord(): ?Locator { $warnMsg = []; - $plant = Plant::where('code', $this->data['plant'])->first(); + $plantCod = $this->data['plant']; + $plant = null; + $user = null; $locator = $this->data['locator_number']; // $locatorQuantity = $this->data['locator_quantity']; $palletQuantity = 0; - $user = Filament::auth()->user()->name; - if (!$plant) { - $warnMsg[] = "Plant not found"; + if (Str::length($plantCod) < 4 || !is_numeric($plantCod) || !preg_match('/^[1-9]\d{3,}$/', $plantCod)) { + $warnMsg[] = "Invalid plant code found"; } else { - if (Str::length($locator) < 7) { - $warnMsg[] = "Invalid locator number found"; + $plant = Plant::where('code', $plantCod)->first(); + if (!$plant) { + $warnMsg[] = "Plant not found"; } - else { - // $locat = Locator::where('name', $locator)->where('plant_id', $plant->id)->first(); - $palletQuantity = PalletValidation::where('locator_number', $locator)->where('plant_id', $plant->id)->distinct('pallet_number')->count('pallet_number'); + else + { + $user = Filament::auth()->user()->name; + if (Str::length($locator) < 7) { + $warnMsg[] = "Invalid locator number found"; + } + else { + // $locat = Locator::where('name', $locator)->where('plant_id', $plant->id)->first(); + $palletQuantity = PalletValidation::where('locator_number', $locator)->where('plant_id', $plant->id)->distinct('pallet_number')->count('pallet_number'); + } } }