diff --git a/app/Filament/Resources/PanelBoxValidationResource.php b/app/Filament/Resources/PanelBoxValidationResource.php
index b00e054..ad3c4fa 100644
--- a/app/Filament/Resources/PanelBoxValidationResource.php
+++ b/app/Filament/Resources/PanelBoxValidationResource.php
@@ -1003,16 +1003,14 @@ class PanelBoxValidationResource extends Resource
                                 ->where('inspection_lot_number', $inspecLotNo)
                                 ->first();
 
-                            $alreadyExistsSupplier = PanelBoxValidation::where('serial_number', $serialNumber)
-                                ->where('plant_id', $plantId)
+                            $alreadyExistsSupplier = PanelBoxValidation::where('plant_id', $plantId)->where('serial_number', $serialNumber)
+                                ->where('panel_box_supplier', $supplierNo)
                                 ->first();
 
                             if ($alreadyExists) {
                                 Notification::make()
                                     ->title('Duplicate Found')
-                                    ->body(
-                                        'This document number and inspection lot number have already been used for this serial number. Please provide a new document number and inspection lot number for rework...'
-                                    )
+                                    ->body('This document number and inspection lot number have already been used for this serial number. Please provide a new document number and inspection lot number for rework...')
                                     ->danger()
                                     ->send();