Merge pull request 'Added characteristics values post api in routes' (#93) from ranjith-dev into master

Reviewed-on: #93

app/Filament/Exports/CharacteristicValueExporter.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Filament\Exports;
+
+use App\Models\CharacteristicValue;
+use Filament\Actions\Exports\ExportColumn;
+use Filament\Actions\Exports\Exporter;
+use Filament\Actions\Exports\Models\Export;
+
+class CharacteristicValueExporter extends Exporter
+{
+    protected static ?string $model = CharacteristicValue::class;
+
+    public static function getColumns(): array
+    {
+        return [
+            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'),
+        ];
+    }
+
+    public static function getCompletedNotificationBody(Export $export): string
+    {
+        $body = 'Your characteristic value export has completed and ' . number_format($export->successful_rows) . ' ' . str('row')->plural($export->successful_rows) . ' exported.';
+
+        if ($failedRowsCount = $export->getFailedRowsCount()) {
+            $body .= ' ' . number_format($failedRowsCount) . ' ' . str('row')->plural($failedRowsCount) . ' failed to export.';
+        }
+
+        return $body;
+    }
+}

app/Filament/Imports/CharacteristicValueImporter.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Filament\Imports;
+
+use App\Models\CharacteristicValue;
+use Filament\Actions\Imports\ImportColumn;
+use Filament\Actions\Imports\Importer;
+use Filament\Actions\Imports\Models\Import;
+
+class CharacteristicValueImporter extends Importer
+{
+    protected static ?string $model = CharacteristicValue::class;
+
+    public static function getColumns(): array
+    {
+        return [
+            ImportColumn::make('plant')
+                ->requiredMapping()
+                ->relationship()
+                ->rules(['required']),
+            ImportColumn::make('line')
+                ->requiredMapping()
+                ->relationship()
+                ->rules(['required']),
+            ImportColumn::make('item')
+                ->requiredMapping()
+                ->relationship()
+                ->rules(['required']),
+            ImportColumn::make('machine')
+                ->requiredMapping()
+                ->relationship()
+                ->rules(['required']),
+            ImportColumn::make('process_order'),
+            ImportColumn::make('coil_number'),
+            ImportColumn::make('status'),
+            ImportColumn::make('created_by'),
+            ImportColumn::make('updated_by'),
+        ];
+    }
+
+    public function resolveRecord(): ?CharacteristicValue
+    {
+        // return CharacteristicValue::firstOrNew([
+        //     // Update existing records, matching them by `$this->data['column_name']`
+        //     'email' => $this->data['email'],
+        // ]);
+
+        return new CharacteristicValue();
+    }
+
+    public static function getCompletedNotificationBody(Import $import): string
+    {
+        $body = 'Your characteristic value import has completed and ' . number_format($import->successful_rows) . ' ' . str('row')->plural($import->successful_rows) . ' imported.';
+
+        if ($failedRowsCount = $import->getFailedRowsCount()) {
+            $body .= ' ' . number_format($failedRowsCount) . ' ' . str('row')->plural($failedRowsCount) . ' failed to import.';
+        }
+
+        return $body;
+    }
+}

app/Filament/Resources/CharacteristicValueResource.php

@@ -0,0 +1,516 @@
+<?php
+
+namespace App\Filament\Resources;
+
+use App\Filament\Exports\CharacteristicValueExporter;
+use App\Filament\Imports\CharacteristicValueImporter;
+use App\Filament\Resources\CharacteristicValueResource\Pages;
+use App\Filament\Resources\CharacteristicValueResource\RelationManagers;
+use App\Models\CharacteristicValue;
+use App\Models\Item;
+use App\Models\Line;
+use App\Models\Machine;
+use App\Models\Plant;
+use Filament\Forms;
+use Filament\Forms\Form;
+use Filament\Resources\Resource;
+use Filament\Tables;
+use Filament\Tables\Table;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\SoftDeletingScope;
+use Filament\Facades\Filament;
+use Filament\Forms\Components\DateTimePicker;
+use Filament\Tables\Filters\Filter;
+use Filament\Forms\Components\Select;
+use Filament\Forms\Components\TextInput;
+use Filament\Tables\Actions\ExportAction;
+use Filament\Tables\Actions\ImportAction;
+
+class CharacteristicValueResource extends Resource
+{
+    protected static ?string $model = CharacteristicValue::class;
+
+    protected static ?string $navigationIcon = 'heroicon-o-rectangle-stack';
+
+    protected static ?string $navigationGroup = 'Process Order';
+
+    public static function form(Form $form): Form
+    {
+        return $form
+            ->schema([
+                Forms\Components\Select::make('plant_id')
+                    ->label('Plant')
+                    ->relationship('plant', 'name')
+                    ->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()
+                    ->afterStateUpdated(function ($state, $set, callable $get) {
+                        $plantId = $get('plant_id');
+                        $set('item_id', null);
+                        $set('line_id', null);
+                        $set('machine_id', null);
+                        if (! $plantId) {
+                            $set('poPlantError', 'Please select a plant first.');
+                        }
+                    })
+                    ->extraAttributes(fn ($get) => [
+                        'class' => $get('poPlantError') ? 'border-red-500' : '',
+                    ])
+                    ->hint(fn ($get) => $get('poPlantError') ? $get('poPlantError') : null)
+                    ->hintColor('danger')
+                    ->required(),
+                Forms\Components\Select::make('line_id')
+                    ->label('Line')
+                    ->options(function (callable $get) {
+                        if (!$get('plant_id')) {
+                            return [];
+                        }
+
+                        return Line::where('plant_id', $get('plant_id'))
+                            ->pluck('name', 'id')
+                            ->toArray();
+                    })
+                    ->afterStateUpdated(function ($state, $set, callable $get) {
+                        $plantId = $get('plant_id');
+                        $set('item_id', null);
+                        $set('machine_id', null);
+                        if (! $plantId) {
+                            $set('poPlantError', 'Please select a plant first.');
+                        }
+                    })
+                    ->reactive()
+                    ->required(),
+                Forms\Components\Select::make('item_id')
+                    ->label('Item')
+                    ->options(function (callable $get) {
+                        if (!$get('plant_id') || !$get('line_id')) {
+                            return [];
+                        }
+
+                        return Item::where('plant_id', $get('plant_id'))
+                            ->pluck('code', 'id')
+                            ->toArray();
+                    })
+                    ->afterStateUpdated(function ($state, $set, callable $get) {
+                        $plantId = $get('plant_id');
+                        $set('machine_id', null);
+                        if (! $plantId) {
+                            $set('poPlantError', 'Please select a plant first.');
+                        }
+                    })
+                    ->reactive()
+                    ->required()
+                    ->searchable(),
+                Forms\Components\Select::make('machine_id')
+                    ->label('Machine')
+                    ->options(function (callable $get) {
+                        if (!$get('plant_id') || !$get('line_id') || !$get('item_id')) {
+                            return [];
+                        }
+
+                        return Machine::where('plant_id', $get('plant_id'))
+                            ->where('line_id', $get('line_id'))
+                            ->pluck('work_center', 'id')
+                            ->toArray();
+                    })
+                    ->afterStateUpdated(function ($state, $set, callable $get) {
+                        $plantId = $get('plant_id');
+                        $set('process_order', null);
+                        $set('coil_number', null);
+                        $set('status', null);
+                        if (! $plantId) {
+                            $set('poPlantError', 'Please select a plant first.');
+                        }
+                    })
+                    ->reactive()
+                    ->required(),
+                Forms\Components\TextInput::make('process_order')
+                    ->label('Process Order')
+                    ->reactive()
+                    ->afterStateUpdated(function ($state, $set, callable $get) {
+                        $plantId = $get('plant_id');
+                        $set('coil_number', null);
+                        $set('status', null);
+                        if (! $plantId) {
+                            $set('poPlantError', 'Please select a plant first.');
+                        }
+                    })
+                    ->required(),
+                Forms\Components\TextInput::make('coil_number')
+                    ->label('Coil Number')
+                    // ->reactive()
+                    // ->afterStateUpdated(function ($state, $set, callable $get) {
+                    //     $plantId = $get('plant_id');
+                    //     $set('status', null);
+                    //     if (! $plantId) {
+                    //         $set('poPlantError', 'Please select a plant first.');
+                    //     }
+                    // })
+                    // ->required(),
+                    ->label('Coil Number')
+                    ->default('0')
+                    ->reactive()
+                    ->afterStateUpdated(function ($state, $set, callable $get, $livewire) {
+                        $plantId = $get('plant_id');
+                        $processOrder = $get('process_order');
+                        $coilNo = $get('coil_number');
+                        if (! $plantId) {
+                            $set('poPlantError', 'Please select a plant first.');
+                        } elseif (! $processOrder) {
+                            $set('coil_number', null);
+                            $set('poPlantError', null);
+                        } elseif ($coilNo || $coilNo == '0') {
+                            $existing = CharacteristicValue::where('plant_id', $plantId)
+                                ->where('process_order', $processOrder)
+                                ->where('coil_number', $coilNo)
+                                ->first();
+
+                            if ($existing) {
+                                $set('poPlantError', null);
+                                $set('coil_number', null);
+                                $set('coilNumberError', "Duplicate Coil : '{$coilNo}' found!");
+                            } else {
+                                $set('poPlantError', null);
+                                $set('coilNumberError', null);
+                            }
+                        }
+                    })
+                    ->extraAttributes(fn ($get) => [
+                        'class' => $get('coilNumberError') ? 'border-red-500' : '',
+                    ])
+                    ->hint(fn ($get) => $get('coilNumberError') ? $get('coilNumberError') : null)
+                    ->hintColor('danger')
+                    ->required(),
+                Forms\Components\Select::make('status')
+                    ->label('Status')
+                    ->options([
+                        'Ok' => 'OK',
+                        'NotOk' => 'Not Ok'
+                    ])
+                    ->reactive()
+                    ->required(),
+                Forms\Components\Hidden::make('created_by')
+                    ->label('Created By')
+                    ->default(Filament::auth()->user()?->name),
+                Forms\Components\Hidden::make('updated_by')
+                    ->label('Updated By')
+                    ->default(Filament::auth()->user()?->name),
+            ]);
+    }
+
+    public static function table(Table $table): Table
+    {
+        return $table
+            ->columns([
+                Tables\Columns\TextColumn::make('No.')
+                    ->label('No.')
+                    ->getStateUsing(function ($record, $livewire, $column, $rowLoop) {
+                        $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')
+                    ->label('Plant')
+                    ->searchable()
+                    ->alignCenter()
+                    ->sortable(),
+                Tables\Columns\TextColumn::make('line.name')
+                    ->label('Line')
+                    ->searchable()
+                    ->alignCenter()
+                    ->sortable(),
+                Tables\Columns\TextColumn::make('item.code')
+                    ->label('Item')
+                    ->searchable()
+                    ->alignCenter()
+                    ->sortable(),
+                Tables\Columns\TextColumn::make('machine.work_center')
+                    ->label('Machine')
+                    ->searchable()
+                    ->alignCenter()
+                    ->sortable(),
+                Tables\Columns\TextColumn::make('process_order')
+                    ->label('Process Order')
+                    ->searchable()
+                    ->alignCenter()
+                    ->sortable(),
+                Tables\Columns\TextColumn::make('coil_number')
+                    ->label('Coil Number')
+                    ->searchable()
+                    ->alignCenter()
+                    ->sortable(),
+                Tables\Columns\TextColumn::make('status')
+                    ->label('Status')
+                    ->searchable()
+                    ->alignCenter()
+                    ->sortable(),
+                Tables\Columns\TextColumn::make('created_by')
+                    ->label('Created By')
+                    ->searchable()
+                    ->alignCenter()
+                    ->sortable(),
+                Tables\Columns\TextColumn::make('created_at')
+                    ->label('Created At')
+                    ->alignCenter()
+                    ->dateTime()
+                    ->sortable()
+                    ->toggleable(isToggledHiddenByDefault: true),
+                Tables\Columns\TextColumn::make('updated_at')
+                    ->label('Updated At')
+                    ->alignCenter()
+                    ->dateTime()
+                    ->sortable()
+                    ->toggleable(isToggledHiddenByDefault: true),
+                Tables\Columns\TextColumn::make('deleted_at')
+                    ->label('Deleted At')
+                    ->alignCenter()
+                    ->dateTime()
+                    ->sortable()
+                    ->toggleable(isToggledHiddenByDefault: true),
+            ])
+            // ->filters([
+            //     Tables\Filters\TrashedFilter::make(),
+            // ])
+            ->filters([
+
+            Tables\Filters\TrashedFilter::make(),
+            Filter::make('advanced_filters')
+                ->label('Advanced Filters')
+                ->form([
+                    Select::make('Plant')
+                        ->label('Select Plant')
+                        ->nullable()
+                        ->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()
+                        ->afterStateUpdated(function ($state, callable $set, callable $get) {
+                            $set('Item', null);
+                        }),
+                    Select::make('Line')
+                        ->label('Select Line')
+                        ->nullable()
+                        ->options(function (callable $get) {
+                                $plantId = $get('Plant');
+
+                                if(empty($plantId)) {
+                                    return [];
+                                }
+
+                                return Line::where('plant_id', $plantId)->pluck('name', 'id');
+
+                                //return $plantId ? Item::where('plant_id', $plantId)->pluck('code', 'id') : [];
+                            })
+                        ->reactive()
+                        ->afterStateUpdated(function ($state, callable $set, callable $get) {
+                            $set('Item', null);
+                        }),
+                    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') : [];
+                            })
+                        ->reactive()
+                        ->afterStateUpdated(function ($state, callable $set, callable $get) {
+                            $set('process_order', null);
+                        }),
+                    Select::make('Machine')
+                        ->label('Select Machine')
+                        ->nullable()
+                        ->options(function (callable $get) {
+                                $plantId = $get('Plant');
+                                $lineId = $get('Line');
+
+                                if(empty($plantId) || empty($lineId)) {
+                                    return [];
+                                }
+
+                                return Machine::where('plant_id', $plantId)->where('line_id', $lineId)->pluck('work_center', 'id');
+
+                                //return $plantId ? Item::where('plant_id', $plantId)->pluck('code', 'id') : [];
+                            })
+                        ->reactive()
+                        ->afterStateUpdated(function ($state, callable $set, callable $get) {
+                            $set('process_order', null);
+                        }),
+                    TextInput::make('process_order')
+                        ->label('Process Order')
+                        ->placeholder('Enter Process Order'),
+                    TextInput::make('coil_number')
+                        ->label('Coil Number')
+                        ->placeholder(placeholder: 'Enter Coil Number'),
+                    Select::make('status')
+                        ->label('Status')
+                        ->options([
+                            'Ok' => 'OK',
+                            'NotOk' => 'Not Ok'
+                        ]),
+                    DateTimePicker::make(name: 'created_from')
+                        ->label('Created From')
+                        ->placeholder(placeholder: 'Select From DateTime')
+                        ->reactive()
+                        ->native(false),
+                    DateTimePicker::make('created_to')
+                        ->label('Created To')
+                        ->placeholder(placeholder: 'Select To DateTime')
+                        ->reactive()
+                        ->native(false),
+                ])
+                ->query(function ($query, array $data) {
+                    // Hide all records initially if no filters are applied
+                    if (empty($data['Plant']) && empty($data['Line']) && empty($data['Item']) && empty($data['Machine']) && empty($data['process_order']) && empty($data['coil_number']) && empty($data['status']) && empty($data['created_from']) && empty($data['created_to'])) {
+                        return $query->whereRaw('1 = 0');
+                    }
+
+                    if (!empty($data['Plant'])) {
+                        $query->where('plant_id', $data['Plant']);
+                    }
+
+                    if (!empty($data['Line'])) {
+                        $query->where('line_id', $data['Line']);
+                    }
+
+                    if (!empty($data['Item'])) {
+                        $query->where('item_id', $data['Item']);
+                    }
+
+                    if (!empty($data['Machine'])) {
+                        $query->where('machine_id', $data['Machine']);
+                    }
+
+                    if (!empty($data['process_order'])) {
+                        $query->where('process_order', $data['process_order']);
+                    }
+
+                    if (!empty($data['coil_number'])) {
+                        $query->where('coil_number', $data['coil_number']);
+                    }
+
+                    if (!empty($data['status'])) {
+                        $query->where('status', $data['status']);
+                    }
+
+                    if (!empty($data['created_from'])) {
+                        $query->where('created_at', '>=', $data['created_from']);
+                    }
+
+                    if (!empty($data['created_to'])) {
+                        $query->where('created_at', '<=', $data['created_to']);
+                    }
+
+
+                    //$query->orderBy('created_at', 'asc');
+                })
+                ->indicateUsing(function (array $data) {
+                    $indicators = [];
+
+                    if (!empty($data['Plant'])) {
+                        $indicators[] = 'Plant: ' . Plant::where('id', $data['Plant'])->value('name');
+                    }
+
+                    if (!empty($data['Line'])) {
+                        $indicators[] = 'Line: ' . Line::where('id', $data['Line'])->value('name');
+                    }
+
+                    if (!empty($data['Item'])) {
+                        $indicators[] = 'Item: ' . Item::where('id', $data['Item'])->value('code');
+                    }
+
+                    if (!empty($data['Machine'])) {
+                        $indicators[] = 'Machine: ' . Machine::where('id', $data['Machine'])->value('work_center');
+                    }
+
+                    if (!empty($data['process_order'])) {
+                        $indicators[] = 'Process Order: ' . $data['process_order'];
+                    }
+
+                    if (!empty($data['coil_number'])) {
+                        $indicators[] = 'Coil Number: ' . $data['coil_number'];
+                    }
+
+                    if (!empty($data['status'])) {
+                        $indicators[] = 'Status: ' . $data['status'];
+                    }
+
+                    if (!empty($data['created_from'])) {
+                        $indicators[] = 'From: ' . $data['created_from'];
+                    }
+
+                    if (!empty($data['created_to'])) {
+                        $indicators[] = 'To: ' . $data['created_to'];
+                    }
+
+                    return $indicators;
+                })
+            ])
+            ->filtersFormMaxHeight('280px')
+            ->actions([
+                Tables\Actions\ViewAction::make(),
+                Tables\Actions\EditAction::make(),
+            ])
+            ->bulkActions([
+                Tables\Actions\BulkActionGroup::make([
+                    Tables\Actions\DeleteBulkAction::make(),
+                    Tables\Actions\ForceDeleteBulkAction::make(),
+                    Tables\Actions\RestoreBulkAction::make(),
+                ]),
+            ])
+            ->headerActions([
+                ImportAction::make()
+                    ->importer(CharacteristicValueImporter::class)
+                    ->label('Import Characteristic Value')
+                    ->color('warning')
+                    ->visible(function () {
+                        return Filament::auth()->user()->can('view import characteristic value');
+                    }),
+                ExportAction::make()
+                    ->exporter(CharacteristicValueExporter::class)
+                    ->label('Export Characteristic Value')
+                    ->color('warning')
+                    ->visible(function () {
+                        return Filament::auth()->user()->can('view export characteristic value');
+                    }),
+            ]);
+    }
+
+    public static function getRelations(): array
+    {
+        return [
+            //
+        ];
+    }
+
+    public static function getPages(): array
+    {
+        return [
+            'index' => Pages\ListCharacteristicValues::route('/'),
+            'create' => Pages\CreateCharacteristicValue::route('/create'),
+            'view' => Pages\ViewCharacteristicValue::route('/{record}'),
+            'edit' => Pages\EditCharacteristicValue::route('/{record}/edit'),
+        ];
+    }
+
+    public static function getEloquentQuery(): Builder
+    {
+        return parent::getEloquentQuery()
+            ->withoutGlobalScopes([
+                SoftDeletingScope::class,
+            ]);
+    }
+}

app/Filament/Resources/CharacteristicValueResource/Pages/CreateCharacteristicValue.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Filament\Resources\CharacteristicValueResource\Pages;
+
+use App\Filament\Resources\CharacteristicValueResource;
+use Filament\Actions;
+use Filament\Resources\Pages\CreateRecord;
+
+class CreateCharacteristicValue extends CreateRecord
+{
+    protected static string $resource = CharacteristicValueResource::class;
+}

app/Filament/Resources/CharacteristicValueResource/Pages/EditCharacteristicValue.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Filament\Resources\CharacteristicValueResource\Pages;
+
+use App\Filament\Resources\CharacteristicValueResource;
+use Filament\Actions;
+use Filament\Resources\Pages\EditRecord;
+
+class EditCharacteristicValue extends EditRecord
+{
+    protected static string $resource = CharacteristicValueResource::class;
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            Actions\ViewAction::make(),
+            Actions\DeleteAction::make(),
+            Actions\ForceDeleteAction::make(),
+            Actions\RestoreAction::make(),
+        ];
+    }
+}

app/Filament/Resources/CharacteristicValueResource/Pages/ListCharacteristicValues.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Filament\Resources\CharacteristicValueResource\Pages;
+
+use App\Filament\Resources\CharacteristicValueResource;
+use Filament\Actions;
+use Filament\Resources\Pages\ListRecords;
+
+class ListCharacteristicValues extends ListRecords
+{
+    protected static string $resource = CharacteristicValueResource::class;
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            Actions\CreateAction::make(),
+        ];
+    }
+}

app/Filament/Resources/CharacteristicValueResource/Pages/ViewCharacteristicValue.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Filament\Resources\CharacteristicValueResource\Pages;
+
+use App\Filament\Resources\CharacteristicValueResource;
+use Filament\Actions;
+use Filament\Resources\Pages\ViewRecord;
+
+class ViewCharacteristicValue extends ViewRecord
+{
+    protected static string $resource = CharacteristicValueResource::class;
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            Actions\EditAction::make(),
+        ];
+    }
+}

app/Filament/Resources/InvoiceValidationResource.php

@@ -136,23 +136,23 @@ class InvoiceValidationResource extends Resource
                     ->reactive()
                     ->readOnly(fn (callable $get) => empty($get('invoice_number')))
                     ->disabled(fn (Get $get) => empty($get('invoice_number')))
-                    ->extraAttributes([
-                        'id' => 'serial_number_input',
-                        'x-data' => '{ value: "" }',
-                        'x-model' => 'value',
-                        'wire:keydown.enter.prevent' => 'processSerial(value)',  // Using wire:keydown
-                    ])
-                    // ->dehydrated(false) // Do not trigger Livewire syncing
                     // ->extraAttributes([
                     //     'id' => 'serial_number_input',
-                    //     'x-on:keydown.enter.prevent' => "
-                    //         let serial = \$event.target.value;
-                    //         if (serial.trim() != '') {
-                    //             \$wire.dispatch('process-scan', serial);
-                    //             \$event.target.value = '';
-                    //         }
-                    //     ",
+                    //     'x-data' => '{ value: "" }',
+                    //     'x-model' => 'value',
+                    //     'wire:keydown.enter.prevent' => 'processSerial(value)',  // Using wire:keydown
                     // ])
+                    ->dehydrated(false) // Do not trigger Livewire syncing
+                    ->extraAttributes([
+                        'id' => 'serial_number_input',
+                        'x-on:keydown.enter.prevent' => "
+                            let serial = \$event.target.value;
+                            if (serial.trim() != '') {
+                                \$wire.dispatch('process-scan', serial);
+                                \$event.target.value = '';
+                            }
+                        ",
+                    ])
                     ->afterStateUpdated(function ($state, callable $set, callable $get, callable $livewire) {
                         $set('update_invoice', 0);
                         // $this->dispatch('focus-serial-number');

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

@@ -2261,7 +2261,7 @@ class CreateInvoiceValidation extends CreateRecord
         ];
     }
 
-    public function processSerial($serNo)
+    public function processSer($serNo)
     {
         $serNo = trim($serNo);
         $mSerNo = $serNo;
@@ -3171,9 +3171,11 @@ class CreateInvoiceValidation extends CreateRecord
                         $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, $itemCode, 'NotFoundInvoice')
+                                new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode,$mUserName,'NotFoundInvoice')
                             );
                         } else {
                             \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
@@ -3379,18 +3381,18 @@ class CreateInvoiceValidation extends CreateRecord
                                 ->send();
                             $this->dispatch('playNotificationSound');
 
-                            $mInvoiceType = 'Serial';
-                            $mailData = $this->getMail();
-                            $mPlantName = $mailData['plant_name'];
-                            $emails = $mailData['emails'];
+                            // $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.");
-                            }
+                            // 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';
@@ -3509,19 +3511,19 @@ class CreateInvoiceValidation extends CreateRecord
 
                             $this->dispatch('playNotificationSound');
 
-                            $mInvoiceType = 'Serial';
-                            $mailData = $this->getMail();
-                            $mPlantName = $mailData['plant_name'];
-                            $emails = $mailData['emails'];
+                            // $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.");
-                            }
+                            // 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';
@@ -3582,19 +3584,21 @@ class CreateInvoiceValidation extends CreateRecord
 
                             $this->dispatch('playWarnSound');
 
-                            $mInvoiceType = 'Serial';
-                            $mailData = $this->getMail();
-                            $mPlantName = $mailData['plant_name'];
-                            $emails = $mailData['emails'];
+                            // $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, 'DuplicateCapacitorQR')
-                                );
-                            } else {
-                                \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
-                            }
+                            // $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,
@@ -3719,19 +3723,19 @@ class CreateInvoiceValidation extends CreateRecord
 
                             $this->dispatch('playNotificationSound');
 
-                            $mInvoiceType = 'Serial';
-                            $mailData = $this->getMail();
-                            $mPlantName = $mailData['plant_name'];
-                            $emails = $mailData['emails'];
+                            // $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, 'ComSerInv')
-                                );
-                            } else {
-                                \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
-                            }
+                            // if (! empty($emails)) {
+                            //     // Mail::to($emails)->send(new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType));
+                            //     Mail::to($emails)->send(
+                            //         new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'ComSerInv')
+                            //     );
+                            // } else {
+                            //     \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
+                            // }
 
                             $filename = $invoiceNumber.'.xlsx';
                             $directory = 'uploads/temp';
@@ -3765,11 +3769,11 @@ class CreateInvoiceValidation extends CreateRecord
         }
     }
 
-    // #[On('process-scan')]
-    // public function processSerial($serial)
-    // {
-    //     $this->processSer($serial); // Your duplicate check + mail logic
-    // }
+    #[On('process-scan')]
+    public function processSerial($serial)
+    {
+        $this->processSer($serial);
+    }
 
     public function getHeading(): string
     {

app/Filament/Resources/ProductCharacteristicsMasterResource.php

@@ -27,6 +27,8 @@ class ProductCharacteristicsMasterResource extends Resource
 {
     protected static ?string $model = ProductCharacteristicsMaster::class;
 
+    protected static ?string $navigationGroup = 'Process Order';
+
     protected static ?string $navigationIcon = 'heroicon-o-rectangle-stack';
 
     public static function form(Form $form): Form

app/Filament/Resources/StickerPrintingResource.php

@@ -26,6 +26,8 @@ class StickerPrintingResource extends Resource
 
     protected static ?string $navigationIcon = 'heroicon-o-rectangle-stack';
 
+    protected static ?string $navigationGroup = 'Sticker Reprint';
+
     public static function form(Form $form): Form
     {
         return $form
@@ -38,7 +40,6 @@ class StickerPrintingResource extends Resource
                             ->relationship('plant', 'name')
                             ->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()

app/Mail/InvalidQualityMail.php

@@ -46,20 +46,20 @@ class InvalidQualityMail extends Mailable
         // dynamic subject based on mail type
         switch ($this->mailType) {
             case 'InvalidPartNumber2':
-                $this->subjectLine = "Invalid Part Number 2 Scanned ({$this->mplantName})";
+                $this->subjectLine = "Quality Part Validation ({$this->mplantName})";
                 break;
             case 'InvalidPartNumber3':
-                $this->subjectLine = "Invalid Part Number 3 Scanned ({$this->mplantName})";
+                $this->subjectLine = "Quality Part Validation ({$this->mplantName})";
                 break;
             case 'InvalidPartNumber4':
-                $this->subjectLine = "Invalid Part Number 4 Scanned ({$this->mplantName})";
+                $this->subjectLine = "Quality Part Validation ({$this->mplantName})";
                 break;
             case 'InvalidPartNumber5':
-                $this->subjectLine = "Invalid Part Number 5 Scanned ({$this->mplantName})";
+                $this->subjectLine = "Quality Part Validation ({$this->mplantName})";
                 break;
             case 'InvalidPartNumber':
             default:
-                $this->subjectLine = "Invalid Part Number 1 Scanned ({$this->mplantName})";
+                $this->subjectLine = "Quality Part Validation ({$this->mplantName})";
                 break;
         }
 

app/Mail/InvalidSerialMail.php

@@ -82,12 +82,14 @@ class InvalidSerialMail extends Mailable
     public $greeting;
     public $subjectLine;
 
+    public $mUserName;
+
     public $itemCode;
 
     /**
      * Create a new message instance.
      */
-    public function __construct($serial, $invoiceNumber, $mplantName, $mInvoiceType, $itemCode, $mailType = 'InvalidFormat')
+    public function __construct($serial, $invoiceNumber, $mplantName, $mInvoiceType, $itemCode, $mUserName, $mailType = 'InvalidFormat')
     {
         $this->serial = $serial;
         $this->invoiceNumber = $invoiceNumber;
@@ -95,6 +97,7 @@ class InvalidSerialMail extends Mailable
         $this->mInvoiceType = $mInvoiceType;
         $this->mailType = $mailType;
         $this->itemCode = $itemCode;
+        $this->mUserName = $mUserName;
     }
 
     /**
@@ -110,15 +113,18 @@ class InvalidSerialMail extends Mailable
             case 'DuplicateCapacitorQR':
                 $this->subjectLine = "Invoice - Second Scanning({$this->mplantName})";
                 break;
-            case 'CompletedSerialInvoice':
-                $this->subjectLine = "Invoice - Second Scanning({$this->mplantName})";
-                break;
-            case 'CSerialInvoice':
-                $this->subjectLine = "Invoice - Second Scanning({$this->mplantName})";
-                break;
-            case 'ComSerInv':
+            case 'InvalidPanelBox':
                 $this->subjectLine = "Invoice - Second Scanning({$this->mplantName})";
                 break;
+            // case 'CompletedSerialInvoice':
+            //     $this->subjectLine = "Invoice - Second Scanning({$this->mplantName})";
+            //     break;
+            // case 'CSerialInvoice':
+            //     $this->subjectLine = "Invoice - Second Scanning({$this->mplantName})";
+            //     break;
+            // case 'ComSerInv':
+            //     $this->subjectLine = "Invoice - Second Scanning({$this->mplantName})";
+            //     break;
         }
 
         return new Envelope(
@@ -141,48 +147,20 @@ class InvalidSerialMail extends Mailable
                     <b>Invoice Type:</b> {$this->mInvoiceType}<br>
                     <b>Invoice Number:</b> {$this->invoiceNumber}<br>
                     <b>Scanned QR Code:</b> {$this->serial}<br>
+                    <b>Employee Code:</b> {$this->mUserName}<br>
                 ";
                 break;
-            case 'DuplicateCapacitorQR':
-                $this->greeting = "
-                    Dear Sir/Madam,<br><br>
-                    The scanned <b>Capacitor</b> serial number has already completed the scanning process.<br><br>
-                    <b>Plant:</b> {$this->mplantName}<br>
-                    <b>Invoice Type:</b> {$this->mInvoiceType}<br>
-                    <b>Invoice Number:</b> {$this->invoiceNumber}<br>
-                    <b>Scanned QR Code:</b> {$this->serial}<br>
-                ";
-                break;
-            case 'CompletedSerialInvoice':
-                 $this->greeting = "
-                    Dear Sir/Madam,<br><br>
-                    Serial invoice <b>'{$this->invoiceNumber}'</b> completed the scanning process.<br>
-                    <b>Plant:</b> {$this->mplantName}<br>
-                    <b>Invoice Type:</b> {$this->mInvoiceType}<br>
-                    <b>Invoice Number:</b> {$this->invoiceNumber}<br>
-                    <b>Scanned QR Code:</b> {$this->serial}<br>
-                ";
-                break;
-            case 'CSerialInvoice':
-                 $this->greeting = "
-                    Dear Sir/Madam,<br><br>
-                    Serial invoice <b>'{$this->invoiceNumber}'</b> completed the scanning process.<br>
-                    <b>Plant:</b> {$this->mplantName}<br>
-                    <b>Invoice Type:</b> {$this->mInvoiceType}<br>
-                    <b>Invoice Number:</b> {$this->invoiceNumber}<br>
-                    <b>Scanned QR Code:</b> {$this->serial}<br>
-                ";
-                break;
-            case 'ComSerInv':
-                 $this->greeting = "
-                    Dear Sir/Madam,<br><br>
-                    Serial invoice <b>'{$this->invoiceNumber}'</b> completed the scanning process.<br>
-                    <b>Plant:</b> {$this->mplantName}<br>
-                    <b>Invoice Type:</b> {$this->mInvoiceType}<br>
-                    <b>Invoice Number:</b> {$this->invoiceNumber}<br>
-                    <b>Scanned QR Code:</b> {$this->serial}<br>
-                ";
-                break;
+            // case 'DuplicateCapacitorQR':
+            //     $this->greeting = "
+            //         Dear Sir/Madam,<br><br>
+            //         The scanned <b>Capacitor</b> serial number has already completed the scanning process.<br><br>
+            //         <b>Plant:</b> {$this->mplantName}<br>
+            //         <b>Invoice Type:</b> {$this->mInvoiceType}<br>
+            //         <b>Invoice Number:</b> {$this->invoiceNumber}<br>
+            //         <b>Scanned QR Code:</b> {$this->serial}<br>
+            //         <b>Employee Code:</b> {$this->mUserName}<br>
+            //     ";
+            //     break;
         }
 
         return new Content(

app/Models/CharacteristicValue.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+class CharacteristicValue extends Model
+{
+
+    use SoftDeletes;
+
+    protected $fillable = [
+        'plant_id',
+        'line_id',
+        'item_id',
+        'machine_id',
+        'process_order',
+        'coil_number',
+        'status',
+        'created_at',
+        'updated_at',
+        'created_by',
+        'updated_by',
+    ];
+
+    public function plant(): BelongsTo
+    {
+        return $this->belongsTo(Plant::class);
+    }
+
+    public function line(): BelongsTo
+    {
+        return $this->belongsTo(Line::class);
+    }
+
+    public function item(): BelongsTo
+    {
+        return $this->belongsTo(Item::class);
+    }
+
+    public function machine(): BelongsTo
+    {
+        return $this->belongsTo(Machine::class);
+    }
+}

app/Policies/CharacteristicValuePolicy.php

@@ -0,0 +1,106 @@
+<?php
+
+namespace App\Policies;
+
+use Illuminate\Auth\Access\Response;
+use App\Models\CharacteristicValue;
+use App\Models\User;
+
+class CharacteristicValuePolicy
+{
+    /**
+     * Determine whether the user can view any models.
+     */
+    public function viewAny(User $user): bool
+    {
+        return $user->checkPermissionTo('view-any CharacteristicValue');
+    }
+
+    /**
+     * Determine whether the user can view the model.
+     */
+    public function view(User $user, CharacteristicValue $characteristicvalue): bool
+    {
+        return $user->checkPermissionTo('view CharacteristicValue');
+    }
+
+    /**
+     * Determine whether the user can create models.
+     */
+    public function create(User $user): bool
+    {
+        return $user->checkPermissionTo('create CharacteristicValue');
+    }
+
+    /**
+     * Determine whether the user can update the model.
+     */
+    public function update(User $user, CharacteristicValue $characteristicvalue): bool
+    {
+        return $user->checkPermissionTo('update CharacteristicValue');
+    }
+
+    /**
+     * Determine whether the user can delete the model.
+     */
+    public function delete(User $user, CharacteristicValue $characteristicvalue): bool
+    {
+        return $user->checkPermissionTo('delete CharacteristicValue');
+    }
+
+    /**
+     * Determine whether the user can delete any models.
+     */
+    public function deleteAny(User $user): bool
+    {
+        return $user->checkPermissionTo('delete-any CharacteristicValue');
+    }
+
+    /**
+     * Determine whether the user can restore the model.
+     */
+    public function restore(User $user, CharacteristicValue $characteristicvalue): bool
+    {
+        return $user->checkPermissionTo('restore CharacteristicValue');
+    }
+
+    /**
+     * Determine whether the user can restore any models.
+     */
+    public function restoreAny(User $user): bool
+    {
+        return $user->checkPermissionTo('restore-any CharacteristicValue');
+    }
+
+    /**
+     * Determine whether the user can replicate the model.
+     */
+    public function replicate(User $user, CharacteristicValue $characteristicvalue): bool
+    {
+        return $user->checkPermissionTo('replicate CharacteristicValue');
+    }
+
+    /**
+     * Determine whether the user can reorder the models.
+     */
+    public function reorder(User $user): bool
+    {
+        return $user->checkPermissionTo('reorder CharacteristicValue');
+    }
+
+    /**
+     * Determine whether the user can permanently delete the model.
+     */
+    public function forceDelete(User $user, CharacteristicValue $characteristicvalue): bool
+    {
+        return $user->checkPermissionTo('force-delete CharacteristicValue');
+    }
+
+    /**
+     * Determine whether the user can permanently delete any models.
+     */
+    public function forceDeleteAny(User $user): bool
+    {
+        return $user->checkPermissionTo('force-delete-any CharacteristicValue');
+    }
+}

database/migrations/2025_12_08_102633_create_characteristic_values_table.php

@@ -0,0 +1,48 @@
+<?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
+    {
+        $sql = <<<'SQL'
+            CREATE TABLE characteristic_values (
+                id					               	BIGINT GENERATED always AS IDENTITY PRIMARY KEY,
+                plant_id							BIGINT NOT NULL,
+                line_id                             BIGINT NOT NULL,
+                item_id							    BIGINT NOT NULL,
+                machine_id                          BIGINT NOT NULL,
+
+                process_order                       TEXT DEFAULT NULL,
+                coil_number                         TEXT DEFAULT NULL,
+                status                              TEXT DEFAULT NULL,
+
+                created_at							TIMESTAMP NOT NULL DEFAULT NOW(),
+                updated_at							TIMESTAMP NOT NULL DEFAULT NOW(),
+                created_by							TEXT DEFAULT NULL,
+                updated_by							TEXT DEFAULT NULL,
+                deleted_at			                TIMESTAMP,
+
+                FOREIGN KEY (plant_id)              REFERENCES plants (id),
+                FOREIGN KEY (line_id)               REFERENCES lines (id),
+                FOREIGN KEY (item_id)               REFERENCES items (id),
+                FOREIGN KEY (machine_id)            REFERENCES machines (id)
+            );
+        SQL;
+        DB::statement($sql);
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('characteristic_values');
+    }
+};

routes/api.php

@@ -43,7 +43,6 @@ use Illuminate\Support\Facades\Route;
 //    return $item;
 // });
 
-
 // Route::post('/user/update', function (Request $request) {
 //     // Return the request data as JSON
 
@@ -54,7 +53,6 @@ use Illuminate\Support\Facades\Route;
 //     ]);
 // });
 
-
 // Route::middleware('auth.basic')->post('/user/update', function (Request $request) {
 //     return response()->json([
 //         'message' => 'Authenticated via Basic Auth',
@@ -63,7 +61,6 @@ use Illuminate\Support\Facades\Route;
 //     ]);
 // });
 
-
 Route::post('obd/store-data', [ObdController::class, 'store']);
 
 Route::get('obd/get-test-datas', [ObdController::class, 'get_test']);
@@ -78,11 +75,11 @@ Route::get('/download-qr-pdf/{palletNo}', [PalletController::class, 'downloadQrP
 
 Route::get('/download-reprint-qr-pdf/{palletNo}', [PalletController::class, 'downloadReprintQrPdf'])->name('download-reprint-qr-pdf');
 
-//Route::get('/download-reprint-process-pdf/{plant}/{item}/{process_order}/{coil_number}', [PalletController::class, 'downloadReprintProcess'])->name('download-reprint-process-pdf');
+// 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'])->name('download-qr1-pdf');
 
-//Production Dashboard Controller
+// Production Dashboard Controller
 
 Route::get('get/module-name/data', [ModuleController::class, 'get_module']);
 
@@ -104,7 +101,7 @@ Route::get('get/module-production-order/data', [ModuleProductionOrderDataControl
 
 Route::get('get/module-production-linestop/data', [ModuleProductionLineStopController::class, 'get_moduleProductionLineStop']);
 
-//Invoice Dashboard Controller
+// Invoice Dashboard Controller
 
 Route::get('get/module-invoice-type/data', [ModuleInvoiceDataController::class, 'get_invoiceData']);
 
@@ -114,7 +111,7 @@ Route::get('get/module-invoice-count/data', [ModuleInvoiceTypeController::class,
 
 Route::get('get/module-invoice-quantity/data', [ModuleInvoiceQuantityController::class, 'get_invoiceQuantityData']);
 
-//Guard Dashboard Controller
+// Guard Dashboard Controller
 
 Route::get('get/module-guard-day/data', [ModuleGuardDayCountController::class, 'get_guardDay_countData']);
 
@@ -122,19 +119,19 @@ Route::get('get/module-guard-hourly/data', [ModuleGuardHourlyCountController::cl
 
 Route::get('get/module-guard-name/data', [ModuleGuardNameController::class, 'get_guard_name_Data']);
 
-//Power house controller
+// Power house controller
 
 Route::get('get/mfm-parameter/data', [MfmParameterController::class, 'get_mfm_parameter']);
 
 Route::get('get/mfm-parameterid/data', [MfmParameterController::class, 'get_mfm_parameterid']);
 
-//Invoice Validation Controller
+// Invoice Validation Controller
 
 Route::post('serial-invoice/store-data', [InvoiceValidationController::class, 'serialInvoice']);
 
 Route::post('material-invoice/store-data', [InvoiceValidationController::class, 'materialInvoice']);
 
-//Testing panel Controller
+// Testing panel Controller
 
 Route::get('testing/user/get-data', [UserController::class, 'get_testing_data']);
 
@@ -156,25 +153,37 @@ Route::post('process-order', [PdfController::class, 'storeProcessOrderData']);
 
 Route::get('sap/files', [SapFileController::class, 'readFiles']);
 
-//..Laser Marking - Characteristics
+// ..Laser Marking - Characteristics
 
 Route::get('laser/item/get-master-data', [StickerMasterController::class, 'get_master']);
 
-Route::post('laser/route/data', [CharacteristicsController::class, 'test']);//->withoutMiddleware(VerifyCsrfToken::class)
+Route::post('laser/route/data', [CharacteristicsController::class, 'test']); // ->withoutMiddleware(VerifyCsrfToken::class)
 
-// Route::get('get-characteristics/master-data', [CharacteristicsController::class, 'getCharacteristicsMaster']);
+// //..Part Validation - Characteristics
 
-// Route::get('laser/characteristics/get', [CharacteristicsController::class, 'getClassChar']);
+// // Route::get('get-characteristics/master-data', [CharacteristicsController::class, 'getCharacteristicsMaster']);
 
-// Route::get('laser/characteristics/check', [CharacteristicsController::class, 'checkClassChar']);
+// // //..Serial or job
 
-// Route::post('laser/characteristics/data', [CharacteristicsController::class, 'storeClassChar']);
+// // Route::get('laser/characteristics/get', [CharacteristicsController::class, 'getClassChar']);
 
-// Route::post('laser/characteristics/status', [CharacteristicsController::class, 'storeLaserStatus']);
+// // Route::get('laser/characteristics/check', [CharacteristicsController::class, 'checkClassChar']);
+
+// // //..Job or Master - Characteristics
+
+// // Route::post('laser/characteristics/data', [CharacteristicsController::class, 'storeClassChar']);
+
+// // //..serial auto or manual
+
+// // Route::post('laser/characteristics/status', [CharacteristicsController::class, 'storeLaserStatus']);
+
+// ..Product Characteristics
 
 Route::get('characteristics/get/master', [CharacteristicsController::class, 'getCharMaster']);
 
-//GR Master PDF and Serial Number
+Route::post('characteristics/values', [CharacteristicsController::class, 'storeCharValues']);
+
+// GR Master PDF and Serial Number
 
 Route::get('grNumber-pdf', [PdfController::class, 'getGRPdf']);