diff --git a/app/Filament/Imports/PalletValidationImporter.php b/app/Filament/Imports/PalletValidationImporter.php
index d692dc5..1b400f6 100644
--- a/app/Filament/Imports/PalletValidationImporter.php
+++ b/app/Filament/Imports/PalletValidationImporter.php
@@ -3,9 +3,14 @@
 namespace App\Filament\Imports;
 
 use App\Models\PalletValidation;
+use App\Models\Plant;
+use App\Models\User;
+use Carbon\Carbon;
+use Filament\Actions\Imports\Exceptions\RowImportFailedException;
 use Filament\Actions\Imports\ImportColumn;
 use Filament\Actions\Imports\Importer;
 use Filament\Actions\Imports\Models\Import;
+use Str;
 
 class PalletValidationImporter extends Importer
 {
@@ -14,75 +19,229 @@ class PalletValidationImporter extends Importer
     public static function getColumns(): array
     {
         return [
+            ImportColumn::make('plant')
+                ->requiredMapping()
+                ->label('Plant Code')
+                ->exampleHeader('Plant Code')
+                ->example('1000')
+                ->relationship(resolveUsing: 'code')
+                ->rules(['required']),
+            ImportColumn::make('serial_number')
+                ->requiredMapping()
+                ->label('Serial Number')
+                ->exampleHeader('Serial Number')
+                ->example('12345678901234')
+                ->rules(['required']),
             ImportColumn::make('pallet_number')
                 ->requiredMapping()
                 ->label('Pallet Number')
-                ->example('EP-2505001'),
-            ImportColumn::make('serial_number')
-                ->requiredMapping()
-                ->example('12345678901234')
-                ->rules(['required']),
+                ->exampleHeader('Pallet Number')
+                ->example('EP-2507001'),
             ImportColumn::make('pallet_status')
                 ->requiredMapping()
                 ->label('Pallet Status')
+                ->exampleHeader('Pallet Status')
                 ->example('Completed'),
             ImportColumn::make('locator_number')
                 ->requiredMapping()
                 ->label('Locator Number')
+                ->exampleHeader('Locator Number')
                 ->example('W05-D1B'),
             ImportColumn::make('locator_quantity')
+                ->requiredMapping()
                 ->label('Locator Quantity')
-                ->requiredMapping()
-                ->numeric()
+                ->exampleHeader('Locator Quantity')
                 ->example(1)
-                ->rules(['required', 'integer']),
-            ImportColumn::make('plant')
-                ->requiredMapping()
-                ->exampleHeader('Plant Name')
-                ->example('Ransar Industries-I')
-                ->label('Plant Name')
-                ->relationship(resolveUsing: 'name')
                 ->rules(['required']),
             ImportColumn::make('created_at')
+                ->requiredMapping()
                 ->label('Created At')
-                ->requiredMapping()
-                ->example('01-01-2025 08:00:00')
-                ->rules(['required']),
-            ImportColumn::make('updated_at')
-                ->label('Updated At')
-                ->requiredMapping()
+                ->exampleHeader('Created At')
                 ->example('01-01-2025 08:00:00')
                 ->rules(['required']),
             ImportColumn::make('scanned_at')
-                ->label('Scanned At')
                 ->requiredMapping()
+                ->label('Scanned At')
+                ->exampleHeader('Scanned At')
+                ->example('01-01-2025 08:00:00')
+                ->rules(['required']),
+            ImportColumn::make('updated_at')
+                ->requiredMapping()
+                ->label('Updated At')
+                ->exampleHeader('Updated At')
                 ->example('01-01-2025 08:00:00')
                 ->rules(['required']),
             ImportColumn::make('created_by')
-                ->label('Created By')
                 ->requiredMapping()
-                ->example('Jothi')
+                ->label('Created By')
+                ->exampleHeader('Created By')
+                ->example('Admin')
                 ->rules(['required']),
             ImportColumn::make('scanned_by')
-                ->label('Scanned By')
                 ->requiredMapping()
-                ->example('Jothi')
+                ->label('Scanned By')
+                ->exampleHeader('Scanned By')
+                ->example('Admin')
                 ->rules(['required']),
             ImportColumn::make('updated_by')
+                ->requiredMapping()
                 ->label('Updated By')
-                ->example('Jothi')
-                ->requiredMapping(),
+                ->exampleHeader('Updated By')
+                ->example('Admin'),
         ];
     }
 
     public function resolveRecord(): ?PalletValidation
     {
-        // return PalletValidation::firstOrNew([
-        //     // Update existing records, matching them by `$this->data['column_name']`
-        //     'email' => $this->data['email'],
-        // ]);
+        $warnMsg = [];
+        $plantCod = $this->data['plant'];
+        $plant = null;
+        $serialNo = $this->data['serial_number'];
+        $palletNo = $this->data['pallet_number'];
+        $palletStat = $this->data['pallet_status'];
+        $locatorNo = $this->data['locator_number'];
+        $locatorQty = $this->data['locator_quantity'];
+        $createdAt = $this->data['created_at'];
+        $scannedAt = $this->data['scanned_at'];
+        $updatedAt = $this->data['updated_at'];
+        $cDateTime = null;
+        $sDateTime = null;
+        $uDateTime = null;
+        $createdBy = $this->data['created_by'];
+        $scannedBy = $this->data['scanned_by'];
+        $updatedBy = $this->data['updated_by'];
 
-        return new PalletValidation();
+        if (Str::length($plantCod) < 4 || !is_numeric($plantCod) || !preg_match('/^[1-9]\d{3,}$/', $plantCod)) {
+            $warnMsg[] = "Invalid plant code found";
+        }
+        else
+        {
+            $plant = Plant::where('code', $this->data['plant'])->first();
+            if (!$plant) {
+                $warnMsg[] = "Plant not found";
+            }
+            else
+            {
+                if (Str::length($serialNo) < 9 || !ctype_alnum($serialNo)) {
+                    $warnMsg[] = "Invalid serial number found";
+                }
+                if (Str::length($palletNo) > 0 && Str::length($palletNo) < 10) {
+                    $warnMsg[] = "Invalid pallet number found";
+                }
+                if (Str::length($palletStat) > 0 && $palletStat != 'Completed') {
+                    $warnMsg[] = "Invalid pallet status found";
+                }
+                if (Str::length($locatorNo) > 0 && Str::length($locatorNo) < 7) {
+                    $warnMsg[] = "Invalid locator number found";
+                }
+                if (Str::length($palletNo) <= 0 && Str::length($locatorNo) <= 0) {
+                    $warnMsg[] = "Pallet and locator number found";
+                }
+                if (Str::length($locatorQty) < 0 || !is_numeric($locatorQty) || $locatorQty < 0 || $locatorQty > 2) {
+                    $warnMsg[] = "Invalid locator quantity found";
+                }
+                $created = User::where('name', $createdBy)->first();
+                if (!$created) {
+                    $warnMsg[] = "Created by not found";
+                }
+                $scanned = User::where('name', $scannedBy)->first();
+                if (!$scanned) {
+                    $warnMsg[] = "Scanned by not found";
+                }
+                $updated = User::where('name', $updatedBy)->first();
+                if (!$updated) {
+                    $warnMsg[] = "Updated by not found";
+                }
+
+                $formats = ['d-m-Y H:i', 'd-m-Y H:i:s']; //'07-05-2025 08:00' or '07-05-2025 08:00:00'
+
+                foreach ($formats as $format) {
+                    try {
+                        $cDateTime = Carbon::createFromFormat($format, $createdAt);
+                        break;
+                    } catch (\Exception $e) {
+                        // Optionally collect warning messages
+                        // $warnMsg[] = "Date format mismatch with format: $format";
+                    }
+                }
+
+                if (!isset($cDateTime)) {
+                    // throw new \Exception('Invalid date time format');
+                    $warnMsg[] = "Invalid 'Created DateTime' format. Expected DD-MM-YYYY HH:MM:SS";
+                }
+
+                foreach ($formats as $format) {
+                    try {
+                        $sDateTime = Carbon::createFromFormat($format, $scannedAt);
+                        break;
+                    } catch (\Exception $e) {
+                        // Optionally collect warning messages
+                        // $warnMsg[] = "Date format mismatch with format: $format";
+                    }
+                }
+
+                if (!isset($sDateTime)) {
+                    $warnMsg[] = "Invalid 'Scanned DateTime' format. Expected DD-MM-YYYY HH:MM:SS";
+                }
+
+                foreach ($formats as $format) {
+                    try
+                    {
+                        $uDateTime = Carbon::createFromFormat($format, $updatedAt);
+                        break;
+                    } catch (\Exception $e) {
+                        // Optionally collect warning messages
+                        // $warnMsg[] = "Date format mismatch with format: $format";
+                    }
+                }
+
+                if (!isset($uDateTime)) {
+                    $warnMsg[] = "Invalid 'Updated DateTime' format. Expected DD-MM-YYYY HH:MM:SS";
+                }
+                else
+                {
+                    if (isset($cDateTime) && isset($uDateTime)) {
+                        if ($cDateTime->greaterThan($uDateTime)) {
+                            $warnMsg[] = "'Created DataTime' is greater than 'Updated DateTime'.";
+                        }
+                    }
+                }
+            }
+        }
+
+        // if (!is_numeric($locatorQuantity) || $locatorQuantity < 0 || $locatorQuantity > 2) {
+        //     $warnMsg[] = "Invalid locator quantity found";
+        // }
+
+        if (!empty($warnMsg)) {
+            throw new RowImportFailedException(implode(', ', $warnMsg));
+        }
+
+        PalletValidation::updateOrCreate(
+            [
+                'plant_id' => $plant->id,
+                'serial_number' => $serialNo
+            ],
+            [
+                'pallet_number' => $palletNo,
+                'pallet_status' => $palletStat,
+                'locator_number' => $locatorNo,
+                'locator_quantity' => $locatorQty,
+                'created_at' => $cDateTime->format('Y-m-d H:i:s'),
+                'scanned_at' => $sDateTime->format('Y-m-d H:i:s'),
+                'updated_at' => $uDateTime->format('Y-m-d H:i:s'),
+                'created_by' => $createdBy,
+                'scanned_by' => $scannedBy,
+                'updated_by' => $updatedBy
+            ]
+        );
+        return null;
+        // // return PalletValidation::firstOrNew([
+        // //     // Update existing records, matching them by `$this->data['column_name']`
+        // //     'email' => $this->data['email'],
+        // // ]);
+
+        // return new PalletValidation();
     }
 
     public static function getCompletedNotificationBody(Import $import): string