diff --git a/app/Filament/Resources/PanelBoxValidationResource.php b/app/Filament/Resources/PanelBoxValidationResource.php
index 3f4f89fe..7bb28137 100644
--- a/app/Filament/Resources/PanelBoxValidationResource.php
+++ b/app/Filament/Resources/PanelBoxValidationResource.php
@@ -1010,11 +1010,19 @@ class PanelBoxValidationResource extends Resource
                             $inspecLotNo = $get('inspection_lot_number');
                             $supplierNo = $get('panel_box_supplier');
 
+                            // $alreadyExists = PanelBoxValidation::where('serial_number', $serialNumber)
+                            //     ->where('plant_id', $plantId)
+                            //     ->where('production_order', $pOrder)
+                            //     ->where('inspection_lot_number', $inspecLotNo)
+                            //     ->first();
+
                             $alreadyExists = PanelBoxValidation::where('serial_number', $serialNumber)
-                                ->where('plant_id', $plantId)
-                                ->where('production_order', $pOrder)
-                                ->where('inspection_lot_number', $inspecLotNo)
-                                ->first();
+                            ->where('plant_id', $plantId)
+                            ->where(function ($query) use ($pOrder, $inspecLotNo) {
+                                $query->where('production_order', $pOrder)
+                                    ->orWhere('inspection_lot_number', $inspecLotNo);
+                            })
+                            ->first();
 
                             $alreadyExistsSupplier = PanelBoxValidation::where('plant_id', $plantId)->where('serial_number', $serialNumber)
                                 ->where('panel_box_supplier', $supplierNo)