Update dependency vite to v7

app/Filament/Exports/CharacteristicValueExporter.php

@@ -13,40 +13,21 @@ class CharacteristicValueExporter extends Exporter
 
     public static function getColumns(): array
     {
-        static $rowNumber = 0;
         return [
-            ExportColumn::make('no')
-                ->label('NO')
-                ->state(function ($record) use (&$rowNumber) {
-                    // Increment and return the row number
-                    return ++$rowNumber;
-                }),
-            ExportColumn::make('plant.code')
-            ->label('PLANT CODE'),
-            ExportColumn::make('line.name')
-            ->label('LINE NAME'),
-            ExportColumn::make('item.code')
-            ->label('ITEM CODE'),
-            ExportColumn::make('machine.name')
-            ->label('WORK CENTER'),
-            ExportColumn::make('process_order')
-            ->label('PROCESS ORDER'),
-            ExportColumn::make('coil_number')
-            ->label('COIL NUMBER'),
-            ExportColumn::make('status')
-            ->label('STATUS'),
-            ExportColumn::make('created_at')
-            ->label('CREATED AT'),
-            ExportColumn::make('updated_at')
-            ->label('UPDATED AT'),
-            ExportColumn::make('created_by')
-            ->label('CREATED BY'),
-            ExportColumn::make('updated_by')
-            ->label('UPDATED BY'),
-            ExportColumn::make('deleted_at')
-            ->enabledByDefault(false)
-            ->label('DELETED AT'),
-
+            ExportColumn::make('id')
+                ->label('ID'),
+            ExportColumn::make('plant.name'),
+            ExportColumn::make('line.name'),
+            ExportColumn::make('item.id'),
+            ExportColumn::make('machine.name'),
+            ExportColumn::make('process_order'),
+            ExportColumn::make('coil_number'),
+            ExportColumn::make('status'),
+            ExportColumn::make('created_at'),
+            ExportColumn::make('updated_at'),
+            ExportColumn::make('created_by'),
+            ExportColumn::make('updated_by'),
+            ExportColumn::make('deleted_at'),
         ];
     }
 

app/Filament/Exports/InvoiceValidationExporter.php

@@ -24,16 +24,14 @@ class InvoiceValidationExporter extends Exporter
                     // Increment and return the row number
                     return ++$rowNumber;
                 }),
-            ExportColumn::make('plant.code')
-                ->label('PLANT CODE'),
+            ExportColumn::make('plant.name')
+                ->label('PLANT'),
             ExportColumn::make('invoice_number')
                 ->label('INVOICE NUMBER'),
             ExportColumn::make('serial_number')
                 ->label('SERIAL NUMBER'),
             ExportColumn::make('stickerMaster.item.code')
                 ->label('ITEM CODE'),
-            ExportColumn::make('stickerMaster.item.description')
-                ->label('ITEM DESCRIPTION'),
             ExportColumn::make('motor_scanned_status')
                 ->label('MOTOR SCANNED STATUS'),
             ExportColumn::make('pump_scanned_status')

app/Filament/Imports/CharacteristicValueImporter.php

@@ -3,16 +3,9 @@
 namespace App\Filament\Imports;
 
 use App\Models\CharacteristicValue;
-use App\Models\Item;
-use App\Models\Line;
-use App\Models\Machine;
-use App\Models\Plant;
-use App\Models\ProcessOrder;
-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 CharacteristicValueImporter extends Importer
 {
@@ -23,52 +16,25 @@ class CharacteristicValueImporter extends Importer
         return [
             ImportColumn::make('plant')
                 ->requiredMapping()
-                ->exampleHeader('Plant Code')
-                ->example('1000')
-                ->label('Plant Code')
-                ->relationship(resolveUsing: 'code')
+                ->relationship()
                 ->rules(['required']),
             ImportColumn::make('line')
                 ->requiredMapping()
-                ->exampleHeader('Line Name')
-                ->example('4 inch pump line')
-                ->label('Line Name')
-                ->relationship(resolveUsing: 'name')
+                ->relationship()
                 ->rules(['required']),
             ImportColumn::make('item')
                 ->requiredMapping()
-                ->exampleHeader('Item Code')
-                ->example('123456')
-                ->label('Item Code')
-                ->relationship(resolveUsing: 'code')
+                ->relationship()
                 ->rules(['required']),
             ImportColumn::make('machine')
                 ->requiredMapping()
-                ->exampleHeader('Work Center')
-                ->example('RMGS09745')
-                ->label('Work Center')
-                ->relationship(resolveUsing: 'work_center')
+                ->relationship()
                 ->rules(['required']),
-            ImportColumn::make('process_order')
-                ->requiredMapping()
-                ->exampleHeader('Process Order')
-                ->example('23455256352')
-                ->label('Process Order'),
-            ImportColumn::make('coil_number')
-                ->requiredMapping()
-                ->exampleHeader('Coil Number')
-                ->example('0')
-                ->label('Coil Number'),
-            ImportColumn::make('status')
-                ->requiredMapping()
-                ->exampleHeader('Status')
-                ->example('Ok')
-                ->label('Status'),
-            ImportColumn::make('created_by')
-                ->requiredMapping()
-                ->exampleHeader('Created By')
-                ->example('RAW01234')
-                ->label('Created By'),
+            ImportColumn::make('process_order'),
+            ImportColumn::make('coil_number'),
+            ImportColumn::make('status'),
+            ImportColumn::make('created_by'),
+            ImportColumn::make('updated_by'),
         ];
     }
 
@@ -79,172 +45,7 @@ class CharacteristicValueImporter extends Importer
         //     'email' => $this->data['email'],
         // ]);
 
-        $warnMsg = [];
-        $plantId = null;
-        $itemId = null;
-        $LineId = null;
-        $machineId = null;
-        $itemAgainstPlant = null;
-
-        $plantCode = $this->data['plant'];
-        $processOrder = trim($this->data['process_order'] ?? '');
-        $iCode = trim($this->data['item']);
-        $workCenter = trim($this->data['machine']);
-        $lineName = trim($this->data['line']);
-        $status = trim($this->data['status']);
-        $createdBy = trim($this->data['created_by']);
-        $coilNo = trim($this->data['coil_number']);
-
-        if ($plantCode == null || $plantCode == '') {
-            $warnMsg[] = 'Plant code cannot be empty';
-        } elseif ($iCode == null || $iCode == '') {
-            $warnMsg[] = 'Process Order cannot be empty';
-        } elseif ($workCenter == null || $workCenter == '') {
-            $warnMsg[] = 'Work center cannot be empty';
-        } elseif ($lineName == null || $lineName == '') {
-            $warnMsg[] = 'Line cannot be empty';
-        }
-
-        if (Str::length($plantCode) < 4 || ! is_numeric($plantCode) || ! preg_match('/^[1-9]\d{3,}$/', $plantCode)) {
-            $warnMsg[] = 'Invalid plant code found';
-        } else {
-            $plant = Plant::where('code', $plantCode)->first();
-            if (! $plant) {
-                $warnMsg[] = 'Plant not found';
-            } else {
-                $plantId = $plant->id;
-            }
-        }
-
-        if (Str::length($iCode) < 6 || ! ctype_alnum($iCode)) {
-            $warnMsg[] = 'Invalid item code found';
-        } else {
-            $itemCode = Item::where('code', $iCode)->first();
-            if (! $itemCode) {
-                $warnMsg[] = 'Item code not found';
-            } else {
-                if ($plantId) {
-                    $itemAgainstPlant = Item::where('code', $iCode)->where('plant_id', $plantId)->first();
-                    if (! $itemAgainstPlant) {
-                        $warnMsg[] = 'Item code not found for the given plant';
-                    } else {
-                        $itemId = $itemAgainstPlant->id;
-                    }
-                }
-            }
-        }
-
-        $lineExists = Line::where('name', $lineName)->first();
-        if (! $lineExists) {
-            $warnMsg[] = 'Line name not found';
-        } else {
-            if ($plantId) {
-                $lineAgainstPlant = Line::where('name', $lineName)->where('plant_id', $plantId)->first();
-                if (! $lineAgainstPlant) {
-                    $warnMsg[] = 'Line name not found for the given plant';
-                } else {
-                    $LineId = $lineAgainstPlant->id;
-                }
-            }
-        }
-
-        $workCenterExist = Machine::where('work_center', $workCenter)->first();
-        if (! $workCenterExist) {
-            $warnMsg[] = 'Work Center not found';
-        }
-
-        // $workCenterAgainstPlant = Machine::where('work_center', $workCenter)
-        //     ->where('plant_id', $plantId)
-        //     ->first();
-
-        // if (!$workCenterAgainstPlant) {
-        //     $warnMsg[] = 'Work center not found for the given plant';
-        // } else {
-        //     $MachineId = $workCenterAgainstPlant->id;
-        // }
-
-        if ($plantId != null && $LineId != null) {
-            $machineAgaPlantLine = Machine::where('plant_id', $plantId)
-                ->where('line_id', $LineId)
-                ->where('work_center', $workCenter)
-                ->first();
-
-            if (! $machineAgaPlantLine) {
-                $warnMsg[] = 'Work center not found for the given plant and line';
-            } else {
-                $machineId = $machineAgaPlantLine->id;
-            }
-        }
-
-        if ($processOrder == null || $processOrder == '') {
-            $warnMsg[] = 'Process Order cannot be empty';
-        }
-
-        if ($coilNo == null || $coilNo == '') {
-            $warnMsg[] = 'Coil No cannot be empty';
-        } elseif (! is_numeric($coilNo)) {
-            $warnMsg[] = 'Coil number should contain only numeric values!';
-        }
-
-        if ($status == null || $status == '' || ! $status) {
-            $warnMsg[] = 'Status cannot be empty';
-        } elseif (! in_array($status, ['Ok', 'NotOk'], true)) {
-            $warnMsg[] = "Status must be either 'Ok' or 'NotOk'!";
-        }
-
-        if ($createdBy == null || $createdBy == '' || ! $createdBy) {
-            $warnMsg[] = 'Created By cannot be empty';
-        }
-
-        // $existing = CharacteristicValue::where('plant_id', $plantId)
-        //     ->where('process_order', $processOrder)
-        //     ->where('coil_number', $coilNo)
-        //     ->first();
-
-        // if ($existing) {
-        //     $warnMsg[] = "Process order '{$processOrder}' with coil number '{$coilNo}' already exist for the plant code '{$plantCode}'!";
-        // }
-
-        if ($plantId && $processOrder) {
-            $existing = CharacteristicValue::where('plant_id', $plantId)
-                ->where('process_order', $processOrder)
-                ->where('coil_number', $coilNo)
-                ->first();
-
-            if ($existing) {
-                $warnMsg[] = "Coil number '{$coilNo}' already exists for Plant '{$plantCode}' and Process Order '{$processOrder}'.";
-            }
-        }
-
-        if ($plant && $itemCode && $processOrder != '') {
-
-            $existingOrder = ProcessOrder::where('plant_id', $plant->id)
-                ->where('process_order', $processOrder)
-                ->first();
-
-            if ($existingOrder && $existingOrder->item_id !== ($itemCode->id ?? null)) {
-                $warnMsg[] = 'Same Process Order already exists for this Plant with a different Item Code';
-            }
-        }
-
-        if (! empty($warnMsg)) {
-            throw new RowImportFailedException(implode(', ', $warnMsg));
-        }
-
-        return CharacteristicValue::create([
-            'plant_id' => $plantId,
-            'item_id' => $itemId,
-            'line_id' => $LineId,
-            'machine_id' => $machineId,
-            'process_order' => trim($this->data['process_order']),
-            'coil_number' => trim($this->data['coil_number']),
-            'status' => trim($this->data['status']),
-            'created_by' => trim($this->data['created_by']),
-        ]);
-
-        // return null;
-
-        // return new CharacteristicValue;
+        return new CharacteristicValue();
     }
 
     public static function getCompletedNotificationBody(Import $import): string

app/Filament/Pages/StickerReprint.php

@@ -641,322 +641,322 @@ class StickerReprint extends Page implements HasForms
 
             // ********************************
 
-            // $exists = \App\Models\ProductionPlan::where('plant_id', $this->pId)
-            //     ->where('shift_id', $this->sId)
-            //     ->where('line_id', $this->lId)
-            //     ->whereDate('created_at', today())
-            //     ->latest()
-            //     ->exists();
+            $exists = \App\Models\ProductionPlan::where('plant_id', $this->pId)
+                ->where('shift_id', $this->sId)
+                ->where('line_id', $this->lId)
+                ->whereDate('created_at', today())
+                ->latest()
+                ->exists();
 
-            // if ($exists)
-            // {
+            if ($exists)
+            {
+                $currentDate = date('Y-m-d');
+
+                $shiftId = Shift::where('id', $this->sId)
+                ->first();
+
+                [$hRs, $miNs] = explode('.', $shiftId->duration) + [0, 0];
+                $hRs = (int) $hRs;
+                //$miNs = (int) $miNs;-*/
+
+                $totalMinutes = $hRs * 60 + $miNs;
+
+                $from_dt = $currentDate . ' ' . $shiftId->start_time;
+
+                $to_dt = date('Y-m-d H:i:s', strtotime($from_dt . " + $totalMinutes minutes"));
+
+                $currentDateTime = date('Y-m-d H:i:s');
+
+                // Check if current date time is within the range
+                if (!($currentDateTime >= $from_dt && $currentDateTime < $to_dt)) {
+                    //echo "Choosed a valid shift...";
+                    // $set('ppLineError', 'Valid (From: '.$from_dt.', To: '.$to_dt.')');
+
+                    $this->form->fill([
+                        'plant_id'=> $this->pId,
+                        'block_name'=> $this->bId,
+                        'shift_id'=> $this->sId,
+                        'line_id'=> $this->lId,
+                        'item_id'=> null,
+                        'serial_number'=> null,
+                        'success_msg'=> null,
+                        'production_order'=> $this->prodOrder,
+                        'sap_msg_status' => null,
+                        'sap_msg_description' => null,
+                        'operator_id'=> $operatorName,
+                        'recent_qr' => $this->recQr,
+                    ]);
+                    Notification::make()
+                        ->title('Invalid Shift')
+                        ->body("Please select a valid shift.")
+                        ->danger()
+                        ->send();
+                    //$set('validationError', 'Curr.'.$currentDateTime.' (From: '.$from_dt.', To: '.$to_dt.')');
+                    return;
+                }
+                else
+                {
+                    $this->form->fill([
+                        'plant_id'=> $this->pId,
+                        'block_name'=> $this->bId,
+                        'shift_id'=> $this->sId,
+                        'line_id'=> $this->lId,
+                        'item_id'=> null,
+                        'serial_number'=> null,
+                        'success_msg'=> null,
+                        'production_order'=> $this->prodOrder,
+                        'sap_msg_status' => null,
+                        'sap_msg_description' => null,
+                        'operator_id'=> $operatorName,
+                        'recent_qr' => $this->recQr,
+                    ]);
+                }
+            }
+            else
+            {
+                $existShifts = \App\Models\ProductionPlan::where('plant_id', $this->pId)
+                ->where('shift_id', $this->sId)
+                ->where('line_id', $this->lId)
+                ->whereDate('created_at', Carbon::yesterday())
+                ->latest()
+                ->exists();
+
+                if ($existShifts) //if ($existShifts->count() > 0)
+                { // record exist on yesterday
                     //$currentDate = date('Y-m-d');
+                    $yesterday = date('Y-m-d', strtotime('-1 days'));
 
-            //     $shiftId = Shift::where('id', $this->sId)
-            //     ->first();
+                    $shiftId = Shift::where('id', $this->sId)
+                    ->first();
 
-            //     [$hRs, $miNs] = explode('.', $shiftId->duration) + [0, 0];
-            //     $hRs = (int) $hRs;
-            //     //$miNs = (int) $miNs;-*/
+                    [$hRs, $miNs] = explode('.', $shiftId->duration) + [0, 0];
+                    $hRs = (int) $hRs;
+                    //   $miNs = (int) $miNs;-*/
 
-            //     $totalMinutes = $hRs * 60 + $miNs;
+                    $totalMinutes = $hRs * 60 + $miNs;
 
-            //     $from_dt = $currentDate . ' ' . $shiftId->start_time;
+                    $from_dt = $yesterday . ' ' . $shiftId->start_time;
 
-            //     $to_dt = date('Y-m-d H:i:s', strtotime($from_dt . " + $totalMinutes minutes"));
+                    $to_dt = date('Y-m-d H:i:s', strtotime($from_dt . " + $totalMinutes minutes"));
 
-            //     $currentDateTime = date('Y-m-d H:i:s');
+                    $currentDateTime = date('Y-m-d H:i:s');
 
-            //     // Check if current date time is within the range
-            //     if (!($currentDateTime >= $from_dt && $currentDateTime < $to_dt)) {
-            //         //echo "Choosed a valid shift...";
-            //         // $set('ppLineError', 'Valid (From: '.$from_dt.', To: '.$to_dt.')');
+                    // Check if current date time is within the range
+                    if ($currentDateTime >= $from_dt && $currentDateTime < $to_dt) {
+                        $this->form->fill([
+                            'plant_id'=> $this->pId,
+                            'block_name'=> $this->bId,
+                            'shift_id'=> $this->sId,
+                            'line_id'=> $this->lId,
+                            'item_id'=> null,
+                            'serial_number'=> null,
+                            'success_msg'=> null,
+                            'production_order'=> $this->prodOrder,
+                            'sap_msg_status' => null,
+                            'sap_msg_description' => null,
+                            'operator_id'=> $operatorName,
+                            'recent_qr' => $this->recQr,
+                        ]);
+                    }
+                    else
+                    {
+                        $currentDate = date('Y-m-d');
 
-            //         $this->form->fill([
-            //             'plant_id'=> $this->pId,
-            //             'block_name'=> $this->bId,
-            //             'shift_id'=> $this->sId,
-            //             'line_id'=> $this->lId,
-            //             'item_id'=> null,
-            //             'serial_number'=> null,
-            //             'success_msg'=> null,
-            //             'production_order'=> $this->prodOrder,
-            //             'sap_msg_status' => null,
-            //             'sap_msg_description' => null,
-            //             'operator_id'=> $operatorName,
-            //             'recent_qr' => $this->recQr,
-            //         ]);
-            //         Notification::make()
-            //             ->title('Invalid Shift')
-            //             ->body("Please select a valid shift.")
-            //             ->danger()
-            //             ->send();
-            //         //$set('validationError', 'Curr.'.$currentDateTime.' (From: '.$from_dt.', To: '.$to_dt.')');
-            //         return;
-            //     }
-            //     else
-            //     {
-            //         $this->form->fill([
-            //             'plant_id'=> $this->pId,
-            //             'block_name'=> $this->bId,
-            //             'shift_id'=> $this->sId,
-            //             'line_id'=> $this->lId,
-            //             'item_id'=> null,
-            //             'serial_number'=> null,
-            //             'success_msg'=> null,
-            //             'production_order'=> $this->prodOrder,
-            //             'sap_msg_status' => null,
-            //             'sap_msg_description' => null,
-            //             'operator_id'=> $operatorName,
-            //             'recent_qr' => $this->recQr,
-            //         ]);
-            //     }
-            // }
-            // else
-            // {
-            //     $existShifts = \App\Models\ProductionPlan::where('plant_id', $this->pId)
-            //     ->where('shift_id', $this->sId)
-            //     ->where('line_id', $this->lId)
-            //     ->whereDate('created_at', Carbon::yesterday())
-            //     ->latest()
-            //     ->exists();
+                        $shiftId = Shift::where('id', $this->sId)
+                        ->first();
 
-            //     if ($existShifts) //if ($existShifts->count() > 0)
-            //     { // record exist on yesterday
-            //         //$currentDate = date('Y-m-d');
-            //         $yesterday = date('Y-m-d', strtotime('-1 days'));
+                        [$hRs, $miNs] = explode('.', $shiftId->duration) + [0, 0];
+                        $hRs = (int) $hRs;
+                        //   $miNs = (int) $miNs;-*/
 
-            //         $shiftId = Shift::where('id', $this->sId)
-            //         ->first();
+                        $totalMinutes = $hRs * 60 + $miNs;
 
-            //         [$hRs, $miNs] = explode('.', $shiftId->duration) + [0, 0];
-            //         $hRs = (int) $hRs;
-            //         //   $miNs = (int) $miNs;-*/
+                        $from_dt = $currentDate . ' ' . $shiftId->start_time;
 
-            //         $totalMinutes = $hRs * 60 + $miNs;
+                        $to_dt = date('Y-m-d H:i:s', strtotime($from_dt . " + $totalMinutes minutes"));
 
-            //         $from_dt = $yesterday . ' ' . $shiftId->start_time;
+                        $currentDateTime = date('Y-m-d H:i:s');
 
-            //         $to_dt = date('Y-m-d H:i:s', strtotime($from_dt . " + $totalMinutes minutes"));
+                        // Check if current date time is within the range
+                        if ($currentDateTime >= $from_dt && $currentDateTime < $to_dt) {
+                            //echo "Choosed a valid shift...";
+                            // $set('ppLineError', 'Valid (From: '.$from_dt.', To: '.$to_dt.')');
 
-            //         $currentDateTime = date('Y-m-d H:i:s');
+                            $this->form->fill([
+                                'plant_id'=> $this->pId,
+                                'block_name'=> $this->bId,
+                                'shift_id'=> $this->sId,
+                                'line_id'=> $this->lId,
+                                'item_id'=> null,
+                                'serial_number'=> null,
+                                'success_msg'=> null,
+                                'production_order'=> $this->prodOrder,
+                                'sap_msg_status' => null,
+                                'sap_msg_description' => null,
+                                'operator_id'=> $operatorName,
+                                'recent_qr' => $this->recQr,
+                            ]);
+                            Notification::make()
+                                ->title('Plan Not Found')
+                                ->body("Please set production plan first.")
+                                ->danger()
+                                ->send();
+                            //$set('validationError', 'Curr.'.$currentDateTime.' (From: '.$from_dt.', To: '.$to_dt.')');
+                            return;
+                        }
+                        else
+                        {
+                            //echo "Choosed a valid shift...";
+                            // $set('ppLineError', 'Valid (From: '.$from_dt.', To: '.$to_dt.')');
+
+                            $this->form->fill([
+                                'plant_id'=> $this->pId,
+                                'block_name'=> $this->bId,
+                                'shift_id'=> $this->sId,
+                                'line_id'=> $this->lId,
+                                'item_id'=> null,
+                                'serial_number'=> null,
+                                'success_msg'=> null,
+                                'production_order'=> $this->prodOrder,
+                                'sap_msg_status' => null,
+                                'sap_msg_description' => null,
+                                'operator_id'=> $operatorName,
+                                'recent_qr' => $this->recQr,
+                            ]);
+                            Notification::make()
+                                ->title('Invalid Shift')
+                                ->body("Please select a valid shift.")
+                                ->danger()
+                                ->send();
+                            //$set('validationError', 'Curr.'.$currentDateTime.' (From: '.$from_dt.', To: '.$to_dt.')');
+                            return;
+                        }
+                    }
+                }
+                else
+                { // record not exist on yesterday
 
-            //         // Check if current date time is within the range
-            //         if ($currentDateTime >= $from_dt && $currentDateTime < $to_dt) {
-            //             $this->form->fill([
-            //                 'plant_id'=> $this->pId,
-            //                 'block_name'=> $this->bId,
-            //                 'shift_id'=> $this->sId,
-            //                 'line_id'=> $this->lId,
-            //                 'item_id'=> null,
-            //                 'serial_number'=> null,
-            //                 'success_msg'=> null,
-            //                 'production_order'=> $this->prodOrder,
-            //                 'sap_msg_status' => null,
-            //                 'sap_msg_description' => null,
-            //                 'operator_id'=> $operatorName,
-            //                 'recent_qr' => $this->recQr,
-            //             ]);
-            //         }
-            //         else
-            //         {
                     //$currentDate = date('Y-m-d');
+                    $yesterday = date('Y-m-d', strtotime('-1 days'));
 
-            //             $shiftId = Shift::where('id', $this->sId)
-            //             ->first();
+                    $shiftId = Shift::where('id', $this->sId)
+                    ->first();
 
-            //             [$hRs, $miNs] = explode('.', $shiftId->duration) + [0, 0];
-            //             $hRs = (int) $hRs;
-            //             //   $miNs = (int) $miNs;-*/
+                    [$hRs, $miNs] = explode('.', $shiftId->duration) + [0, 0];
+                    $hRs = (int) $hRs;
+                    //   $miNs = (int) $miNs;-*/
 
-            //             $totalMinutes = $hRs * 60 + $miNs;
+                    $totalMinutes = $hRs * 60 + $miNs;
 
-            //             $from_dt = $currentDate . ' ' . $shiftId->start_time;
+                    $from_dt = $yesterday . ' ' . $shiftId->start_time;
 
-            //             $to_dt = date('Y-m-d H:i:s', strtotime($from_dt . " + $totalMinutes minutes"));
+                    $to_dt = date('Y-m-d H:i:s', strtotime($from_dt . " + $totalMinutes minutes"));
 
-            //             $currentDateTime = date('Y-m-d H:i:s');
+                    $currentDateTime = date('Y-m-d H:i:s');
 
-            //             // Check if current date time is within the range
-            //             if ($currentDateTime >= $from_dt && $currentDateTime < $to_dt) {
-            //                 //echo "Choosed a valid shift...";
-            //                 // $set('ppLineError', 'Valid (From: '.$from_dt.', To: '.$to_dt.')');
+                    // Check if current date time is within the range
+                    if ($currentDateTime >= $from_dt && $currentDateTime < $to_dt) {
+                        //echo "Choosed a valid shift...";
+                        // $set('ppLineError', 'Valid (From: '.$from_dt.', To: '.$to_dt.')');
 
-            //                 $this->form->fill([
-            //                     'plant_id'=> $this->pId,
-            //                     'block_name'=> $this->bId,
-            //                     'shift_id'=> $this->sId,
-            //                     'line_id'=> $this->lId,
-            //                     'item_id'=> null,
-            //                     'serial_number'=> null,
-            //                     'success_msg'=> null,
-            //                     'production_order'=> $this->prodOrder,
-            //                     'sap_msg_status' => null,
-            //                     'sap_msg_description' => null,
-            //                     'operator_id'=> $operatorName,
-            //                     'recent_qr' => $this->recQr,
-            //                 ]);
-            //                 Notification::make()
-            //                     ->title('Plan Not Found')
-            //                     ->body("Please set production plan first.")
-            //                     ->danger()
-            //                     ->send();
-            //                 //$set('validationError', 'Curr.'.$currentDateTime.' (From: '.$from_dt.', To: '.$to_dt.')');
-            //                 return;
-            //             }
-            //             else
-            //             {
-            //                 //echo "Choosed a valid shift...";
-            //                 // $set('ppLineError', 'Valid (From: '.$from_dt.', To: '.$to_dt.')');
+                        $this->form->fill([
+                            'plant_id'=> $this->pId,
+                            'block_name'=> $this->bId,
+                            'shift_id'=> $this->sId,
+                            'line_id'=> $this->lId,
+                            'item_id'=> null,
+                            'serial_number'=> null,
+                            'success_msg'=> null,
+                            'production_order'=> $this->prodOrder,
+                            'sap_msg_status' => null,
+                            'sap_msg_description' => null,
+                            'operator_id'=> $operatorName,
+                            'recent_qr' => $this->recQr,
+                        ]);
+                        Notification::make()
+                            ->title('Plan Not Found')
+                            ->body("Please set production plan first.")
+                            ->danger()
+                            ->send();
+                        //$set('validationError', 'Curr.'.$currentDateTime.' (From: '.$from_dt.', To: '.$to_dt.')');
+                        return;
+                    }
+                    else
+                    {
+                        $currentDate = date('Y-m-d');
 
-            //                 $this->form->fill([
-            //                     'plant_id'=> $this->pId,
-            //                     'block_name'=> $this->bId,
-            //                     'shift_id'=> $this->sId,
-            //                     'line_id'=> $this->lId,
-            //                     'item_id'=> null,
-            //                     'serial_number'=> null,
-            //                     'success_msg'=> null,
-            //                     'production_order'=> $this->prodOrder,
-            //                     'sap_msg_status' => null,
-            //                     'sap_msg_description' => null,
-            //                     'operator_id'=> $operatorName,
-            //                     'recent_qr' => $this->recQr,
-            //                 ]);
-            //                 Notification::make()
-            //                     ->title('Invalid Shift')
-            //                     ->body("Please select a valid shift.")
-            //                     ->danger()
-            //                     ->send();
-            //                 //$set('validationError', 'Curr.'.$currentDateTime.' (From: '.$from_dt.', To: '.$to_dt.')');
-            //                 return;
-            //             }
-            //         }
-            //     }
-            //     else
-            //     { // record not exist on yesterday
+                        $shiftId = Shift::where('id', $this->sId)
+                        ->first();
 
-            //         //$currentDate = date('Y-m-d');
-            //         $yesterday = date('Y-m-d', strtotime('-1 days'));
+                        [$hRs, $miNs] = explode('.', $shiftId->duration) + [0, 0];
+                        $hRs = (int) $hRs;
+                        //   $miNs = (int) $miNs;-*/
 
-            //         $shiftId = Shift::where('id', $this->sId)
-            //         ->first();
+                        $totalMinutes = $hRs * 60 + $miNs;
 
-            //         [$hRs, $miNs] = explode('.', $shiftId->duration) + [0, 0];
-            //         $hRs = (int) $hRs;
-            //         //   $miNs = (int) $miNs;-*/
+                        $from_dt = $currentDate . ' ' . $shiftId->start_time;
 
-            //         $totalMinutes = $hRs * 60 + $miNs;
+                        $to_dt = date('Y-m-d H:i:s', strtotime($from_dt . " + $totalMinutes minutes"));
 
-            //         $from_dt = $yesterday . ' ' . $shiftId->start_time;
+                        $currentDateTime = date('Y-m-d H:i:s');
 
-            //         $to_dt = date('Y-m-d H:i:s', strtotime($from_dt . " + $totalMinutes minutes"));
+                        // Check if current date time is within the range
+                        if ($currentDateTime >= $from_dt && $currentDateTime < $to_dt) {
+                            //echo "Choosed a valid shift...";
+                            // $set('ppLineError', 'Valid (From: '.$from_dt.', To: '.$to_dt.')');
 
-            //         $currentDateTime = date('Y-m-d H:i:s');
+                            $this->form->fill([
+                                'plant_id'=> $this->pId,
+                                'block_name'=> $this->bId,
+                                'shift_id'=> $this->sId,
+                                'line_id'=> $this->lId,
+                                'item_id'=> null,
+                                'serial_number'=> null,
+                                'success_msg'=> null,
+                                'production_order'=> $this->prodOrder,
+                                'sap_msg_status' => null,
+                                'sap_msg_description' => null,
+                                'operator_id'=> $operatorName,
+                                'recent_qr' => $this->recQr,
+                            ]);
+                            Notification::make()
+                                ->title('Plan Not Found')
+                                ->body("Please set production plan first.")
+                                ->danger()
+                                ->send();
+                            //$set('validationError', 'Curr.'.$currentDateTime.' (From: '.$from_dt.', To: '.$to_dt.')');
+                            return;
+                        }
+                        else
+                        {
+                            //echo "Choosed a valid shift...";
+                            // $set('ppLineError', 'Valid (From: '.$from_dt.', To: '.$to_dt.')');
 
-            //         // Check if current date time is within the range
-            //         if ($currentDateTime >= $from_dt && $currentDateTime < $to_dt) {
-            //             //echo "Choosed a valid shift...";
-            //             // $set('ppLineError', 'Valid (From: '.$from_dt.', To: '.$to_dt.')');
-
-            //             $this->form->fill([
-            //                 'plant_id'=> $this->pId,
-            //                 'block_name'=> $this->bId,
-            //                 'shift_id'=> $this->sId,
-            //                 'line_id'=> $this->lId,
-            //                 'item_id'=> null,
-            //                 'serial_number'=> null,
-            //                 'success_msg'=> null,
-            //                 'production_order'=> $this->prodOrder,
-            //                 'sap_msg_status' => null,
-            //                 'sap_msg_description' => null,
-            //                 'operator_id'=> $operatorName,
-            //                 'recent_qr' => $this->recQr,
-            //             ]);
-            //             Notification::make()
-            //                 ->title('Plan Not Found')
-            //                 ->body("Please set production plan first.")
-            //                 ->danger()
-            //                 ->send();
-            //             //$set('validationError', 'Curr.'.$currentDateTime.' (From: '.$from_dt.', To: '.$to_dt.')');
-            //             return;
-            //         }
-            //         else
-            //         {
-            //             $currentDate = date('Y-m-d');
-
-            //             $shiftId = Shift::where('id', $this->sId)
-            //             ->first();
-
-            //             [$hRs, $miNs] = explode('.', $shiftId->duration) + [0, 0];
-            //             $hRs = (int) $hRs;
-            //             //   $miNs = (int) $miNs;-*/
-
-            //             $totalMinutes = $hRs * 60 + $miNs;
-
-            //             $from_dt = $currentDate . ' ' . $shiftId->start_time;
-
-            //             $to_dt = date('Y-m-d H:i:s', strtotime($from_dt . " + $totalMinutes minutes"));
-
-            //             $currentDateTime = date('Y-m-d H:i:s');
-
-            //             // Check if current date time is within the range
-            //             if ($currentDateTime >= $from_dt && $currentDateTime < $to_dt) {
-            //                 //echo "Choosed a valid shift...";
-            //                 // $set('ppLineError', 'Valid (From: '.$from_dt.', To: '.$to_dt.')');
-
-            //                 $this->form->fill([
-            //                     'plant_id'=> $this->pId,
-            //                     'block_name'=> $this->bId,
-            //                     'shift_id'=> $this->sId,
-            //                     'line_id'=> $this->lId,
-            //                     'item_id'=> null,
-            //                     'serial_number'=> null,
-            //                     'success_msg'=> null,
-            //                     'production_order'=> $this->prodOrder,
-            //                     'sap_msg_status' => null,
-            //                     'sap_msg_description' => null,
-            //                     'operator_id'=> $operatorName,
-            //                     'recent_qr' => $this->recQr,
-            //                 ]);
-            //                 Notification::make()
-            //                     ->title('Plan Not Found')
-            //                     ->body("Please set production plan first.")
-            //                     ->danger()
-            //                     ->send();
-            //                 //$set('validationError', 'Curr.'.$currentDateTime.' (From: '.$from_dt.', To: '.$to_dt.')');
-            //                 return;
-            //             }
-            //             else
-            //             {
-            //                 //echo "Choosed a valid shift...";
-            //                 // $set('ppLineError', 'Valid (From: '.$from_dt.', To: '.$to_dt.')');
-
-            //                 $this->form->fill([
-            //                     'plant_id'=> $this->pId,
-            //                     'block_name'=> $this->bId,
-            //                     'shift_id'=> $this->sId,
-            //                     'line_id'=> $this->lId,
-            //                     'item_id'=> null,
-            //                     'serial_number'=> null,
-            //                     'success_msg'=> null,
-            //                     'production_order'=> $this->prodOrder,
-            //                     'sap_msg_status' => null,
-            //                     'sap_msg_description' => null,
-            //                     'operator_id'=> $operatorName,
-            //                     'recent_qr' => $this->recQr,
-            //                 ]);
-            //                 Notification::make()
-            //                     ->title('Invalid Shift')
-            //                     ->body("Please select a valid shift.")
-            //                     ->danger()
-            //                     ->send();
-            //                 //$set('validationError', 'Curr.'.$currentDateTime.' (From: '.$from_dt.', To: '.$to_dt.')');
-            //                 return;
-            //             }
-            //         }
-            //     }
-            // }
+                            $this->form->fill([
+                                'plant_id'=> $this->pId,
+                                'block_name'=> $this->bId,
+                                'shift_id'=> $this->sId,
+                                'line_id'=> $this->lId,
+                                'item_id'=> null,
+                                'serial_number'=> null,
+                                'success_msg'=> null,
+                                'production_order'=> $this->prodOrder,
+                                'sap_msg_status' => null,
+                                'sap_msg_description' => null,
+                                'operator_id'=> $operatorName,
+                                'recent_qr' => $this->recQr,
+                            ]);
+                            Notification::make()
+                                ->title('Invalid Shift')
+                                ->body("Please select a valid shift.")
+                                ->danger()
+                                ->send();
+                            //$set('validationError', 'Curr.'.$currentDateTime.' (From: '.$from_dt.', To: '.$to_dt.')');
+                            return;
+                        }
+                    }
+                }
+            }
 
             // ********************************
 
@@ -1155,27 +1155,12 @@ class StickerReprint extends Page implements HasForms
         // Only search when all parent IDs are selected
         $parts = explode('|', $formQRData);
         $itemCode = trim($parts[0]);
-
-
         $serialNumberRaw = isset($parts[1]) ? trim($parts[1]) : null;
 
-        // // Remove slash and everything after it
-        // if ($serialNumberRaw != null) {
-        //     $serialNumber = preg_replace('/\/.*/', '', $serialNumberRaw);
-        //     $serialNumber = trim($serialNumber);
-        // } else {
-        //     $serialNumber = null;
-        // }
+        // Remove slash and everything after it
         if ($serialNumberRaw != null) {
-            if (strpos($serialNumberRaw, '/') !== false) {
-                $serialNumber = strstr($serialNumberRaw, '/', true); // gets text before slash
-            } else {
-                $serialNumber = $serialNumberRaw; // keep original
-
-            }
-
+            $serialNumber = preg_replace('/\/.*/', '', $serialNumberRaw);
             $serialNumber = trim($serialNumber);
-
         } else {
             $serialNumber = null;
         }
@@ -1284,86 +1269,86 @@ class StickerReprint extends Page implements HasForms
             return;
         }
 
-        //$line = Line::find($this->lId);
-        //$lineName = $line ? $line->name : null;
+        $line = Line::find($this->lId);
+        $lineName = $line ? $line->name : null;
 
-        // $categoryName = (Str::length($item->category) > 0) ? $item->category : "";
+        $categoryName = (Str::length($item->category) > 0) ? $item->category : "";
 
-        // if ($categoryName == 'Submersible Motor')
-        // {
-        //     if ($lineName != '6 inch motor line')
-        //     {
-        //          $this->form->fill([
-        //         'plant_id'=> $this->pId,
-        //         'block_name'=> $this->bId,
-        //         'shift_id'=> $this->sId,
-        //         'line_id'=> $this->lId,
-        //         'item_id'=> null,
-        //         'serial_number'=> null,
-        //         'success_msg'=> null,
-        //         'production_order'=> $this->prodOrder,
-        //         'sap_msg_status' => null,
-        //         'sap_msg_description' => null,
-        //         'operator_id'=> $operatorName,
-        //         'recent_qr' => $this->recQr,
-        //     ]);
-        //         Notification::make()
-        //             ->title('Invalid Line Found')
-        //             ->body("Choose '6 inch motor line' to proceed..!")
-        //             ->danger()
-        //             ->send();
-        //         return;
-        //     }
-        // }
-        // else if ($categoryName == 'Submersible Pump')
-        // {
-        //     if ($lineName != '6 inch pump line')
-        //     {
-        //          $this->form->fill([
-        //         'plant_id'=> $this->pId,
-        //         'block_name'=> $this->bId,
-        //         'shift_id'=> $this->sId,
-        //         'line_id'=> $this->lId,
-        //         'item_id'=> null,
-        //         'serial_number'=> null,
-        //         'success_msg'=> null,
-        //         'production_order'=> $this->prodOrder,
-        //         'sap_msg_status' => null,
-        //         'sap_msg_description' => null,
-        //         'operator_id'=> $operatorName,
-        //         'recent_qr' => $this->recQr,
-        //     ]);
-        //         Notification::make()
-        //             ->title('Invalid Line Found')
-        //             ->body("Choose '6 inch pump line' to proceed..!")
-        //             ->danger()
-        //             ->send();
-        //         return;
-        //     }
-        // }
-        // else
-        // {
-        //     $this->form->fill([
-        //         'plant_id'=> $this->pId,
-        //         'block_name'=> $this->bId,
-        //         'shift_id'=> $this->sId,
-        //         'line_id'=> $this->lId,
-        //         'item_id'=> null,
-        //         'serial_number'=> null,
-        //         'success_msg'=> null,
-        //         'production_order'=> $this->prodOrder,
-        //         'sap_msg_status' => null,
-        //         'sap_msg_description' => null,
-        //         'operator_id'=> $operatorName,
-        //         'recent_qr' => $this->recQr,
-        //     ]);
-        //         Notification::make()
-        //             ->title('Invalid Category Found')
-        //             ->body("Set proper category to proceed..!")
-        //             ->danger()
-        //             ->send();
-        //         return;
-        // }
+        if ($categoryName == 'Submersible Motor')
+        {
+            if ($lineName != '6 inch motor line')
+            {
+                 $this->form->fill([
+                'plant_id'=> $this->pId,
+                'block_name'=> $this->bId,
+                'shift_id'=> $this->sId,
+                'line_id'=> $this->lId,
+                'item_id'=> null,
+                'serial_number'=> null,
+                'success_msg'=> null,
+                'production_order'=> $this->prodOrder,
+                'sap_msg_status' => null,
+                'sap_msg_description' => null,
+                'operator_id'=> $operatorName,
+                'recent_qr' => $this->recQr,
+            ]);
+                Notification::make()
+                    ->title('Invalid Line Found')
+                    ->body("Choose '6 inch motor line' to proceed..!")
+                    ->danger()
+                    ->send();
+                return;
+            }
+        }
+        else if ($categoryName == 'Submersible Pump')
+        {
+            if ($lineName != '6 inch pump line')
+            {
+                 $this->form->fill([
+                'plant_id'=> $this->pId,
+                'block_name'=> $this->bId,
+                'shift_id'=> $this->sId,
+                'line_id'=> $this->lId,
+                'item_id'=> null,
+                'serial_number'=> null,
+                'success_msg'=> null,
+                'production_order'=> $this->prodOrder,
+                'sap_msg_status' => null,
+                'sap_msg_description' => null,
+                'operator_id'=> $operatorName,
+                'recent_qr' => $this->recQr,
+            ]);
+                Notification::make()
+                    ->title('Invalid Line Found')
+                    ->body("Choose '6 inch pump line' to proceed..!")
+                    ->danger()
+                    ->send();
+                return;
+            }
+        }
+        else
+        {
+            $this->form->fill([
+                'plant_id'=> $this->pId,
+                'block_name'=> $this->bId,
+                'shift_id'=> $this->sId,
+                'line_id'=> $this->lId,
+                'item_id'=> null,
+                'serial_number'=> null,
+                'success_msg'=> null,
+                'production_order'=> $this->prodOrder,
+                'sap_msg_status' => null,
+                'sap_msg_description' => null,
+                'operator_id'=> $operatorName,
+                'recent_qr' => $this->recQr,
+            ]);
+                Notification::make()
+                    ->title('Invalid Category Found')
+                    ->body("Set proper category to proceed..!")
+                    ->danger()
+                    ->send();
+                return;
+        }
 
         if ($this->succId == null) {
             $this->form->fill([
@@ -1398,33 +1383,6 @@ class StickerReprint extends Page implements HasForms
             $itemCode = trim($parts[0]);
             $this->sNoId = isset($parts[1]) ? trim($parts[1]) : null;
 
-            $originalQR = $this->qrData;
-
-            if (strpos($originalQR, '/') != false)
-            {
-                // Allowed endings
-                $allowed = ['/m', '/M', '/p', '/P', '/m|', '/M|', '/p|', '/P|'];
-
-                $foundValidEnding = false;
-
-                foreach ($allowed as $end) {
-                    if (str_ends_with($originalQR, $end)) {
-                        $foundValidEnding = true;
-                        break;
-                    }
-                }
-
-                if (!$foundValidEnding) {
-                    Notification::make()
-                        ->title('Invalid QR Code')
-                        ->body("Invalid QR format: '$originalQR'")
-                        ->danger()
-                        ->send();
-
-                    return;
-                }
-            }
-
             if ($this->sNoId != null) {
                 $this->sNoId = preg_replace('/\/.*/', '', $serialNumberRaw);
                 $this->sNoId = trim($this->sNoId);
@@ -1432,7 +1390,7 @@ class StickerReprint extends Page implements HasForms
                 $this->sNoId = null;
             }
 
-            //$this->qrData = preg_replace('/\/.*/', '', $this->qrData);
+            $this->qrData = preg_replace('/\/.*/', '', $this->qrData);
 
             ProductionQuantity::create([
                 'plant_id'=> $this->pId,
@@ -1448,6 +1406,7 @@ class StickerReprint extends Page implements HasForms
 
             // after success insertion
             $this->form->fill([
+
                 'plant_id'=> $this->pId,
                 'block_name'=> $this->bId,
                 'shift_id'=> $this->sId,
@@ -1470,7 +1429,7 @@ class StickerReprint extends Page implements HasForms
                 ->duration(1000)
                 ->send();
 
-            $url = route('download-qr1-pdf', ['palletNo' => urlencode($originalQR)]);
+                $url = route('download-qr1-pdf', ['palletNo' => $this->qrData]);
               $this->js(<<<JS
                     window.dispatchEvent(new CustomEvent('open-pdf', {
                         detail: {

app/Filament/Resources/CharacteristicValueResource.php

@@ -184,10 +184,6 @@ class CharacteristicValueResource extends Resource
                     ->hint(fn ($get) => $get('coilNumberError') ? $get('coilNumberError') : null)
                     ->hintColor('danger')
                     ->required(),
-                Forms\Components\TextInput::make('observed_value')
-                    ->label('Observed Value')
-                    ->reactive()
-                    ->required(),
                 Forms\Components\Select::make('status')
                     ->label('Status')
                     ->options([
@@ -248,11 +244,6 @@ class CharacteristicValueResource extends Resource
                     ->searchable()
                     ->alignCenter()
                     ->sortable(),
-                Tables\Columns\TextColumn::make('observed_value')
-                    ->label('Observed value')
-                    ->searchable()
-                    ->alignCenter()
-                    ->sortable(),
                 Tables\Columns\TextColumn::make('status')
                     ->label('Status')
                     ->searchable()

app/Filament/Resources/InvoiceValidationResource.php

@@ -10,8 +10,12 @@ use App\Models\InvoiceValidation;
 use App\Models\Item;
 use App\Models\Plant;
 use App\Models\StickerMaster;
+use Auth;
+use Filament\Actions\Action as FilamentActionsAction;
+use Filament\Actions\CreateAction;
 use Filament\Facades\Filament;
 use Filament\Forms;
+use Filament\Forms\Components\Actions\Action as ActionsAction;
 use Filament\Forms\Components\DateTimePicker;
 use Filament\Forms\Components\FileUpload;
 use Filament\Forms\Components\Radio;
@@ -19,23 +23,25 @@ use Filament\Forms\Components\Section;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Components\ToggleButtons;
-use Filament\Forms\Components\View;
 use Filament\Forms\Form;
 use Filament\Forms\Get;
-use Filament\Notifications\Notification;
 use Filament\Resources\Resource;
 use Filament\Tables;
-use Filament\Tables\Actions\Action;
-use Filament\Tables\Actions\ExportAction;
-use Filament\Tables\Filters\Filter;
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\SoftDeletingScope;
-use Illuminate\Support\Facades\Session;
+use Filament\Notifications\Notification;
+use Filament\Tables\Actions\Action;
+use Filament\Tables\Actions\ExportAction;
+use Filament\Tables\Filters\Filter;
 use Illuminate\Support\Facades\Storage;
-use Livewire\Livewire;
 use Maatwebsite\Excel\Facades\Excel;
+use Livewire\Livewire;
 use Str;
+use Illuminate\Support\Facades\Session;
+use Illuminate\Support\Facades\Mail;
+use Filament\Forms\Components\View;
+
 
 class InvoiceValidationResource extends Resource
 {
@@ -47,6 +53,8 @@ class InvoiceValidationResource extends Resource
 
     public  $invoiceNumber;
 
+
+
     public static function form(Form $form): Form
     {
         return $form
@@ -66,7 +74,6 @@ class InvoiceValidationResource extends Resource
                     ->columnSpan(1)
                     ->options(function (callable $get) {
                         $userHas = Filament::auth()->user()->plant_id;
-
                         return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::pluck('name', 'id')->toArray();
                     })
                     ->default(function () {
@@ -84,9 +91,10 @@ class InvoiceValidationResource extends Resource
                             $set('total_quantity', null);
                             $set('scanned_quantity', null);
                             $set('ivPlantError', 'Please select a plant first.');
-
                             return;
-                                } else {
+                        }
+                        else
+                        {
                             $set('ivPlantError', null);
                         }
                     })
@@ -170,17 +178,18 @@ class InvoiceValidationResource extends Resource
                     ->reactive()
                     ->hidden(fn (callable $get) => ($get('invoice_number') == null || $get('update_invoice') == '0') || !empty($get('serial_number')))
                     ->afterStateUpdated(function ($state, callable $set, callable $get) {
-                                if (! $get('plant_id')) {
+                        if (!$get('plant_id'))
+                        {
                             $set('update_invoice', null);
-
                             return;
                         }
 
-                                if ($get('update_invoice') == '1') {
+                        if ($get('update_invoice') == "1")
+                        {
                             $totQuan = InvoiceValidation::where('invoice_number', $get('invoice_number'))->where('plant_id', $get('plant_id'))->count();
-                                    if ($totQuan <= 0) {
+                            if ($totQuan <= 0)
+                            {
                                 $set('update_invoice', null);
-
                                 return;
                             }
 
@@ -188,16 +197,19 @@ class InvoiceValidationResource extends Resource
                             $scanMQuan = InvoiceValidation::where('invoice_number', $get('invoice_number'))->whereNotNull('serial_number')->where('serial_number', '!=', '')->where('plant_id', $get('plant_id'))->count();
                             $scanSQuan = InvoiceValidation::where('invoice_number', $get('invoice_number'))->where('scanned_status', 'Scanned')->where('plant_id', $get('plant_id'))->count();
 
-                                    if ($totMQuan > 0) {
-                                        if ($totQuan == $scanMQuan) {
+                            if ($totMQuan > 0)
+                            {
+                                if ($totQuan == $scanMQuan)
+                                {
                                     $set('update_invoice', null);
-
                                     return;
                                 }
-                                    } else {
-                                        if ($totQuan == $scanSQuan) {
+                            }
+                            else
+                            {
+                                if ($totQuan == $scanSQuan)
+                                {
                                     $set('update_invoice', null);
-
                                     return;
                                 }
                             }
@@ -212,6 +224,7 @@ class InvoiceValidationResource extends Resource
             ]);
     }
 
+
     public static function table(Table $table): Table
     {
         return $table
@@ -227,7 +240,6 @@ class InvoiceValidationResource extends Resource
                         $paginator = $livewire->getTableRecords();
                         $perPage = method_exists($paginator, 'perPage') ? $paginator->perPage() : 10;
                         $currentPage = method_exists($paginator, 'currentPage') ? $paginator->currentPage() : 1;
-
                         return ($currentPage - 1) * $perPage + $rowLoop->iteration;
                     }),
                 Tables\Columns\TextColumn::make('invoice_number')
@@ -238,11 +250,6 @@ class InvoiceValidationResource extends Resource
                     ->label('Item Code')
                     ->alignCenter()
                     ->sortable(), //->searchable()
-                Tables\Columns\TextColumn::make('stickerMaster.item.description')
-                    ->label('Item Description')
-                    ->alignCenter()
-                    ->sortable() // ->searchable()
-                    ->toggleable(isToggledHiddenByDefault: true),
                 Tables\Columns\TextColumn::make('serial_number')
                     ->label('Serial Number')
                     ->alignCenter()
@@ -262,9 +269,6 @@ class InvoiceValidationResource extends Resource
                 Tables\Columns\TextColumn::make('scanned_status')
                     ->label('Scanned Status')
                     ->alignCenter(),
-                // Tables\Columns\TextColumn::make('stickerMaster.panel_box_code')
-                //     ->label('Panel Box Code')
-                //     ->alignCenter(),
                 Tables\Columns\TextColumn::make('panel_box_supplier')
                     ->label('Panel Box Supplier')
                     ->alignCenter(),
@@ -331,7 +335,6 @@ class InvoiceValidationResource extends Resource
                             // ->options(Plant::pluck('name', 'id')->toArray()) // Fetch plant names and IDs
                             ->options(function (callable $get) {
                                 $userHas = Filament::auth()->user()->plant_id;
-
                                 return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::pluck('name', 'id')->toArray();
                             })
                             ->label('Select Plant')
@@ -375,37 +378,42 @@ class InvoiceValidationResource extends Resource
                         // /home/iot-dev/projects/pds/storage/app/private/uploads/temp/3RA0018735.xlsx
 
                         $totQuan = InvoiceValidation::where('invoice_number', $originalNameOnly)->count();
-                        if ($totQuan > 0) {
+                        if ($totQuan > 0)
+                        {
                             $scanSQuan = InvoiceValidation::where('invoice_number', $originalNameOnly)->where('scanned_status', 'Scanned')->count();
-                            if ($totQuan == $scanSQuan) {
+                            if ($totQuan == $scanSQuan)
+                            {
                                 $invoiceFirst = InvoiceValidation::with('plant')->where('invoice_number', $originalNameOnly)->first();
-                                $plantName = $invoiceFirst ? (string) $invoiceFirst->plant->name : null;
+                                $plantName = $invoiceFirst ? (String)$invoiceFirst->plant->name : null;
 
                                 Notification::make()
                                     ->title("Serial invoice number : '$originalNameOnly' already completed the scanning process for plant : '$plantName'.")
                                     ->danger()
                                     ->send();
 
-                                if ($disk->exists($path)) {
+                                if ($disk->exists($path))
+                                {
                                     $disk->delete($path);
                                 }
-
                                 return;
-                            } else {
+                            }
+                            else
+                            {
                                 $invoiceFirst = InvoiceValidation::with('plant')->where('invoice_number', $originalNameOnly)->first();
                                 // $plantCode = $invoiceFirst ? (String)$invoiceFirst->plant->code : null;
-                                $plantName = $invoiceFirst ? (string) $invoiceFirst->plant->name : null;
+                                $plantName = $invoiceFirst ? (String)$invoiceFirst->plant->name : null;
                                 $invoicePlantId = $invoiceFirst->plant_id;
-                                if ($plantId != $invoicePlantId) {
+                                if ($plantId != $invoicePlantId)
+                                {
                                     Notification::make()
                                         ->title("Serial invoice number : '$originalNameOnly' already exists for plant : '$plantName'.<br>Choose the valid 'Plant' to proceed!")
                                         ->danger()
                                         ->send();
 
-                                    if ($disk->exists($path)) {
+                                    if ($disk->exists($path))
+                                    {
                                         $disk->delete($path);
                                     }
-
                                     return;
                                 }
                             }
@@ -414,23 +422,26 @@ class InvoiceValidationResource extends Resource
                         $totQuan = InvoiceValidation::where('invoice_number', $originalNameOnly)->where('plant_id', $plantId)->count();
                         $scanSQuan = InvoiceValidation::where('invoice_number', $originalNameOnly)->where('scanned_status', 'Scanned')->where('plant_id', $plantId)->count();
 
-                        if ($totQuan > 0 && $totQuan == $scanSQuan) {
+                        if ($totQuan > 0 && $totQuan == $scanSQuan)
+                        {
                             Notification::make()
                                 ->title('Serial invoice already completed the scanning process for selected plant.')
                                 ->danger()
                                 ->send();
 
-                            if ($disk->exists($path)) {
+                            if ($disk->exists($path))
+                            {
                                 $disk->delete($path);
                             }
-
                             return;
                         }
 
-                        if ($fullPath && file_exists($fullPath)) {
+                        if ($fullPath && file_exists($fullPath))
+                        {
                             $rows = Excel::toArray(null, $fullPath)[0];
 
-                            if ((count($rows) - 1) <= 0) {
+                            if ((count($rows) - 1) <= 0)
+                            {
                                 Notification::make()
                                     ->title('Records Not Found')
                                     ->body("Import the valid 'Serial Invoice' file to proceed..!")
@@ -440,7 +451,6 @@ class InvoiceValidationResource extends Resource
                                 if ($disk->exists($path)) {
                                     $disk->delete($path);
                                 }
-
                                 return;
                             }
 
@@ -452,10 +462,9 @@ class InvoiceValidationResource extends Resource
                             $seenSerialNumbers = [];
                             $validRowsFound = false;
 
-                            foreach ($rows as $index => $row) {
-                                if ($index == 0) {
-                                    continue;
-                                }  // Skip header
+                            foreach ($rows as $index => $row)
+                            {
+                                if ($index == 0) continue;  // Skip header
 
                                 $materialCode = trim($row[0]);
                                 $serialNumber = trim($row[1]);
@@ -464,16 +473,24 @@ class InvoiceValidationResource extends Resource
                                     continue;
                                 }
 
-                                if (! empty($materialCode)) {
-                                    if (Str::length($materialCode) < 6 || ! ctype_alnum($materialCode)) {
+                                if (!empty($materialCode))
+                                {
+                                    if (Str::length($materialCode) < 6 || !ctype_alnum($materialCode))
+                                    {
                                         $invalidMatCodes[] = $materialCode;
-                                    } else {
+                                    }
+                                    else
+                                    {
                                         if (empty($serialNumber)) {
                                             $missingSerials[] = $materialCode;
 
-                                        } elseif (Str::length($serialNumber) < 9 || ! ctype_alnum($serialNumber)) {
+                                        }
+                                        else if (Str::length($serialNumber) < 9 || !ctype_alnum($serialNumber))
+                                        {
                                             $invalidSerialCodes[] = $serialNumber;
-                                        } else {
+                                        }
+                                        else
+                                        {
                                             if (in_array($serialNumber, $seenSerialNumbers)) {
                                                 $duplicateSerials[] = $serialNumber;
                                             } else {
@@ -483,7 +500,9 @@ class InvoiceValidationResource extends Resource
                                             }
                                         }
                                     }
-                                } else {
+                                }
+                                else
+                                {
                                     continue;
                                 }
                             }
@@ -505,9 +524,9 @@ class InvoiceValidationResource extends Resource
                                 if ($disk->exists($path)) {
                                     $disk->delete($path);
                                 }
-
                                 return;
-                            } elseif (! empty($uniqueMissingSerials)) {
+                            }
+                            else if (!empty($uniqueMissingSerials)) {
                                 Notification::make()
                                     ->title('Missing Serial Numbers')
                                     ->body("The following item codes doesn't have valid serial number:<br>" . implode(', ', $uniqueMissingSerials))
@@ -516,9 +535,9 @@ class InvoiceValidationResource extends Resource
                                 if ($disk->exists($path)) {
                                     $disk->delete($path);
                                 }
-
                                 return;
-                            } elseif (! empty($uniqueSerialCodes)) {
+                            }
+                            else if (!empty($uniqueSerialCodes)) {
                                 Notification::make()
                                     ->title('Invalid Serial Number')
                                     ->body('The following serial numbers should contain minimum 9 digit alpha numeric values:<br>' . implode(', ', $uniqueSerialCodes))
@@ -527,9 +546,9 @@ class InvoiceValidationResource extends Resource
                                 if ($disk->exists($path)) {
                                     $disk->delete($path);
                                 }
-
                                 return;
-                            } elseif (! empty($duplicateSerialCodes)) {
+                            }
+                            else if (!empty($duplicateSerialCodes)) {
                                 Notification::make()
                                     ->title('Duplicate Serial Numbers')
                                     ->body('The following serial numbers are already exist in imported excel:<br>' . implode(', ', $duplicateSerialCodes))
@@ -538,7 +557,6 @@ class InvoiceValidationResource extends Resource
                                 if ($disk->exists($path)) {
                                     $disk->delete($path);
                                 }
-
                                 return;
                             }
 
@@ -551,7 +569,6 @@ class InvoiceValidationResource extends Resource
                                 if ($disk->exists($path)) {
                                     $disk->delete($path);
                                 }
-
                                 return;
                             }
 
@@ -567,7 +584,8 @@ class InvoiceValidationResource extends Resource
 
                             $missingCodes = array_diff($uniqueCodes, $matchedCodes);
 
-                            if (! empty($missingCodes)) {
+                            if (!empty($missingCodes))
+                            {
                                 $missingCount = count($missingCodes);
 
                                 $message = $missingCount > 10 ? "'$missingCount' item codes are not found in database." : 'The following item codes are not found in database:<br>' . implode(', ', $missingCodes);
@@ -581,7 +599,6 @@ class InvoiceValidationResource extends Resource
                                 if ($disk->exists($path)) {
                                     $disk->delete($path);
                                 }
-
                                 return;
                             }
 
@@ -591,7 +608,8 @@ class InvoiceValidationResource extends Resource
                                 ->pluck('item.code')
                                 ->toArray();
 
-                            if (count($invalidCodes) > 10) {
+                            if (count($invalidCodes) > 10)
+                            {
                                 Notification::make()
                                     ->title('Invalid item codes found')
                                     ->body('' . count($invalidCodes) . 'item codes found have material type.')
@@ -601,9 +619,10 @@ class InvoiceValidationResource extends Resource
                                 if ($disk->exists($path)) {
                                     $disk->delete($path);
                                 }
-
                                 return;
-                            } elseif (count($invalidCodes) > 0) {
+                            }
+                            else if (count($invalidCodes) > 0)
+                            {
                                 Notification::make()
                                     ->title('Invalid item codes found')
                                     ->body('Material invoice Item Codes found : ' . implode(', ', $invalidCodes))
@@ -613,9 +632,10 @@ class InvoiceValidationResource extends Resource
                                 if ($disk->exists($path)) {
                                     $disk->delete($path);
                                 }
-
                                 return;
-                            } else {
+                            }
+                            else
+                            {
                                 // Save full file path to session
                                 session(['uploaded_invoice_path' => $fullPath]);
                                 Notification::make()
@@ -636,7 +656,6 @@ class InvoiceValidationResource extends Resource
                         // ->options(Plant::pluck('name', 'id')->toArray()) // Fetch plant names and IDs
                         ->options(function (callable $get) {
                             $userHas = Filament::auth()->user()->plant_id;
-
                             return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::pluck('name', 'id')->toArray();
                         })
                         ->label('Select Plant')
@@ -676,37 +695,42 @@ class InvoiceValidationResource extends Resource
                         $fullPath = Storage::disk('local')->path($path);
 
                         $totQuan = InvoiceValidation::where('invoice_number', $originalNameOnly)->count();
-                        if ($totQuan > 0) {
+                        if ($totQuan > 0)
+                        {
                             $scanMQuan = InvoiceValidation::where('invoice_number', $originalNameOnly)->whereNotNull('serial_number')->where('serial_number', '!=', '')->count();
-                            if ($totQuan == $scanMQuan) {
+                            if ($totQuan == $scanMQuan)
+                            {
                                 $invoiceFirst = InvoiceValidation::with('plant')->where('invoice_number', $originalNameOnly)->first();
-                                $plantName = $invoiceFirst ? (string) $invoiceFirst->plant->name : null;
+                                $plantName = $invoiceFirst ? (String)$invoiceFirst->plant->name : null;
 
                                 Notification::make()
                                     ->title("Material invoice number : '$originalNameOnly' already completed the scanning process for plant : '$plantName'.")
                                     ->danger()
                                     ->send();
 
-                                if ($disk->exists($path)) {
+                                if ($disk->exists($path))
+                                {
                                     $disk->delete($path);
                                 }
-
                                 return;
-                            } else {
+                            }
+                            else
+                            {
                                 $invoiceFirst = InvoiceValidation::with('plant')->where('invoice_number', $originalNameOnly)->first();
                                 // $plantCode = $invoiceFirst ? (String)$invoiceFirst->plant->code : null;
-                                $plantName = $invoiceFirst ? (string) $invoiceFirst->plant->name : null;
+                                $plantName = $invoiceFirst ? (String)$invoiceFirst->plant->name : null;
                                 $invoicePlantId = $invoiceFirst->plant_id;
-                                if ($plantId != $invoicePlantId) {
+                                if ($plantId != $invoicePlantId)
+                                {
                                     Notification::make()
                                         ->title("Material invoice number : '$originalNameOnly' already exists for plant : '$plantName'.<br>Choose the valid 'Plant' to proceed!")
                                         ->danger()
                                         ->send();
 
-                                    if ($disk->exists($path)) {
+                                    if ($disk->exists($path))
+                                    {
                                         $disk->delete($path);
                                     }
-
                                     return;
                                 }
                             }
@@ -715,7 +739,8 @@ class InvoiceValidationResource extends Resource
                         $totQuan = InvoiceValidation::where('invoice_number', $originalNameOnly)->where('plant_id', $plantId)->count();
                         $scanMQuan = InvoiceValidation::where('invoice_number', $originalNameOnly)->whereNotNull('serial_number')->where('serial_number', '!=', '')->where('plant_id', $plantId)->count();
 
-                        if ($totQuan > 0 && $totQuan == $scanMQuan) {
+                        if ($totQuan > 0 && $totQuan == $scanMQuan)
+                        {
                             Notification::make()
                                 ->title('Material invoice already completed the scanning process for selected plant.')
                                 ->danger()
@@ -723,14 +748,15 @@ class InvoiceValidationResource extends Resource
                             if ($disk->exists($path)) {
                                 $disk->delete($path);
                             }
-
                             return;
                         }
 
-                        if ($fullPath && file_exists($fullPath)) {
+                        if ($fullPath && file_exists($fullPath))
+                        {
                             $rows = Excel::toArray(null, $fullPath)[0];
 
-                            if ((count($rows) - 1) <= 0) {
+                            if ((count($rows) - 1) <= 0)
+                            {
                                 Notification::make()
                                     ->title('Records Not Found')
                                     ->body("Import the valid 'Material Invoice' file to proceed..!")
@@ -740,7 +766,6 @@ class InvoiceValidationResource extends Resource
                                 if ($disk->exists($path)) {
                                     $disk->delete($path);
                                 }
-
                                 return;
                             }
 
@@ -751,10 +776,9 @@ class InvoiceValidationResource extends Resource
                             $invalidMaterialQuan = [];
                             $validRowsFound = false;
 
-                            foreach ($rows as $index => $row) {
-                                if ($index == 0) {
-                                    continue;
-                                }  // Skip header
+                            foreach ($rows as $index => $row)
+                            {
+                                if ($index == 0) continue;  // Skip header
 
                                 $materialCode = trim($row[0]);
                                 $materialQuantity = trim($row[1]);
@@ -764,21 +788,33 @@ class InvoiceValidationResource extends Resource
                                 }
 
                                 if (!empty($materialCode)) {
-                                    if (Str::length($materialCode) < 6 || ! ctype_alnum($materialCode)) {
+                                    if (Str::length($materialCode) < 6 || !ctype_alnum($materialCode))
+                                    {
                                         $invalidMatCodes[] = $materialCode;
-                                    } else {
-                                        if ($materialQuantity == 0) {
+                                    }
+                                    else
+                                    {
+                                        if ($materialQuantity == 0)
+                                        {
                                             $invalidMaterialQuan[] = $materialCode;
-                                        } elseif (empty($materialQuantity)) {
+                                        }
+                                        else if (empty($materialQuantity))
+                                        {
                                             $missingQuantities[] = $materialCode;
-                                        } elseif (! is_numeric($materialQuantity)) {
+                                        }
+                                        else if (!is_numeric($materialQuantity))
+                                        {
                                             $invalidMatQuan[] = $materialCode;
-                                        } else {
+                                        }
+                                        else
+                                        {
                                             $materialCodes[] = $materialCode;
                                             $validRowsFound = true;
                                         }
                                     }
-                                } else {
+                                }
+                                else
+                                {
                                     continue;
                                 }
                             }
@@ -798,35 +834,32 @@ class InvoiceValidationResource extends Resource
                                 if ($disk->exists($path)) {
                                     $disk->delete($path);
                                 }
-
                                 return;
                             }
 
                             if (!empty($uniqueaplhaMat)) {
                                 Notification::make()
                                     ->title('Invalid Material Quantity')
-                                    ->body('The following item codes material quantity must be a numeric values :<br>'.implode(', ', $uniqueaplhaMat))
+                                    ->body("The following item codes material quantity must be a numeric values :<br>" . implode(', ', $uniqueaplhaMat))
                                     ->danger()
                                     ->send();
 
                                 if ($disk->exists($path)) {
                                     $disk->delete($path);
                                 }
-
                                 return;
                             }
 
                             if (!empty($uniqueZeroMat)) {
                                 Notification::make()
                                     ->title('Invalid Material Quantity')
-                                    ->body('The following item codes material quantity should be greater than 0:<br>'.implode(', ', $uniqueZeroMat))
+                                    ->body("The following item codes material quantity should be greater than 0:<br>" . implode(', ', $uniqueZeroMat))
                                     ->danger()
                                     ->send();
 
                                 if ($disk->exists($path)) {
                                     $disk->delete($path);
                                 }
-
                                 return;
                             }
 
@@ -840,7 +873,6 @@ class InvoiceValidationResource extends Resource
                                 if ($disk->exists($path)) {
                                     $disk->delete($path);
                                 }
-
                                 return;
                             }
 
@@ -854,7 +886,6 @@ class InvoiceValidationResource extends Resource
                                 if ($disk->exists($path)) {
                                     $disk->delete($path);
                                 }
-
                                 return;
                             }
 
@@ -870,7 +901,8 @@ class InvoiceValidationResource extends Resource
 
                             $missingCodes = array_diff($uniqueCodes, $matchedCodes);
 
-                            if (! empty($missingCodes)) {
+                            if (!empty($missingCodes))
+                            {
                                 $missingCount = count($missingCodes);
 
                                 $message = $missingCount > 10
@@ -886,7 +918,6 @@ class InvoiceValidationResource extends Resource
                                 if ($disk->exists($path)) {
                                     $disk->delete($path);
                                 }
-
                                 return;
                             }
 
@@ -895,7 +926,8 @@ class InvoiceValidationResource extends Resource
                                 ->pluck('item.code')
                                 ->toArray();
 
-                            if (count($invalidCodes) > 10) {
+                            if (count($invalidCodes) > 10)
+                            {
                                 $invalidCodes = array_unique($invalidCodes);
                                 Notification::make()
                                     ->title('Invalid item codes found')
@@ -906,9 +938,10 @@ class InvoiceValidationResource extends Resource
                                 if ($disk->exists($path)) {
                                     $disk->delete($path);
                                 }
-
                                 return;
-                            } elseif (count($invalidCodes) > 0) {
+                            }
+                            else if (count($invalidCodes) > 0)
+                            {
                                 $invalidCodes = array_unique($invalidCodes);
                                 Notification::make()
                                     ->title('Invalid item codes found')
@@ -919,7 +952,6 @@ class InvoiceValidationResource extends Resource
                                 if ($disk->exists($path)) {
                                     $disk->delete($path);
                                 }
-
                                 return;
                             }
 
@@ -927,22 +959,24 @@ class InvoiceValidationResource extends Resource
                             $zeroQtyCodes = [];
                             $notDivisibleCodes = [];
 
-                            foreach ($matchedItems as $sticker) {
+                            foreach ($matchedItems as $sticker)
+                            {
                                 $code = $sticker->item->code;
                                 $materialType = $sticker->material_type;
 
-                                if ($materialType == 2) {
+                                if ($materialType == 2)
+                                {
                                     $bundleQty = $sticker->bundle_quantity ?? 0;
                                     $totalExcelQty = 0;
 
-                                    foreach ($rows as $index => $row) {
-                                        if ($index == 0) {
-                                            continue;
-                                        } // Skip header
+                                    foreach ($rows as $index => $row)
+                                    {
+                                        if ($index == 0) continue; // Skip header
 
                                         $excelCode = trim($row[0]);
                                         $excelMatQty = trim($row[1]);
 
+
                                         if ($excelCode == $code && is_numeric($excelMatQty)) {
                                             $totalExcelQty += $excelMatQty; // Sum up the quantities
                                         }
@@ -959,9 +993,7 @@ class InvoiceValidationResource extends Resource
                             }
 
                             $showValidationNotification = function(array $codes, string $message) {
-                                if (count($codes) == 0) {
-                                    return;
-                                }
+                                if (count($codes) == 0) return;
 
                                 $uniqueCodes = array_unique($codes);
                                 $codeList = implode(', ', $uniqueCodes);
@@ -977,17 +1009,19 @@ class InvoiceValidationResource extends Resource
                             $zeroQtyCodes = array_unique($zeroQtyCodes);
                             $notDivisibleCodes = array_unique($notDivisibleCodes);
 
-                            $showValidationNotification($nonNumericQtyCodes, 'The following item codes contains invalid bundle quantity:');
+                            $showValidationNotification($nonNumericQtyCodes, "The following item codes contains invalid bundle quantity:");
                             $showValidationNotification($zeroQtyCodes, "The following item codes quantity should be greater than '0':");
-                            $showValidationNotification($notDivisibleCodes, 'The following item codes quantity is not divisible by bundle quantity.');
+                            $showValidationNotification($notDivisibleCodes, "The following item codes quantity is not divisible by bundle quantity.");
 
                             if ($nonNumericQtyCodes || $zeroQtyCodes || $notDivisibleCodes) {
-                                if ($disk->exists($path)) {
+                                if ($disk->exists($path))
+                                {
                                     $disk->delete($path);
                                 }
-
                                 return;
-                            } else {
+                            }
+                            else
+                            {
                                  // Save full file path to session
                                 session(['uploaded_material_invoice' => $fullPath]);
                                 Notification::make()
@@ -1018,50 +1052,11 @@ class InvoiceValidationResource extends Resource
                     Radio::make('invoice_type')
                         ->label('Type ?')
                         ->boolean()
-                            // ->options([
-                            //     'Serial' => 'Serial',
-                            //     'Material' => 'Material',
-                            // ])
-                            ->options(function () {
-                                $userRights = Filament::auth()->user();
-                                $hasBoth = ($userRights->hasRole(['Super Admin', 'Sales Employee', 'Sales Supervisor Hub', 'Sales Manager']) ?? null);
-
-                                $hasSerial = ($userRights->hasRole(['Sales Supervisor 1', 'Sales Supervisor Inventory', 'Sales Employee Inventory']) ?? null);
-
-                                $hasMaterial = $userRights->hasRole('Sales Supervisor 2') ?? null;
-
-                                $retRes = [
+                        ->options([
                             'Serial' => 'Serial',
-                                    'Material' => 'Material',
-                                ];
-
-                                if ($hasBoth) {
-                                    return $retRes;
-                                } elseif ($hasSerial) {
-                                    return ['Serial' => 'Serial'];
-                                } elseif ($hasMaterial) {
-                                    return ['Material' => 'Material'];
-                                } else {
-                                    return ['Serial' => 'Serial']; // return [];
-                                }
-                            })
-                            // ->default('Serial')
-                            ->default(function () {
-                                $userRights = Filament::auth()->user();
-                                $hasBoth = ($userRights->hasRole(['Super Admin', 'Sales Employee', 'Sales Supervisor Hub', 'Sales Manager']) ?? null);
-
-                                $hasSerial = ($userRights->hasRole(['Sales Supervisor 1', 'Sales Supervisor Inventory', 'Sales Employee Inventory']) ?? null);
-
-                                $hasMaterial = $userRights->hasRole('Sales Supervisor 2') ?? null;
-
-                                if ($hasBoth || $hasSerial) {
-                                    return 'Serial';
-                                } elseif ($hasMaterial) {
-                                    return 'Material';
-                                } else {
-                                    return 'Serial'; // return [];
-                                }
-                            })
+                            'Material' => 'Material'
+                        ])
+                        ->default('Serial')
                         ->inlineLabel(false)
                         ->inline(),
                     Select::make('Plant')
@@ -1072,7 +1067,6 @@ class InvoiceValidationResource extends Resource
                         // })
                         ->options(function (callable $get) {
                             $userHas = Filament::auth()->user()->plant_id;
-
                             return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::pluck('name', 'id')->toArray();
                         })
                         ->reactive()
@@ -1091,7 +1085,6 @@ class InvoiceValidationResource extends Resource
                         ->nullable()
                         ->options(function (callable $get) {
                             $pId = $get('Plant');
-
                             // if (empty($pId)) {
                             //     return [];
                             // }
@@ -1118,9 +1111,12 @@ class InvoiceValidationResource extends Resource
                         ->nullable()
                         ->options(function (callable $get) {
                             $plantId = $get('Plant');
-                                if (! $plantId) {
+                            if (!$plantId)
+                            {
                                 return InvoiceValidation::whereNotNull('operator_id')->select('operator_id')->distinct()->pluck('operator_id', 'operator_id');
-                                } else {
+                            }
+                            else
+                            {
                                 return InvoiceValidation::where('plant_id', $plantId)->whereNotNull('operator_id')->select('operator_id')->distinct()->pluck('operator_id', 'operator_id');
                             }
                         })
@@ -1140,13 +1136,13 @@ class InvoiceValidationResource extends Resource
                 ->query(function ($query, array $data) {
                     // Hide all records initially if no filters are applied
                     if (empty($data['invoice_type']) || (empty($data['Plant']) && empty($data['invoice_number']) && empty($data['serial_number']) && empty($data['created_from']) && empty($data['created_to']) && empty($data['operator_id']) && empty($data['scanned_status']) && empty($data['sticker_master_id']))) {
-                            if (empty($data['invoice_type'])) {
+                        if (empty($data['invoice_type']))
+                        {
                             Notification::make()
                                 ->title('Please, choose invoice type to filter.')
                                 ->danger()
                                 ->send();
                         }
-
                         return $query->whereRaw('1 = 0');
                     }
 
@@ -1158,7 +1154,7 @@ class InvoiceValidationResource extends Resource
                                 $query->whereNotNull('scanned_status')->where('scanned_status', '!=', '');
                             } elseif ($data['scanned_status'] == 'Pending') {
                                 //$query->whereNull('scanned_status')->orWhere('scanned_status', '');
-                                    $query->where(function ($query) {
+                                $query->where(function ($query) use ($data) {
                                     // if (empty($data['scanned_status']) || $data['scanned_status'] == 'Pending') {
                                     $query->whereNull('scanned_status')->orWhere('scanned_status', '!=', 'Scanned');
                                     // }
@@ -1172,7 +1168,7 @@ class InvoiceValidationResource extends Resource
                             if ($data['scanned_status'] == 'Scanned') {
                                 $query->whereNotNull('serial_number')->where('serial_number', '!=', '');
                             } elseif ($data['scanned_status'] == 'Pending') {
-                                    $query->where(function ($query) {
+                                $query->where(function ($query) use ($data) {
                                     $query->whereNull('serial_number')->orWhere('serial_number', '=', '');
                                 });
                             }
@@ -1250,7 +1246,7 @@ class InvoiceValidationResource extends Resource
                     }
 
                     return $indicators;
-                    }),
+                })
             ])
             ->filtersFormMaxHeight('280px')
             ->actions([
@@ -1262,7 +1258,7 @@ class InvoiceValidationResource extends Resource
                     Tables\Actions\DeleteBulkAction::make(),
                     Tables\Actions\ForceDeleteBulkAction::make(),
                     Tables\Actions\RestoreBulkAction::make(),
-                    FilamentExportBulkAction::make('export'),
+                    FilamentExportBulkAction::make('export')
                 ]),
             ]);
     }

app/Filament/Resources/InvoiceValidationResource/Pages/CreateInvoiceValidation.php

@@ -53,7 +53,6 @@ class CreateInvoiceValidation extends CreateRecord
     public bool $showCapacitorInput = false;
 
     public $excel_file;
-    public $mInvoiceNo;
 
     public function getFormActions(): array
     {
@@ -104,8 +103,6 @@ class CreateInvoiceValidation extends CreateRecord
     {
         $invoiceNumber = trim($invoiceNumber);
 
-        $parts = explode('.', $invoiceNumber);
-
         $this->showCapacitorInput = false;
 
         $user = Filament::auth()->user();
@@ -121,62 +118,6 @@ class CreateInvoiceValidation extends CreateRecord
 
         // ..GET SERIAL INVOICE API
 
-        if(strlen($invoiceNumber) > 15)
-        {
-
-            $payloadJson = base64_decode(strtr($parts[1], '-_', '+/'));
-
-            if (empty($payloadJson)) {
-                Notification::make()
-                    ->title('Invalid payload for scanned qr code.')
-                    ->danger()
-                    ->seconds(1)
-                    ->send();
-                return;
-            }
-
-            $payload = json_decode($payloadJson, true);
-
-
-            if (!isset($payload['data'])) {
-                Notification::make()
-                    ->title('Invalid payload for scanned qr code.')
-                    ->info()
-                    ->seconds(1)
-                    ->send();
-                return;
-            }
-
-            $documentData = $payload['data'];
-
-            if($documentData == '' || $documentData == ''){
-                Notification::make()
-                    ->title('Invalid payload for scanned qr code.')
-                    ->info()
-                    ->seconds(1)
-                    ->send();
-                return;
-            }
-
-                // Extract DocNo
-            preg_match('/"DocNo"\s*:\s*"([^"]+)"/', $documentData, $matches);
-
-            if (!isset($matches[1])) {
-                Notification::make()
-                    ->title('Invoice number not found.')
-                    ->info()
-                    ->seconds(1)
-                    ->send();
-                return;
-            }
-
-            if (isset($matches[1])) {
-                $invoiceNumber = $matches[1];
-            }
-        }
-
-        //dd($invoiceNumber);
-
         // ..
 
         $updateStatus = $this->form->getState()['update_invoice'] ?? null;
@@ -2801,6 +2742,19 @@ class CreateInvoiceValidation extends CreateRecord
                         ->send();
                     $this->dispatch('playWarnSound');
 
+                    // $mailData = $this->getMail();
+                    // $mPlantName = $mailData['plant_name'];
+                    // $emails = $mailData['emails'];
+                    // $mInvoiceType = 'Material';
+
+                    // if (! empty($emails)) {
+                    //     Mail::to($emails)->send(
+                    //         new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'ItemNotValidMaterialType')
+                    //     );
+                    // } else {
+                    //     \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
+                    // }
+
                     $this->form->fill([
                         'plant_id' => $plantId,
                         'invoice_number' => $invoiceNumber,
@@ -2830,6 +2784,19 @@ class CreateInvoiceValidation extends CreateRecord
                         ->send();
                     $this->dispatch('playWarnSound');
 
+                    // $mailData = $this->getMail();
+                    // $mPlantName = $mailData['plant_name'];
+                    // $emails = $mailData['emails'];
+                    // $mInvoiceType = 'Material';
+
+                    // if (! empty($emails)) {
+                    //     Mail::to($emails)->send(
+                    //         new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'ItemNotInvoice')
+                    //     );
+                    // } else {
+                    //     \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
+                    // }
+
                     $this->form->fill([
                         'plant_id' => $plantId,
                         'invoice_number' => $invoiceNumber,
@@ -2858,6 +2825,19 @@ class CreateInvoiceValidation extends CreateRecord
                         ->send();
                     $this->dispatch('playWarnSound');
 
+                    // $mailData = $this->getMail();
+                    // $mPlantName = $mailData['plant_name'];
+                    // $emails = $mailData['emails'];
+                    // $mInvoiceType = 'Material';
+
+                    // if (! empty($emails)) {
+                    //     Mail::to($emails)->send(
+                    //         new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'Item')
+                    //     );
+                    // } else {
+                    //     \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
+                    // }
+
                     $this->form->fill([
                         'plant_id' => $plantId,
                         'invoice_number' => $invoiceNumber,
@@ -3401,6 +3381,19 @@ class CreateInvoiceValidation extends CreateRecord
                                 ->send();
                             $this->dispatch('playNotificationSound');
 
+                            // $mInvoiceType = 'Serial';
+                            // $mailData = $this->getMail();
+                            // $mPlantName = $mailData['plant_name'];
+                            // $emails = $mailData['emails'];
+
+                            // if (! empty($emails)) {
+                            //     Mail::to($emails)->send(
+                            //         new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'CompletedSerialInvoice')
+                            //     );
+                            // } else {
+                            //     \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
+                            // }
+
                             $filename = $invoiceNumber.'.xlsx';
                             $directory = 'uploads/temp';
                             $disk = Storage::disk('local');
@@ -3518,6 +3511,20 @@ class CreateInvoiceValidation extends CreateRecord
 
                             $this->dispatch('playNotificationSound');
 
+                            // $mInvoiceType = 'Serial';
+                            // $mailData = $this->getMail();
+                            // $mPlantName = $mailData['plant_name'];
+                            // $emails = $mailData['emails'];
+
+                            // if (! empty($emails)) {
+                            //     // Mail::to($emails)->send(new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType));
+                            //     Mail::to($emails)->send(
+                            //         new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'CSerialInvoice')
+                            //     );
+                            // } else {
+                            //     \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
+                            // }
+
                             $filename = $invoiceNumber.'.xlsx';
                             $directory = 'uploads/temp';
                             $disk = Storage::disk('local');
@@ -3577,6 +3584,22 @@ class CreateInvoiceValidation extends CreateRecord
 
                             $this->dispatch('playWarnSound');
 
+                            // $mInvoiceType = 'Serial';
+                            // $mailData = $this->getMail();
+                            // $mPlantName = $mailData['plant_name'];
+                            // $emails = $mailData['emails'];
+
+                            // $mUserName = Filament::auth()->user()->name;
+
+                            // if (! empty($emails)) {
+                            //     // Mail::to($emails)->send(new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType));
+                            //     Mail::to($emails)->send(
+                            //         new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, $mUserName, 'DuplicateCapacitorQR')
+                            //     );
+                            // } else {
+                            //     \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
+                            // }
+
                             $this->form->fill([
                                 'plant_id' => $plantId,
                                 'invoice_number' => $invoiceNumber,

app/Filament/Resources/ProcessOrderResource.php

@@ -30,8 +30,6 @@ use Filament\Forms\Components\Select;
 use App\Models\Line;
 use Filament\Forms\Components\TextInput;
 use App\Models\Item;
-// use App\Models\PalletValidation;
-// use Dom\Text;
 
 class ProcessOrderResource extends Resource
 {
@@ -83,7 +81,7 @@ class ProcessOrderResource extends Resource
                             return [];
                         }
 
-                        return Item::where('plant_id', $plantId)->pluck('code', 'id');
+                        return \App\Models\Item::where('plant_id', $plantId)->pluck('code', 'id');
                     })
                     ->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
                         $plantId = $get('plant_id');
@@ -92,23 +90,20 @@ class ProcessOrderResource extends Resource
 
                         if ($plantId && $itemId) {
                             // Get the item code using item_id
-                            $itemCode = Item::where('id', $itemId)->value('code');
+                            $itemCode = \App\Models\Item::where('id', $itemId)->value('code');
 
                             if ($itemCode) {
                                 // Now get the item description using plant_id + code
-                                $item = Item::where('plant_id', $plantId)
+                                $item = \App\Models\Item::where('plant_id', $plantId)
                                     ->where('code', $itemCode)
                                     ->first();
 
                                 $set('item_description', $item?->description);
-                                $set('item_uom', $item?->uom);
                             } else {
                                 $set('item_description', null);
-                                $set('item_uom', null);
                             }
                         } else {
                             $set('item_description', null);
-                            $set('item_uom', null);
                         }
                     })
                     ->required(),
@@ -120,7 +115,7 @@ class ProcessOrderResource extends Resource
                     ->afterStateHydrated(function ($component, $state, Get $get, Set $set) {
                         $itemId = $get('item_id');
                         if ($get('id')) {
-                            $item = Item::where('id', $itemId)->first()?->description;
+                            $item = \App\Models\Item::where('id', $itemId)->first()?->description;
                             if ($item) {
                                 $set('item_description', $item);
                             } else {
@@ -129,22 +124,6 @@ class ProcessOrderResource extends Resource
                         }
                     }),
 
-                Forms\Components\TextInput::make('item_uom')
-                    ->label('UOM')
-                    ->required()
-                    ->reactive()
-                    ->afterStateHydrated(function ($component, $state, Get $get, Set $set) {
-                        $itemId = $get('item_id');
-                        if ($get('id')) {
-                            $item = Item::where('id', $itemId)->first()?->uom;
-                            if ($item) {
-                                $set('item_uom', $item);
-                            } else {
-                                $set('item_uom', null);
-                            }
-                        }
-                    }),
-
                 Forms\Components\TextInput::make('id')
                     ->hidden()
                     ->readOnly(),
@@ -471,6 +450,7 @@ class ProcessOrderResource extends Resource
                         $paginator = $livewire->getTableRecords();
                         $perPage = method_exists($paginator, 'perPage') ? $paginator->perPage() : 10;
                         $currentPage = method_exists($paginator, 'currentPage') ? $paginator->currentPage() : 1;
+
                         return ($currentPage - 1) * $perPage + $rowLoop->iteration;
                     }),
                 Tables\Columns\TextColumn::make('plant.name')
@@ -488,11 +468,6 @@ class ProcessOrderResource extends Resource
                     ->alignCenter()
                     ->searchable()
                     ->sortable(),
-                Tables\Columns\TextColumn::make('item.uom')
-                    ->label('Uom')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable(),
                 Tables\Columns\TextColumn::make('process_order')
                     ->label('Process Order')
                     ->alignCenter()
@@ -554,6 +529,7 @@ class ProcessOrderResource extends Resource
             //     Tables\Filters\TrashedFilter::make(),
             // ])
              ->filters([
+
             Tables\Filters\TrashedFilter::make(),
             Filter::make('advanced_filters')
                 ->label('Advanced Filters')
@@ -572,17 +548,10 @@ class ProcessOrderResource extends Resource
                     Select::make('Item')
                         ->label('Item Code')
                         ->nullable()
-                        ->searchable()
                         ->options(function (callable $get) {
                                 $plantId = $get('Plant');
 
-                                if(empty($plantId)) {
-                                    return [];
-                                }
-
-                                return Item::where('plant_id', $plantId)->pluck('code', 'id');
-
-                                //return $plantId ? Item::where('plant_id', $plantId)->pluck('code', 'id') : [];
+                                return $plantId ? Item::where('plant_id', $plantId)->pluck('code', 'id') : [];
                             })
                         ->reactive()
                         ->afterStateUpdated(function ($state, callable $set, callable $get) {
@@ -642,6 +611,8 @@ class ProcessOrderResource extends Resource
                     if (!empty($data['created_to'])) {
                         $query->where('created_at', '<=', $data['created_to']);
                     }
+
+
                     //$query->orderBy('created_at', 'asc');
                 })
                 ->indicateUsing(function (array $data) {
@@ -691,130 +662,6 @@ class ProcessOrderResource extends Resource
                 ]),
             ])
             ->headerActions([
-                Tables\Actions\Action::make('reprint_process')
-                    ->label('Re-Print Process Order')
-                    ->form([
-                        Forms\Components\Section::make()
-                            ->schema([
-                                Forms\Components\Select::make('plant')
-                                    ->label('Select Plant')
-                                    // ->options(Plant::pluck('name', 'id')->toArray())
-                                    ->options(function (callable $get) {
-                                        $userHas = Filament::auth()->user()->plant_id;
-
-                                        return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::pluck('name', 'id')->toArray();
-                                    })
-                                    ->required()
-                                    ->reactive()
-                                    ->afterStateUpdated(function ($state, callable $set, callable $get) {
-                                        $set('Item', null);
-                                        $set('process_order', null);
-                                        $set('coil_number', null);
-                                        $set('received_quantity', null);
-                                        $set('machine_name', null);
-                                    }),
-                                Select::make('Item')
-                                    ->label('Item Code')
-                                    ->nullable()
-                                    ->required()
-                                    ->searchable()
-                                    ->options(function (callable $get) {
-                                            $plantId = $get('plant');
-
-                                            if(empty($plantId)) {
-                                                return [];
-                                            }
-
-                                            return Item::where('plant_id', $plantId)->pluck('code', 'id');
-
-                                            //return $plantId ? Item::where('plant_id', $plantId)->pluck('code', 'id') : [];
-                                        })
-                                    ->reactive()
-                                    ->afterStateUpdated(function ($state, callable $set, callable $get) {
-                                        $set('process_order', null);
-                                        $set('coil_number', null);
-                                        $set('received_quantity', null);
-                                        $set('machine_name', null);
-                                    }),
-                                TextInput::make('process_order')
-                                    ->label('Process Order')
-                                    ->required()
-                                    ->placeholder('Enter Process Order')
-                                    ->reactive()
-                                    ->afterStateUpdated(function ($state, callable $set, callable $get) {
-                                        $set('coil_number', null);
-                                        $set('received_quantity', null);
-                                        $set('machine_name', null);
-                                    }),
-                                Select::make('coil_number')
-                                    ->label('Coil Number')
-                                    ->nullable()
-                                    ->required()
-                                    ->searchable()
-                                    ->options(function (callable $get) {
-                                            $plantId = $get('plant');
-                                            $itemId = $get('Item');
-                                            $processOrder = $get('process_order');
-
-                                            if(empty($plantId) || empty($itemId) || empty($processOrder)) {
-                                                return [];
-                                            }
-
-                                            return ProcessOrder::where('plant_id', $plantId)
-                                                ->where('item_id', $itemId)
-                                                ->where('process_order', $processOrder)
-                                                ->pluck('coil_number', 'coil_number');
-
-                                            //return $plantId ? Item::where('plant_id', $plantId)->pluck('code', 'id') : [];
-                                        })
-                                    ->reactive()
-                                    ->afterStateUpdated(function ($state, callable $set, callable $get) {
-                                        $plantId = $get('plant');
-                                        $itemId = $get('Item');
-                                        $processOrder = $get('process_order');
-
-                                        if(!$plantId || !$itemId || !$processOrder || !$state) {
-                                            $set('received_quantity', null);
-                                            $set('machine_name', null);
-                                            return;
-                                        }
-
-                                        $processOrderData = ProcessOrder::where('plant_id', $plantId)
-                                            ->where('item_id', $itemId)
-                                            ->where('process_order', $processOrder)
-                                            ->where('coil_number', $state)
-                                            ->first();
-
-                                        $set('received_quantity', $processOrderData?->received_quantity);
-                                        $set('machine_name', $processOrderData?->machine_name);
-                                    }),
-                                TextInput::make('received_quantity')
-                                    ->label('Received Quantity')
-                                    ->readOnly(),
-
-                                TextInput::make('machine_name')
-                                    ->label('Machine ID')
-                                    ->readOnly(),
-                            ])
-                            ->columns(['default' => 1, 'sm' => 3]),
-                    ])
-                    // ->action(function (array $data) {
-                    //     $selectedPalletNumber = $data['pallet_list'];
-                    //     return redirect()->route('download-reprint-qr-pdf', ['palletNo' => $selectedPalletNumber]);
-                    // })
-                    ->action(function (array $data) {
-                        $username = Filament::auth()->user()->name;
-                        return redirect()->route('download-reprint-process-pdf', [
-                            'plant'         => $data['plant'],
-                            'item'          => $data['Item'],
-                            'process_order' => $data['process_order'],
-                            'coil_number'   => $data['coil_number'],
-                            'name'          => $username,
-                        ]);
-                    })
-                    ->visible(function () {
-                        return Filament::auth()->user()->can('view reprint process order');
-                    }),
                 ImportAction::make()
                     ->label('Import Process Order')
                     ->color('warning')

app/Http/Controllers/CharacteristicsController.php

@@ -606,8 +606,7 @@ class CharacteristicsController extends Controller
                         'part_validation_2' => $char['part_validation_2'] ?? null,
                         'samlight_logged_name' => $char['samlight_logged_name'] ?? null,
                         // 'pending_released_status' => $char['pending_released_status'] ?? null,
-                        'motor_expected_time' => $char['motor_expected_time'] ?? null,
-                        'pump_expected_time' => $char['pump_expected_time'] ?? null,
+                        'expected_time' => $char['expected_time'] ?? null,
                         'updated_by' => $userName ?? null,
                     ];
                 } elseif ($char['motor_pump_pumpset_status'] == '2') {
@@ -624,7 +623,7 @@ class CharacteristicsController extends Controller
                             'part_validation_2' => $char['part_validation_2'] ?? null,
                             'samlight_logged_name' => $char['samlight_logged_name'] ?? null,
                             // 'pending_released_status' => $char['pending_released_status'] ?? null,
-                            'pump_expected_time' => $char['pump_expected_time'] ?? null,
+                            'expected_time' => $char['expected_time'] ?? null,
                             'updated_by' => $userName ?? null,
                         ];
                     } else {
@@ -640,7 +639,7 @@ class CharacteristicsController extends Controller
                             'part_validation_2' => $char['part_validation_2'] ?? null,
                             'samlight_logged_name' => $char['samlight_logged_name'] ?? null,
                             // 'pending_released_status' => $char['pending_released_status'] ?? null,
-                            'pump_expected_time' => $char['pump_expected_time'] ?? null,
+                            'expected_time' => $char['expected_time'] ?? null,
                             'updated_by' => $userName ?? null,
                         ];
                     }
@@ -658,7 +657,7 @@ class CharacteristicsController extends Controller
                             'part_validation_2' => $char['part_validation_2'] ?? null,
                             'samlight_logged_name' => $char['samlight_logged_name'] ?? null,
                             // 'pending_released_status' => $char['pending_released_status'] ?? null,
-                            'motor_expected_time' => $char['motor_expected_time'] ?? null,
+                            'expected_time' => $char['expected_time'] ?? null,
                             'updated_by' => $userName ?? null,
                         ];
                     } else {
@@ -674,7 +673,7 @@ class CharacteristicsController extends Controller
                             'part_validation_2' => $char['part_validation_2'] ?? null,
                             'samlight_logged_name' => $char['samlight_logged_name'] ?? null,
                             // 'pending_released_status' => $char['pending_released_status'] ?? null,
-                            'motor_expected_time' => $char['motor_expected_time'] ?? null,
+                            'expected_time' => $char['expected_time'] ?? null,
                             'updated_by' => $userName ?? null,
                         ];
                     }
@@ -695,8 +694,7 @@ class CharacteristicsController extends Controller
                         'part_validation_2' => $char['part_validation_2'] ?? null,
                         'samlight_logged_name' => $char['samlight_logged_name'] ?? null,
                         // 'pending_released_status' => $char['pending_released_status'] ?? null,
-                        'motor_expected_time' => $char['motor_expected_time'] ?? null,
-                        'pump_expected_time' => $char['pump_expected_time'] ?? null,
+                        'expected_time' => $char['expected_time'] ?? null,
                         'updated_by' => $userName ?? null,
                     ];
                 }
@@ -711,15 +709,8 @@ class CharacteristicsController extends Controller
 
                 $updatedRows += $affected;
             } else {
-                $curStat = ClassCharacteristic::where('plant_id', $plantId)
-                    ->where('machine_id', $machineId)
-                    ->where('gernr', $serialNumber)
-                    ->where('item_id', $itemId)
-                    ->first();
-
-                $manStat = ($curStat->man_marked_status == null || $curStat->man_marked_status == '' || $curStat->man_marked_status == '0') ? 0 : (int) $curStat->man_marked_status;
                 $values = [
-                    'man_marked_status' => (string) ($manStat + 1),
+                    'man_marked_status' => $char['man_marked_status'] ?? null,
                     'man_marked_datetime' => $char['man_marked_datetime'] ?? null,
                     'man_marked_by' => ($char['man_marked_by'] == 'jothi') ? 'Admin' : $char['man_marked_by'] ?? null,
                     'samlight_logged_name' => $char['samlight_logged_name'] ?? null,
@@ -858,7 +849,9 @@ class CharacteristicsController extends Controller
 
         $machineId = $machine->id;
 
-        $availFields = ['class', 'arbid', 'gamng', 'lmnga', 'zz1_cn_bill_ord', 'zmm_amps', 'zmm_brand', 'zmm_degreeofprotection', 'zmm_delivery', 'zmm_dir_rot', 'zmm_discharge', 'zmm_discharge_max', 'zmm_discharge_min', 'zmm_duty', 'zmm_eff_motor', 'zmm_eff_pump', 'zmm_frequency', 'zmm_head', 'zmm_heading', 'zmm_head_max', 'zmm_head_minimum', 'zmm_idx_eff_mtr', 'zmm_idx_eff_pump', 'zmm_kvacode', 'zmm_maxambtemp', 'zmm_mincoolingflow', 'zmm_motorseries', 'zmm_motor_model', 'zmm_outlet', 'zmm_phase', 'zmm_pressure', 'zmm_pumpflowtype', 'zmm_pumpseries', 'zmm_pump_model', 'zmm_ratedpower', 'zmm_region', 'zmm_servicefactor', 'zmm_servicefactormaximumamps', 'zmm_speed', 'zmm_suction', 'zmm_suctionxdelivery', 'zmm_supplysource', 'zmm_temperature', 'zmm_thrustload', 'zmm_volts', 'zmm_wire', 'zmm_package', 'zmm_pvarrayrating', 'zmm_isi', 'zmm_isimotor', 'zmm_isipump', 'zmm_isipumpset', 'zmm_pumpset_model', 'zmm_stages', 'zmm_headrange', 'zmm_overall_efficiency', 'zmm_connection', 'zmm_min_bore_size', 'zmm_isireference', 'zmm_category', 'zmm_submergence', 'zmm_capacitorstart', 'zmm_capacitorrun', 'zmm_inch', 'zmm_motor_type', 'zmm_dismantle_direction', 'zmm_eff_ovrall', 'zmm_bodymoc', 'zmm_rotormoc', 'zmm_dlwl', 'zmm_inputpower', 'zmm_imp_od', 'zmm_ambtemp', 'zmm_de', 'zmm_dischargerange', 'zmm_efficiency_class', 'zmm_framesize', 'zmm_impellerdiameter', 'zmm_insulationclass', 'zmm_maxflow', 'zmm_minhead', 'zmm_mtrlofconst', 'zmm_nde', 'zmm_powerfactor', 'zmm_tagno', 'zmm_year', 'zmm_laser_name', 'zmm_logo_cp', 'zmm_logo_ce', 'zmm_logo_nsf', 'zmm_beenote', 'zmm_beenumber', 'zmm_beestar', 'zmm_codeclass', 'zmm_colour', 'zmm_grade', 'zmm_grwt_pset', 'zmm_grwt_cable', 'zmm_grwt_motor', 'zmm_grwt_pf', 'zmm_grwt_pump', 'zmm_isivalve', 'zmm_isi_wc', 'zmm_labelperiod', 'zmm_length', 'zmm_license_cml_no', 'zmm_mfgmonyr', 'zmm_modelyear', 'zmm_motoridentification', 'zmm_newt_pset', 'zmm_newt_cable', 'zmm_newt_motor', 'zmm_newt_pf', 'zmm_newt_pump', 'zmm_packtype', 'zmm_panel', 'zmm_performance_factor', 'zmm_pumpidentification', 'zmm_psettype', 'zmm_size', 'zmm_eff_ttl', 'zmm_type', 'zmm_usp', 'mark_status', 'marked_datetime', 'marked_by', 'man_marked_status', 'man_marked_datetime', 'man_marked_by', 'motor_marked_status', 'motor_marked_by', 'pump_marked_status', 'pump_marked_by', 'motor_pump_pumpset_status', 'motor_machine_name', 'pump_machine_name', 'pumpset_machine_name', 'part_validation_1', 'part_validation_2', 'samlight_logged_name', 'pending_released_status', 'motor_expected_time', 'pump_expected_time'];
+        $availFields = [
+            'class', 'arbid', 'gamng', 'lmnga', 'zz1_cn_bill_ord', 'zmm_amps', 'zmm_brand', 'zmm_degreeofprotection', 'zmm_delivery', 'zmm_dir_rot', 'zmm_discharge', 'zmm_discharge_max', 'zmm_discharge_min', 'zmm_duty', 'zmm_eff_motor', 'zmm_eff_pump', 'zmm_frequency', 'zmm_head', 'zmm_heading', 'zmm_head_max', 'zmm_head_minimum', 'zmm_idx_eff_mtr', 'zmm_idx_eff_pump', 'zmm_kvacode', 'zmm_maxambtemp', 'zmm_mincoolingflow', 'zmm_motorseries', 'zmm_motor_model', 'zmm_outlet', 'zmm_phase', 'zmm_pressure', 'zmm_pumpflowtype', 'zmm_pumpseries', 'zmm_pump_model', 'zmm_ratedpower', 'zmm_region', 'zmm_servicefactor', 'zmm_servicefactormaximumamps', 'zmm_speed', 'zmm_suction', 'zmm_suctionxdelivery', 'zmm_supplysource', 'zmm_temperature', 'zmm_thrustload', 'zmm_volts', 'zmm_wire', 'zmm_package', 'zmm_pvarrayrating', 'zmm_isi', 'zmm_isimotor', 'zmm_isipump', 'zmm_isipumpset', 'zmm_pumpset_model', 'zmm_stages', 'zmm_headrange', 'zmm_overall_efficiency', 'zmm_connection', 'zmm_min_bore_size', 'zmm_isireference', 'zmm_category', 'zmm_submergence', 'zmm_capacitorstart', 'zmm_capacitorrun', 'zmm_inch', 'zmm_motor_type', 'zmm_dismantle_direction', 'zmm_eff_ovrall', 'zmm_bodymoc', 'zmm_rotormoc', 'zmm_dlwl', 'zmm_inputpower', 'zmm_imp_od', 'zmm_ambtemp', 'zmm_de', 'zmm_dischargerange', 'zmm_efficiency_class', 'zmm_framesize', 'zmm_impellerdiameter', 'zmm_insulationclass', 'zmm_maxflow', 'zmm_minhead', 'zmm_mtrlofconst', 'zmm_nde', 'zmm_powerfactor', 'zmm_tagno', 'zmm_year', 'zmm_laser_name', 'zmm_beenote', 'zmm_beenumber', 'zmm_beestar', 'zmm_logo_ce', 'zmm_codeclass', 'zmm_colour', 'zmm_logo_cp', 'zmm_grade', 'zmm_grwt_pset', 'zmm_grwt_cable', 'zmm_grwt_motor', 'zmm_grwt_pf', 'zmm_grwt_pump', 'zmm_isivalve', 'zmm_isi_wc', 'zmm_labelperiod', 'zmm_length', 'zmm_license_cml_no', 'zmm_mfgmonyr', 'zmm_modelyear', 'zmm_motoridentification', 'zmm_newt_pset', 'zmm_newt_cable', 'zmm_newt_motor', 'zmm_newt_pf', 'zmm_newt_pump', 'zmm_logo_nsf', 'zmm_packtype', 'zmm_panel', 'zmm_performance_factor', 'zmm_pumpidentification', 'zmm_psettype', 'zmm_size', 'zmm_eff_ttl', 'zmm_type', 'zmm_usp', 'mark_status', 'marked_datetime', 'marked_by', 'man_marked_status', 'man_marked_datetime', 'man_marked_by', 'motor_marked_status', 'pump_marked_status', 'motor_pump_pumpset_status', 'part_validation_1', 'part_validation_2', 'samlight_logged_name', 'pending_released_status', 'expected_time',
+        ];
 
         if ($itemCode != '' && $itemCode != null && $itemCode && Str::length($itemCode) > 0) {
             $existingJob = ClassCharacteristic::where('plant_id', $plantId)
@@ -944,7 +937,7 @@ class CharacteristicsController extends Controller
                 ], 404);
             }
 
-            $col = ['marked_by', 'man_marked_by', 'motor_marked_by', 'pump_marked_by'];
+            $col = ['marked_by', 'man_marked_by'];
             $missingUsers = [];
             $missingUsersPlant = [];
             $missingUsersRight = [];
@@ -1049,8 +1042,6 @@ class CharacteristicsController extends Controller
 
                         $insertData['marked_by'] = ($char['marked_by'] == 'jothi') ? 'Admin' : $char['marked_by'] ?? null;
                         $insertData['man_marked_by'] = ($char['man_marked_by'] == 'jothi') ? 'Admin' : $char['man_marked_by'] ?? null;
-                        $insertData['motor_marked_by'] = ($char['motor_marked_by'] == 'jothi') ? 'Admin' : $char['motor_marked_by'] ?? null;
-                        $insertData['pump_marked_by'] = ($char['pump_marked_by'] == 'jothi') ? 'Admin' : $char['pump_marked_by'] ?? null;
 
                         $existing = ClassCharacteristic::where('plant_id', $plantId)
                             ->where('item_id', $itemId)
@@ -1130,7 +1121,7 @@ class CharacteristicsController extends Controller
             } else {
                 $hasNewSno = true;
 
-                $col = ['marked_by', 'man_marked_by', 'motor_marked_by', 'pump_marked_by'];
+                $col = ['marked_by', 'man_marked_by'];
                 $missingUsers = [];
                 $missingUsersPlant = [];
                 $missingUsersRight = [];
@@ -1222,7 +1213,9 @@ class CharacteristicsController extends Controller
                 ], 404);
             }
 
-            $masterFields = ['class', 'arbid', 'gamng', 'lmnga', 'zz1_cn_bill_ord', 'zmm_amps', 'zmm_brand', 'zmm_degreeofprotection', 'zmm_delivery', 'zmm_dir_rot', 'zmm_discharge', 'zmm_discharge_max', 'zmm_discharge_min', 'zmm_duty', 'zmm_eff_motor', 'zmm_eff_pump', 'zmm_frequency', 'zmm_head', 'zmm_heading', 'zmm_head_max', 'zmm_head_minimum', 'zmm_idx_eff_mtr', 'zmm_idx_eff_pump', 'zmm_kvacode', 'zmm_maxambtemp', 'zmm_mincoolingflow', 'zmm_motorseries', 'zmm_motor_model', 'zmm_outlet', 'zmm_phase', 'zmm_pressure', 'zmm_pumpflowtype', 'zmm_pumpseries', 'zmm_pump_model', 'zmm_ratedpower', 'zmm_region', 'zmm_servicefactor', 'zmm_servicefactormaximumamps', 'zmm_speed', 'zmm_suction', 'zmm_suctionxdelivery', 'zmm_supplysource', 'zmm_temperature', 'zmm_thrustload', 'zmm_volts', 'zmm_wire', 'zmm_package', 'zmm_pvarrayrating', 'zmm_isi', 'zmm_isimotor', 'zmm_isipump', 'zmm_isipumpset', 'zmm_pumpset_model', 'zmm_stages', 'zmm_headrange', 'zmm_overall_efficiency', 'zmm_connection', 'zmm_min_bore_size', 'zmm_isireference', 'zmm_category', 'zmm_submergence', 'zmm_capacitorstart', 'zmm_capacitorrun', 'zmm_inch', 'zmm_motor_type', 'zmm_dismantle_direction', 'zmm_eff_ovrall', 'zmm_bodymoc', 'zmm_rotormoc', 'zmm_dlwl', 'zmm_inputpower', 'zmm_imp_od', 'zmm_ambtemp', 'zmm_de', 'zmm_dischargerange', 'zmm_efficiency_class', 'zmm_framesize', 'zmm_impellerdiameter', 'zmm_insulationclass', 'zmm_maxflow', 'zmm_minhead', 'zmm_mtrlofconst', 'zmm_nde', 'zmm_powerfactor', 'zmm_tagno', 'zmm_year', 'zmm_laser_name', 'zmm_logo_cp', 'zmm_logo_ce', 'zmm_logo_nsf'];
+            $masterFields = [
+                'class', 'arbid', 'gamng', 'lmnga', 'zz1_cn_bill_ord', 'zmm_amps', 'zmm_brand', 'zmm_degreeofprotection', 'zmm_delivery', 'zmm_dir_rot', 'zmm_discharge', 'zmm_discharge_max', 'zmm_discharge_min', 'zmm_duty', 'zmm_eff_motor', 'zmm_eff_pump', 'zmm_frequency', 'zmm_head', 'zmm_heading', 'zmm_head_max', 'zmm_head_minimum', 'zmm_idx_eff_mtr', 'zmm_idx_eff_pump', 'zmm_kvacode', 'zmm_maxambtemp', 'zmm_mincoolingflow', 'zmm_motorseries', 'zmm_motor_model', 'zmm_outlet', 'zmm_phase', 'zmm_pressure', 'zmm_pumpflowtype', 'zmm_pumpseries', 'zmm_pump_model', 'zmm_ratedpower', 'zmm_region', 'zmm_servicefactor', 'zmm_servicefactormaximumamps', 'zmm_speed', 'zmm_suction', 'zmm_suctionxdelivery', 'zmm_supplysource', 'zmm_temperature', 'zmm_thrustload', 'zmm_volts', 'zmm_wire', 'zmm_package', 'zmm_pvarrayrating', 'zmm_isi', 'zmm_isimotor', 'zmm_isipump', 'zmm_isipumpset', 'zmm_pumpset_model', 'zmm_stages', 'zmm_headrange', 'zmm_overall_efficiency', 'zmm_connection', 'zmm_min_bore_size', 'zmm_isireference', 'zmm_category', 'zmm_submergence', 'zmm_capacitorstart', 'zmm_capacitorrun', 'zmm_inch', 'zmm_motor_type', 'zmm_dismantle_direction', 'zmm_eff_ovrall', 'zmm_bodymoc', 'zmm_rotormoc', 'zmm_dlwl', 'zmm_inputpower', 'zmm_imp_od', 'zmm_ambtemp', 'zmm_de', 'zmm_dischargerange', 'zmm_efficiency_class', 'zmm_framesize', 'zmm_impellerdiameter', 'zmm_insulationclass', 'zmm_maxflow', 'zmm_minhead', 'zmm_mtrlofconst', 'zmm_nde', 'zmm_powerfactor', 'zmm_tagno', 'zmm_year', 'zmm_laser_name',
+            ];
 
             $isInsertOrUpdate = false;
 
@@ -1285,8 +1278,6 @@ class CharacteristicsController extends Controller
 
                             $insertData['marked_by'] = ($char['marked_by'] == 'jothi') ? 'Admin' : $char['marked_by'] ?? null;
                             $insertData['man_marked_by'] = ($char['man_marked_by'] == 'jothi') ? 'Admin' : $char['man_marked_by'] ?? null;
-                            $insertData['motor_marked_by'] = ($char['motor_marked_by'] == 'jothi') ? 'Admin' : $char['motor_marked_by'] ?? null;
-                            $insertData['pump_marked_by'] = ($char['pump_marked_by'] == 'jothi') ? 'Admin' : $char['pump_marked_by'] ?? null;
 
                             $existing = ClassCharacteristic::where('plant_id', $plantId)
                                 ->where('item_id', $itemId)
@@ -1479,9 +1470,9 @@ class CharacteristicsController extends Controller
                 ], 400);
             }
 
-            $columnsToShow = ['mark_status', 'marked_datetime', 'marked_by', 'man_marked_status', 'man_marked_datetime', 'man_marked_by', 'motor_marked_status', 'motor_marked_by', 'pump_marked_status', 'pump_marked_by', 'motor_pump_pumpset_status', 'motor_machine_name', 'pump_machine_name', 'pumpset_machine_name', 'part_validation_1', 'part_validation_2', 'samlight_logged_name', 'pending_released_status', 'motor_expected_time', 'pump_expected_time'];
+            $columnsToShow = ['mark_status', 'marked_datetime', 'marked_by', 'man_marked_status', 'man_marked_datetime', 'man_marked_by', 'motor_marked_status', 'motor_marked_by', 'pump_marked_status', 'pump_marked_by', 'motor_pump_pumpset_status', 'motor_machine_name', 'pump_machine_name', 'pumpset_machine_name', 'part_validation_1', 'part_validation_2', 'samlight_logged_name', 'pending_released_status', 'expected_time'];
 
-            $characteristicsColumns = ['class', 'arbid', 'gamng', 'lmnga', 'zz1_cn_bill_ord', 'zmm_amps', 'zmm_brand', 'zmm_degreeofprotection', 'zmm_delivery', 'zmm_dir_rot', 'zmm_discharge', 'zmm_discharge_max', 'zmm_discharge_min', 'zmm_duty', 'zmm_eff_motor', 'zmm_eff_pump', 'zmm_frequency', 'zmm_head', 'zmm_heading', 'zmm_head_max', 'zmm_head_minimum', 'zmm_idx_eff_mtr', 'zmm_idx_eff_pump', 'zmm_kvacode', 'zmm_maxambtemp', 'zmm_mincoolingflow', 'zmm_motorseries', 'zmm_motor_model', 'zmm_outlet', 'zmm_phase', 'zmm_pressure', 'zmm_pumpflowtype', 'zmm_pumpseries', 'zmm_pump_model', 'zmm_ratedpower', 'zmm_region', 'zmm_servicefactor', 'zmm_servicefactormaximumamps', 'zmm_speed', 'zmm_suction', 'zmm_suctionxdelivery', 'zmm_supplysource', 'zmm_temperature', 'zmm_thrustload', 'zmm_volts', 'zmm_wire', 'zmm_package', 'zmm_pvarrayrating', 'zmm_isi', 'zmm_isimotor', 'zmm_isipump', 'zmm_isipumpset', 'zmm_pumpset_model', 'zmm_stages', 'zmm_headrange', 'zmm_overall_efficiency', 'zmm_connection', 'zmm_min_bore_size', 'zmm_isireference', 'zmm_category', 'zmm_submergence', 'zmm_capacitorstart', 'zmm_capacitorrun', 'zmm_inch', 'zmm_motor_type', 'zmm_dismantle_direction', 'zmm_eff_ovrall', 'zmm_bodymoc', 'zmm_rotormoc', 'zmm_dlwl', 'zmm_inputpower', 'zmm_imp_od', 'zmm_ambtemp', 'zmm_de', 'zmm_dischargerange', 'zmm_efficiency_class', 'zmm_framesize', 'zmm_impellerdiameter', 'zmm_insulationclass', 'zmm_maxflow', 'zmm_minhead', 'zmm_mtrlofconst', 'zmm_nde', 'zmm_powerfactor', 'zmm_tagno', 'zmm_year', 'zmm_laser_name', 'zmm_logo_cp', 'zmm_logo_ce', 'zmm_logo_nsf'];
+            $characteristicsColumns = ['class', 'arbid', 'gamng', 'lmnga', 'zz1_cn_bill_ord', 'zmm_amps', 'zmm_brand', 'zmm_degreeofprotection', 'zmm_delivery', 'zmm_dir_rot', 'zmm_discharge', 'zmm_discharge_max', 'zmm_discharge_min', 'zmm_duty', 'zmm_eff_motor', 'zmm_eff_pump', 'zmm_frequency', 'zmm_head', 'zmm_heading', 'zmm_head_max', 'zmm_head_minimum', 'zmm_idx_eff_mtr', 'zmm_idx_eff_pump', 'zmm_kvacode', 'zmm_maxambtemp', 'zmm_mincoolingflow', 'zmm_motorseries', 'zmm_motor_model', 'zmm_outlet', 'zmm_phase', 'zmm_pressure', 'zmm_pumpflowtype', 'zmm_pumpseries', 'zmm_pump_model', 'zmm_ratedpower', 'zmm_region', 'zmm_servicefactor', 'zmm_servicefactormaximumamps', 'zmm_speed', 'zmm_suction', 'zmm_suctionxdelivery', 'zmm_supplysource', 'zmm_temperature', 'zmm_thrustload', 'zmm_volts', 'zmm_wire', 'zmm_package', 'zmm_pvarrayrating', 'zmm_isi', 'zmm_isimotor', 'zmm_isipump', 'zmm_isipumpset', 'zmm_pumpset_model', 'zmm_stages', 'zmm_headrange', 'zmm_overall_efficiency', 'zmm_connection', 'zmm_min_bore_size', 'zmm_isireference', 'zmm_category', 'zmm_submergence', 'zmm_capacitorstart', 'zmm_capacitorrun', 'zmm_inch', 'zmm_motor_type', 'zmm_dismantle_direction', 'zmm_eff_ovrall', 'zmm_bodymoc', 'zmm_rotormoc', 'zmm_dlwl', 'zmm_inputpower', 'zmm_imp_od', 'zmm_ambtemp', 'zmm_de', 'zmm_dischargerange', 'zmm_efficiency_class', 'zmm_framesize', 'zmm_impellerdiameter', 'zmm_insulationclass', 'zmm_maxflow', 'zmm_minhead', 'zmm_mtrlofconst', 'zmm_nde', 'zmm_powerfactor', 'zmm_tagno', 'zmm_year', 'zmm_laser_name'];
 
             $characteristicsData = ClassCharacteristic::where('aufnr', $jobNumber)
                 ->where('plant_id', $plantId)
@@ -1648,7 +1639,7 @@ class CharacteristicsController extends Controller
                 ], 404);
             }
 
-            if ($serialExists->mark_status != 'Marked' && $serialExists->motor_marked_status != 'Marked' && $serialExists->pump_marked_status != 'Marked') {
+            if ($serialExists->mark_status != 'Marked' && $serialExists->mark_status != 'marked') {
                 // "Serial number '{$serialNumber}' is not marked yet.<br>Please proceed with marking first.";
                 return response()->json([
                     'status_code' => 'ERROR',
@@ -1868,9 +1859,9 @@ class CharacteristicsController extends Controller
                 ], 400);
             }
 
-            // $columnsToShow = ['mark_status','marked_datetime','marked_by','man_marked_status','man_marked_datetime','man_marked_by','motor_marked_status','pump_marked_status','motor_pump_pumpset_status','part_validation_1','part_validation_2','samlight_logged_name','pending_released_status','motor_expected_time','pump_expected_time'];
+            // $columnsToShow = ['mark_status','marked_datetime','marked_by','man_marked_status','man_marked_datetime','man_marked_by','motor_marked_status','pump_marked_status','motor_pump_pumpset_status','part_validation_1','part_validation_2','samlight_logged_name','pending_released_status','expected_time'];
 
-            $characteristicsColumns = ['class', 'arbid', 'gamng', 'lmnga', 'zz1_cn_bill_ord', 'zmm_amps', 'zmm_brand', 'zmm_degreeofprotection', 'zmm_delivery', 'zmm_dir_rot', 'zmm_discharge', 'zmm_discharge_max', 'zmm_discharge_min', 'zmm_duty', 'zmm_eff_motor', 'zmm_eff_pump', 'zmm_frequency', 'zmm_head', 'zmm_heading', 'zmm_head_max', 'zmm_head_minimum', 'zmm_idx_eff_mtr', 'zmm_idx_eff_pump', 'zmm_kvacode', 'zmm_maxambtemp', 'zmm_mincoolingflow', 'zmm_motorseries', 'zmm_motor_model', 'zmm_outlet', 'zmm_phase', 'zmm_pressure', 'zmm_pumpflowtype', 'zmm_pumpseries', 'zmm_pump_model', 'zmm_ratedpower', 'zmm_region', 'zmm_servicefactor', 'zmm_servicefactormaximumamps', 'zmm_speed', 'zmm_suction', 'zmm_suctionxdelivery', 'zmm_supplysource', 'zmm_temperature', 'zmm_thrustload', 'zmm_volts', 'zmm_wire', 'zmm_package', 'zmm_pvarrayrating', 'zmm_isi', 'zmm_isimotor', 'zmm_isipump', 'zmm_isipumpset', 'zmm_pumpset_model', 'zmm_stages', 'zmm_headrange', 'zmm_overall_efficiency', 'zmm_connection', 'zmm_min_bore_size', 'zmm_isireference', 'zmm_category', 'zmm_submergence', 'zmm_capacitorstart', 'zmm_capacitorrun', 'zmm_inch', 'zmm_motor_type', 'zmm_dismantle_direction', 'zmm_eff_ovrall', 'zmm_bodymoc', 'zmm_rotormoc', 'zmm_dlwl', 'zmm_inputpower', 'zmm_imp_od', 'zmm_ambtemp', 'zmm_de', 'zmm_dischargerange', 'zmm_efficiency_class', 'zmm_framesize', 'zmm_impellerdiameter', 'zmm_insulationclass', 'zmm_maxflow', 'zmm_minhead', 'zmm_mtrlofconst', 'zmm_nde', 'zmm_powerfactor', 'zmm_tagno', 'zmm_year', 'zmm_laser_name', 'zmm_logo_cp', 'zmm_logo_ce', 'zmm_logo_nsf'];
+            $characteristicsColumns = ['class', 'arbid', 'gamng', 'lmnga', 'zz1_cn_bill_ord', 'zmm_amps', 'zmm_brand', 'zmm_degreeofprotection', 'zmm_delivery', 'zmm_dir_rot', 'zmm_discharge', 'zmm_discharge_max', 'zmm_discharge_min', 'zmm_duty', 'zmm_eff_motor', 'zmm_eff_pump', 'zmm_frequency', 'zmm_head', 'zmm_heading', 'zmm_head_max', 'zmm_head_minimum', 'zmm_idx_eff_mtr', 'zmm_idx_eff_pump', 'zmm_kvacode', 'zmm_maxambtemp', 'zmm_mincoolingflow', 'zmm_motorseries', 'zmm_motor_model', 'zmm_outlet', 'zmm_phase', 'zmm_pressure', 'zmm_pumpflowtype', 'zmm_pumpseries', 'zmm_pump_model', 'zmm_ratedpower', 'zmm_region', 'zmm_servicefactor', 'zmm_servicefactormaximumamps', 'zmm_speed', 'zmm_suction', 'zmm_suctionxdelivery', 'zmm_supplysource', 'zmm_temperature', 'zmm_thrustload', 'zmm_volts', 'zmm_wire', 'zmm_package', 'zmm_pvarrayrating', 'zmm_isi', 'zmm_isimotor', 'zmm_isipump', 'zmm_isipumpset', 'zmm_pumpset_model', 'zmm_stages', 'zmm_headrange', 'zmm_overall_efficiency', 'zmm_connection', 'zmm_min_bore_size', 'zmm_isireference', 'zmm_category', 'zmm_submergence', 'zmm_capacitorstart', 'zmm_capacitorrun', 'zmm_inch', 'zmm_motor_type', 'zmm_dismantle_direction', 'zmm_eff_ovrall', 'zmm_bodymoc', 'zmm_rotormoc', 'zmm_dlwl', 'zmm_inputpower', 'zmm_imp_od', 'zmm_ambtemp', 'zmm_de', 'zmm_dischargerange', 'zmm_efficiency_class', 'zmm_framesize', 'zmm_impellerdiameter', 'zmm_insulationclass', 'zmm_maxflow', 'zmm_minhead', 'zmm_mtrlofconst', 'zmm_nde', 'zmm_powerfactor', 'zmm_tagno', 'zmm_year', 'zmm_logo_cp', 'zmm_logo_ce', 'zmm_logo_nsf', 'zmm_laser_name'];
 
             $characteristicsData = ClassCharacteristic::where('aufnr', $jobNumber)
                 ->where('plant_id', $plantId)
@@ -2099,7 +2090,7 @@ class CharacteristicsController extends Controller
             //     ], 404);
             // }
 
-            // $columnsToShow = ['mark_status','marked_datetime','marked_by','man_marked_status','man_marked_datetime','man_marked_by','motor_marked_status','pump_marked_status','motor_pump_pumpset_status','part_validation_1','part_validation_2','samlight_logged_name','pending_released_status','motor_expected_time','pump_expected_time'];
+            // $columnsToShow = ['mark_status','marked_datetime','marked_by','man_marked_status','man_marked_datetime','man_marked_by','motor_marked_status','pump_marked_status','motor_pump_pumpset_status','part_validation_1','part_validation_2','samlight_logged_name','pending_released_status','expected_time'];
 
             // $characteristicsColumns = ['class','arbid','gamng','lmnga','zz1_cn_bill_ord','zmm_amps','zmm_brand','zmm_degreeofprotection','zmm_delivery','zmm_dir_rot','zmm_discharge','zmm_discharge_max','zmm_discharge_min','zmm_duty','zmm_eff_motor','zmm_eff_pump','zmm_frequency','zmm_head','zmm_heading','zmm_head_max','zmm_head_minimum','zmm_idx_eff_mtr','zmm_idx_eff_pump','zmm_kvacode','zmm_maxambtemp','zmm_mincoolingflow','zmm_motorseries','zmm_motor_model','zmm_outlet','zmm_phase','zmm_pressure','zmm_pumpflowtype','zmm_pumpseries','zmm_pump_model','zmm_ratedpower','zmm_region','zmm_servicefactor','zmm_servicefactormaximumamps','zmm_speed','zmm_suction','zmm_suctionxdelivery','zmm_supplysource','zmm_temperature','zmm_thrustload','zmm_volts','zmm_wire','zmm_package','zmm_pvarrayrating','zmm_isi','zmm_isimotor','zmm_isipump','zmm_isipumpset','zmm_pumpset_model','zmm_stages','zmm_headrange','zmm_overall_efficiency','zmm_connection','zmm_min_bore_size','zmm_isireference','zmm_category','zmm_submergence','zmm_capacitorstart','zmm_capacitorrun','zmm_inch','zmm_motor_type','zmm_dismantle_direction','zmm_eff_ovrall','zmm_bodymoc','zmm_rotormoc','zmm_dlwl','zmm_inputpower','zmm_imp_od','zmm_ambtemp','zmm_de','zmm_dischargerange','zmm_efficiency_class','zmm_framesize','zmm_impellerdiameter','zmm_insulationclass','zmm_maxflow','zmm_minhead','zmm_mtrlofconst','zmm_nde','zmm_powerfactor','zmm_tagno','zmm_year','zmm_laser_name'];
 
@@ -2133,8 +2124,6 @@ class CharacteristicsController extends Controller
                 'MOTOR_MACHINE_NAME' => $serialExists->motor_machine_name ?? '',
                 'PUMP_MACHINE_NAME' => $serialExists->pump_machine_name ?? '',
                 'PUMPSET_MACHINE_NAME' => $serialExists->pumpset_machine_name ?? '',
-                'MOTOR_EXPECTED_TIME' => $serialExists->motor_expected_time ?? '',
-                'PUMP_EXPECTED_TIME' => $serialExists->pump_expected_time ?? '',
             ], 200);
         }
     }
@@ -2418,7 +2407,6 @@ class CharacteristicsController extends Controller
         $processOrder = $data['process_order'] ?? '';
         $coilNo = $data['coil_number'] ?? '';
         $status = $data['status'] ?? '';
-        $obsValue = $data['observed_value'] ?? '';
         $createdBy = $data['created_by'] ?? '';
 
         if ($processOrder == null || $processOrder == '' || ! $processOrder) {
@@ -2457,13 +2445,6 @@ class CharacteristicsController extends Controller
             ], 404);
         }
 
-        if ($obsValue == null || $obsValue == '' || ! $obsValue) {
-            return response()->json([
-                'status_code' => 'ERROR',
-                'status_description' => "Observed value can't be empty!",
-            ], 404);
-        }
-
         if ($createdBy == null || $createdBy == '' || ! $createdBy) {
             return response()->json([
                 'status_code' => 'ERROR',
@@ -2503,7 +2484,6 @@ class CharacteristicsController extends Controller
             'process_order' => $processOrder,
             'coil_number' => $coilNo,
             'status' => $status,
-            'observed_value' => $obsValue,
             'created_by' => $createdBy,
         ]);
 

app/Http/Controllers/ProductionStickerReprintController.php

@@ -20,23 +20,12 @@ class ProductionStickerReprintController extends Controller
         //
     }
 
-    // public function downloadQrPdf($palletNo)
-    // {
-    public function downloadQrPdf(Request $request)
+    public function downloadQrPdf($palletNo)
     {
-        // $palletNo = urldecode($palletNo);
-        $palletNo = urldecode($request->query('palletNo'));
-
-        if (!$palletNo) {
-            abort(400, 'palletNo is required');
-        }
-
         $parts = explode('|', $palletNo);
         $itemCode = trim($parts[0]);
         $serialNumberRaw = isset($parts[1]) ? trim($parts[1]) : null;
 
-        // dd($serialNumberRaw);
-
         if ($serialNumberRaw != null) {
             $serial = preg_replace('/\/.*/', '', $serialNumberRaw);
             $serial = trim($serial);
@@ -61,7 +50,6 @@ class ProductionStickerReprintController extends Controller
 
         $productionOrder = $production->production_order ?? '';
 
-        if(!preg_match('/\//', $palletNo)){
         if ($item->category == 'Submersible Motor')
         {
             $copies = 1;
@@ -70,33 +58,6 @@ class ProductionStickerReprintController extends Controller
         {
             $copies = 2;
         }
-        }
-        else
-        {
-            // if ($item->category == 'Submersible Motor')
-            // {
-            //     $copies = 1;
-            // }
-            // elseif ($item->category == 'Submersible Pump')
-            // {
-            //     $copies = 1;
-            // }
-            $copies = 1;
-
-            if ($serialNumberRaw) {
-                // Check if serial ends with /m or /M, optionally followed by |
-                if (preg_match('/\/[mM](\|)?$/', $serialNumberRaw)) {
-                    $copies = 1;
-                }
-                // Check if serial ends with /p or /P, optionally followed by |
-                elseif (preg_match('/\/[pP](\|)?$/', $serialNumberRaw)) {
-                    $copies = 1;
-                }
-            }
-        }
-
-        // $palletNo = preg_replace('/\/.*/', '', $palletNo);
-
         // 5. Generate QR Code (base64)
         $qrCode = new QrCode($palletNo);
         $output = new Output\Png();
@@ -112,8 +73,6 @@ class ProductionStickerReprintController extends Controller
             'copies'=> $copies,
         ]);
     }
-
-
     public function store(Request $request)
     {
         //

app/Models/CharacteristicValue.php

@@ -19,7 +19,6 @@ class CharacteristicValue extends Model
         'process_order',
         'coil_number',
         'status',
-        'observed_value',
         'created_at',
         'updated_at',
         'created_by',

database/migrations/2025_12_27_124510_add_observed_value_column_to_characteristic_values.php

@@ -1,29 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        DB::statement(<<<SQL
-            ALTER TABLE characteristic_values
-            ADD COLUMN observed_value NUMERIC(10,3);
-        SQL);
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        // Schema::table('characteristic_values', function (Blueprint $table) {
-        //     //
-        // });
-    }
-};

package.json

@@ -13,6 +13,6 @@
         "laravel-vite-plugin": "^1.2.0",
         "postcss": "^8.4.47",
         "tailwindcss": "^3.4.13",
-        "vite": "^6.0.11"
+        "vite": "^7.0.0"
     }
 }

routes/api.php

@@ -77,9 +77,7 @@ Route::get('/download-reprint-qr-pdf/{palletNo}', [PalletController::class, 'dow
 
 // Route::get('/download-reprint-process-pdf/{plant}/{item}/{process_order}/{coil_number}/{name}', [PalletController::class, 'downloadReprintProcess'])->name('download-reprint-process-pdf');
 
-//Route::get('/download-qr1-pdf/{palletNo}', [ProductionStickerReprintController::class, 'downloadQrPdf'])->where('palletNo', '.*')->name('download-qr1-pdf');
-Route::get('/download-qr1-pdf', [ProductionStickerReprintController::class, 'downloadQrPdf'])
-    ->name('download-qr1-pdf');
+Route::get('/download-qr1-pdf/{palletNo}', [ProductionStickerReprintController::class, 'downloadQrPdf'])->name('download-qr1-pdf');
 
 // Production Dashboard Controller
 
@@ -161,23 +159,23 @@ Route::get('laser/item/get-master-data', [StickerMasterController::class, 'get_m
 
 Route::post('laser/route/data', [CharacteristicsController::class, 'test']); // ->withoutMiddleware(VerifyCsrfToken::class)
 
-// ..Part Validation - Characteristics
+// //..Part Validation - Characteristics
 
-// Route::get('get-characteristics/master-data', [CharacteristicsController::class, 'getCharacteristicsMaster']);
+// // Route::get('get-characteristics/master-data', [CharacteristicsController::class, 'getCharacteristicsMaster']);
 
-// ..Serial or job
+// // //..Serial or job
 
-// Route::get('laser/characteristics/get', [CharacteristicsController::class, 'getClassChar']);
+// // Route::get('laser/characteristics/get', [CharacteristicsController::class, 'getClassChar']);
 
-// Route::get('laser/characteristics/check', [CharacteristicsController::class, 'checkClassChar']);
+// // Route::get('laser/characteristics/check', [CharacteristicsController::class, 'checkClassChar']);
 
-// ..Job or Master - Characteristics
+// // //..Job or Master - Characteristics
 
-// Route::post('laser/characteristics/data', [CharacteristicsController::class, 'storeClassChar']);
+// // Route::post('laser/characteristics/data', [CharacteristicsController::class, 'storeClassChar']);
 
-// ..serial auto or manual
+// // //..serial auto or manual
 
-// Route::post('laser/characteristics/status', [CharacteristicsController::class, 'storeLaserStatus']);
+// // Route::post('laser/characteristics/status', [CharacteristicsController::class, 'storeLaserStatus']);
 
 // ..Product Characteristics
 

routes/console.php

@@ -9,9 +9,14 @@ Artisan::command('inspire', function () {
     $this->comment(Inspiring::quote());
 })->purpose('Display an inspiring quote');
 
+
 Artisan::command('auto:scheduler', function () {
     $this->call('custom:scheduler');
-})->everyMinute()->withoutOverlapping();
+})->everyMinute();
+
+
+//     Schedule::command('send:invoice-report');
+//   Schedule::command('send:production-report');
 
 // app()->booted(function () {
 //     $schedule = app(Schedule::class);