diff --git a/app/Filament/Exports/TestingPanelReadingExporter.php b/app/Filament/Exports/TestingPanelReadingExporter.php index 12945a5..761fb35 100644 --- a/app/Filament/Exports/TestingPanelReadingExporter.php +++ b/app/Filament/Exports/TestingPanelReadingExporter.php @@ -30,23 +30,25 @@ class TestingPanelReadingExporter extends Exporter ->label('LINE'), ExportColumn::make('machine.name') ->label('MACHINE'), - ExportColumn::make('item.code') + ExportColumn::make('motorTestingMaster.item.code') ->label('ITEM CODE'), - ExportColumn::make('item.description') + ExportColumn::make('motorTestingMaster.item.description') ->label('MODEL'), ExportColumn::make('output') ->label('OUTPUT'), ExportColumn::make('serial_number') ->label('SERIAL NUMBER'), - ExportColumn::make('item.kw') + ExportColumn::make('winded_serial_number') + ->label('WINDED SERIAL NUMBER'), + ExportColumn::make('motorTestingMaster.kw') ->label('KW'), - ExportColumn::make('item.hp') + ExportColumn::make('motorTestingMaster.hp') ->label('HP'), - ExportColumn::make('item.phase') + ExportColumn::make('motorTestingMaster.phase') ->label('PHASE'), - ExportColumn::make('item.connection') + ExportColumn::make('motorTestingMaster.connection') ->label('CONNECTION'), - ExportColumn::make('item.isi_model') + ExportColumn::make('motorTestingMaster.isi_model') ->label('ISI MODEL'), ExportColumn::make('before_fr_volt') ->label('BEFORE FR VOLT'), diff --git a/app/Filament/Imports/TestingPanelReadingImporter.php b/app/Filament/Imports/TestingPanelReadingImporter.php index 05a8edf..5f107fa 100644 --- a/app/Filament/Imports/TestingPanelReadingImporter.php +++ b/app/Filament/Imports/TestingPanelReadingImporter.php @@ -14,11 +14,11 @@ class TestingPanelReadingImporter extends Importer public static function getColumns(): array { return [ - ImportColumn::make('item') + ImportColumn::make('machine') ->requiredMapping() ->relationship() ->rules(['required']), - ImportColumn::make('machine') + ImportColumn::make('motorTestingMaster.item.code') ->requiredMapping() ->relationship() ->rules(['required']), @@ -28,6 +28,9 @@ class TestingPanelReadingImporter extends Importer ImportColumn::make('serial_number') ->requiredMapping() ->rules(['required']), + ImportColumn::make('winded_serial_number') + ->requiredMapping() + ->rules(['required']), ImportColumn::make('before_fr_volt'), ImportColumn::make('before_fr_cur'), ImportColumn::make('before_fr_pow'), diff --git a/resources/views/mail/production_report.blade.php b/resources/views/mail/production_report.blade.php index 076bc03..c7ea15c 100644 --- a/resources/views/mail/production_report.blade.php +++ b/resources/views/mail/production_report.blade.php @@ -54,6 +54,7 @@ @endforeach --}} +