From 8061953062e9ca8c97c672aecc9a4643bf04c3e8 Mon Sep 17 00:00:00 2001 From: dhanabalan Date: Thu, 27 Aug 2026 16:33:39 +0530 Subject: [PATCH 1/2] removed rework logic in panel box validation --- .../Resources/PanelBoxValidationResource.php | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/app/Filament/Resources/PanelBoxValidationResource.php b/app/Filament/Resources/PanelBoxValidationResource.php index 198ff3d..dcfec3c 100644 --- a/app/Filament/Resources/PanelBoxValidationResource.php +++ b/app/Filament/Resources/PanelBoxValidationResource.php @@ -810,21 +810,21 @@ class PanelBoxValidationResource extends Resource $serialExists = PanelBoxValidation::where('serial_number', $serialNumber)->where('plant_id', $plantId)->first(); - if ($serialExists) { - $set('serial_exists', true); - } else { - $set('serial_exists', false); - } - - // if ($serialExists && ! $get('id')) { - // $set('validationError', 'Serial number already exists in panel box validation.'); - // $set('sticker_master_id', null); - // $set('uom', null); - // $set('serial_number', null); - - // return; + // if ($serialExists) { + // $set('serial_exists', true); + // } else { + // $set('serial_exists', false); // } + if ($serialExists && ! $get('id')) { + $set('validationError', 'Serial number already exists in panel box validation.'); + $set('sticker_master_id', null); + $set('uom', null); + $set('serial_number', null); + + return; + } + $set('validationError', null); foreach ($serialFields as $column) { -- 2.49.1 From 88e6b83487bf60dde902061c69bef4f3e66affa4 Mon Sep 17 00:00:00 2001 From: dhanabalan Date: Thu, 27 Aug 2026 16:34:09 +0530 Subject: [PATCH 2/2] removed rework logic in panel check list --- app/Livewire/PanelCheckList.php | 111 ++++++++++++++++---------------- 1 file changed, 54 insertions(+), 57 deletions(-) diff --git a/app/Livewire/PanelCheckList.php b/app/Livewire/PanelCheckList.php index e4723a3..431bbaa 100644 --- a/app/Livewire/PanelCheckList.php +++ b/app/Livewire/PanelCheckList.php @@ -177,62 +177,36 @@ public $records = []; } } - $latestReworkRecord = PanelBoxValidation::where('plant_id', $this->data['plant_id'] ?? null)->where('serial_number', $this->data['serial_number'] ?? null)->latest()->first(); + // $latestReworkRecord = PanelBoxValidation::where('plant_id', $this->data['plant_id'] ?? null)->where('serial_number', $this->data['serial_number'] ?? null)->latest()->first(); - if($latestReworkRecord){ - $qualityValidation = PanelBoxValidation::create([ - 'plant_id' => $this->data['plant_id'] ?? null, - 'line_id' => $this->data['line_id'] ?? null, - 'sticker_master_id' => $this->data['sticker_master_id'] ?? null, - 'production_order' => $this->data['production_order'] ?? null, - 'serial_number' => $this->data['serial_number'] ?? null, - 'serial_number_panel' => $this->data['serial_number_panel'] ?? null, - 'pack_slip_panel' => $this->data['pack_slip_panel'] ?? null, - 'name_plate_panel' => $this->data['name_plate_panel'] ?? null, - 'tube_sticker_panel' => $this->data['tube_sticker_panel'] ?? null, - 'warranty_card_panel' => $this->data['warranty_card_panel'] ?? null, - 'part_validation1' => $this->data['part_validation1'] ?? null, - 'part_validation2' => $this->data['part_validation2'] ?? null, - 'part_validation3' => $this->data['part_validation3'] ?? null, - 'part_validation4' => $this->data['part_validation4'] ?? null, - 'part_validation5' => $this->data['part_validation5'] ?? null, - 'panel_box_supplier' => $this->data['panel_box_supplier'] ?? null, - 'panel_box_serial_number' => $this->data['panel_box_serial_number'] ?? null, - 'panel_box_code' => $this->data['panel_box_code'] ?? null, - 'inspection_lot_number' => $this->data['inspection_lot_number'] ?? null, - 'rework_count' => $latestReworkRecord ? ((int) $latestReworkRecord->rework_count + 1) : 0, - 'created_by' => $this->data['created_by'] ?? null, - 'updated_by' => $this->data['updated_by'] ?? null, - ]); - } - else{ - $qualityValidation = PanelBoxValidation::create([ - 'plant_id' => $this->data['plant_id'] ?? null, - 'line_id' => $this->data['line_id'] ?? null, - 'sticker_master_id' => $this->data['sticker_master_id'] ?? null, - 'production_order' => $this->data['production_order'] ?? null, - 'serial_number' => $this->data['serial_number'] ?? null, - 'serial_number_panel' => $this->data['serial_number_panel'] ?? null, - 'pack_slip_panel' => $this->data['pack_slip_panel'] ?? null, - 'name_plate_panel' => $this->data['name_plate_panel'] ?? null, - 'tube_sticker_panel' => $this->data['tube_sticker_panel'] ?? null, - 'warranty_card_panel' => $this->data['warranty_card_panel'] ?? null, - 'part_validation1' => $this->data['part_validation1'] ?? null, - 'part_validation2' => $this->data['part_validation2'] ?? null, - 'part_validation3' => $this->data['part_validation3'] ?? null, - 'part_validation4' => $this->data['part_validation4'] ?? null, - 'part_validation5' => $this->data['part_validation5'] ?? null, - 'panel_box_supplier' => $this->data['panel_box_supplier'] ?? null, - 'panel_box_serial_number' => $this->data['panel_box_serial_number'] ?? null, - 'panel_box_code' => $this->data['panel_box_code'] ?? null, - 'inspection_lot_number' => $this->data['inspection_lot_number'] ?? null, - 'created_by' => $this->data['created_by'] ?? null, - 'updated_by' => $this->data['updated_by'] ?? null, - ]); - } - - - // $qualityValidation = PanelBoxValidation::create([ + // if($latestReworkRecord){ + // $qualityValidation = PanelBoxValidation::create([ + // 'plant_id' => $this->data['plant_id'] ?? null, + // 'line_id' => $this->data['line_id'] ?? null, + // 'sticker_master_id' => $this->data['sticker_master_id'] ?? null, + // 'production_order' => $this->data['production_order'] ?? null, + // 'serial_number' => $this->data['serial_number'] ?? null, + // 'serial_number_panel' => $this->data['serial_number_panel'] ?? null, + // 'pack_slip_panel' => $this->data['pack_slip_panel'] ?? null, + // 'name_plate_panel' => $this->data['name_plate_panel'] ?? null, + // 'tube_sticker_panel' => $this->data['tube_sticker_panel'] ?? null, + // 'warranty_card_panel' => $this->data['warranty_card_panel'] ?? null, + // 'part_validation1' => $this->data['part_validation1'] ?? null, + // 'part_validation2' => $this->data['part_validation2'] ?? null, + // 'part_validation3' => $this->data['part_validation3'] ?? null, + // 'part_validation4' => $this->data['part_validation4'] ?? null, + // 'part_validation5' => $this->data['part_validation5'] ?? null, + // 'panel_box_supplier' => $this->data['panel_box_supplier'] ?? null, + // 'panel_box_serial_number' => $this->data['panel_box_serial_number'] ?? null, + // 'panel_box_code' => $this->data['panel_box_code'] ?? null, + // 'inspection_lot_number' => $this->data['inspection_lot_number'] ?? null, + // 'rework_count' => $latestReworkRecord ? ((int) $latestReworkRecord->rework_count + 1) : 0, + // 'created_by' => $this->data['created_by'] ?? null, + // 'updated_by' => $this->data['updated_by'] ?? null, + // ]); + // } + // else{ + // $qualityValidation = PanelBoxValidation::create([ // 'plant_id' => $this->data['plant_id'] ?? null, // 'line_id' => $this->data['line_id'] ?? null, // 'sticker_master_id' => $this->data['sticker_master_id'] ?? null, @@ -254,9 +228,32 @@ public $records = []; // 'inspection_lot_number' => $this->data['inspection_lot_number'] ?? null, // 'created_by' => $this->data['created_by'] ?? null, // 'updated_by' => $this->data['updated_by'] ?? null, - // ]); - + // ]); + // } + $qualityValidation = PanelBoxValidation::create([ + 'plant_id' => $this->data['plant_id'] ?? null, + 'line_id' => $this->data['line_id'] ?? null, + 'sticker_master_id' => $this->data['sticker_master_id'] ?? null, + 'production_order' => $this->data['production_order'] ?? null, + 'serial_number' => $this->data['serial_number'] ?? null, + 'serial_number_panel' => $this->data['serial_number_panel'] ?? null, + 'pack_slip_panel' => $this->data['pack_slip_panel'] ?? null, + 'name_plate_panel' => $this->data['name_plate_panel'] ?? null, + 'tube_sticker_panel' => $this->data['tube_sticker_panel'] ?? null, + 'warranty_card_panel' => $this->data['warranty_card_panel'] ?? null, + 'part_validation1' => $this->data['part_validation1'] ?? null, + 'part_validation2' => $this->data['part_validation2'] ?? null, + 'part_validation3' => $this->data['part_validation3'] ?? null, + 'part_validation4' => $this->data['part_validation4'] ?? null, + 'part_validation5' => $this->data['part_validation5'] ?? null, + 'panel_box_supplier' => $this->data['panel_box_supplier'] ?? null, + 'panel_box_serial_number' => $this->data['panel_box_serial_number'] ?? null, + 'panel_box_code' => $this->data['panel_box_code'] ?? null, + 'inspection_lot_number' => $this->data['inspection_lot_number'] ?? null, + 'created_by' => $this->data['created_by'] ?? null, + 'updated_by' => $this->data['updated_by'] ?? null, + ]); if (! $qualityValidation || ! $qualityValidation->exists) { Notification::make() -- 2.49.1