Merge pull request 'ranjith-dev' (#11) from ranjith-dev into master

Reviewed-on: #11

app/Filament/Exports/ProcessOrderExporter.php

@@ -14,6 +14,7 @@ class ProcessOrderExporter extends Exporter
     public static function getColumns(): array
     {
         static $rowNumber = 0;
+
         return [
             ExportColumn::make('no')
                 ->label('NO')
@@ -21,8 +22,8 @@ class ProcessOrderExporter extends Exporter
                     // Increment and return the row number
                     return ++$rowNumber;
                 }),
-            ExportColumn::make('plant.name')
-            ->label('PLANT NAME'),
+            ExportColumn::make('plant.code')
+                ->label('PLANT CODE'),
             ExportColumn::make('item.code')
                 ->label('ITEM CODE'),
             ExportColumn::make('process_order')
@@ -33,6 +34,10 @@ class ProcessOrderExporter extends Exporter
                 ->label('ORDER QUANTITY'),
             ExportColumn::make('received_quantity')
                 ->label('RECEIVED QUANTITY'),
+            ExportColumn::make('sfg_number')
+                ->label('SFG NUMBER'),
+            ExportColumn::make('machine_name')
+                ->label('MACHINE ID'),
             ExportColumn::make('created_at')
                 ->label('CREATED AT'),
             ExportColumn::make('updated_at')
@@ -50,10 +55,10 @@ class ProcessOrderExporter extends Exporter
 
     public static function getCompletedNotificationBody(Export $export): string
     {
-        $body = 'Your process order export has completed and ' . number_format($export->successful_rows) . ' ' . str('row')->plural($export->successful_rows) . ' exported.';
+        $body = 'Your process order 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.';
+            $body .= ' '.number_format($failedRowsCount).' '.str('row')->plural($failedRowsCount).' failed to export.';
         }
 
         return $body;

app/Filament/Imports/ProcessOrderImporter.php

@@ -6,11 +6,11 @@ use App\Models\Item;
 use App\Models\Plant;
 use App\Models\ProcessOrder;
 use App\Models\User;
+use Filament\Actions\Imports\Exceptions\RowImportFailedException;
 use Filament\Actions\Imports\ImportColumn;
 use Filament\Actions\Imports\Importer;
 use Filament\Actions\Imports\Models\Import;
 use Str;
-use Filament\Actions\Imports\Exceptions\RowImportFailedException;
 
 class ProcessOrderImporter extends Importer
 {
@@ -21,27 +21,28 @@ class ProcessOrderImporter extends Importer
         return [
             ImportColumn::make('plant')
                 ->requiredMapping()
-                ->exampleHeader('Plant Code')
+                ->exampleHeader('PLANT CODE')
                 ->example('1000')
-                ->label('Plant Code')
-                ->relationship(resolveUsing:'code')
+                ->label('PLANT CODE')
+                ->relationship(resolveUsing: 'code')
                 ->rules(['required']),
             ImportColumn::make('item')
                 ->requiredMapping()
-                ->exampleHeader('Item Code')
+                ->exampleHeader('ITEM CODE')
                 ->example('123456')
-                ->label('Item Code')
+                ->label('ITEM CODE')
                 ->relationship(resolveUsing: 'code')
                 ->rules(['required']),
             ImportColumn::make('process_order')
-                ->exampleHeader('Process Order')
-                ->example('200000166843')
-                ->label('Process Order')
+                ->exampleHeader('PROCESS ORDER')
+                ->example('202500123456')
+                ->label('PROCESS ORDER')
                 ->rules(['required']),
             ImportColumn::make('created_by')
-                ->exampleHeader('Created By')
+                ->exampleHeader('CREATED BY')
                 ->example('RAW01234')
-                ->label('Created By'),
+                ->label('CREATED BY')
+                ->rules(['required']),
         ];
     }
 
@@ -52,26 +53,23 @@ class ProcessOrderImporter extends Importer
         $itemCode = Item::where('code', $this->data['item'])->first();
         $iCode = trim($this->data['item']);
 
-        if (!$plant) {
-            $warnMsg[] = "Plant not found";
-        }
-        else if (Str::length($iCode) < 6 || !ctype_alnum($iCode)) {
-            $warnMsg[] = "Invalid item code found";
-        }
-        else if(!$itemCode)
-        {
-            $warnMsg[] = "Item Code not found";
+        if (! $plant) {
+            $warnMsg[] = 'Plant not found';
+        } elseif (Str::length($iCode) < 6 || ! ctype_alnum($iCode)) {
+            $warnMsg[] = 'Invalid item code found';
+        } elseif (! $itemCode) {
+            $warnMsg[] = 'Item Code not found';
         }
 
         $processOrder = trim($this->data['process_order'] ?? '');
 
         if ($processOrder == '') {
-            $warnMsg[] = "Process Order cannot be empty";
+            $warnMsg[] = 'Process Order cannot be empty';
         }
 
         $user = User::where('name', $this->data['created_by'])->first();
-        if (!$user) {
-            $warnMsg[] = "User not found";
+        if (! $user) {
+            $warnMsg[] = 'User not found';
         }
 
         if ($plant && $processOrder != '') {
@@ -81,11 +79,11 @@ class ProcessOrderImporter extends Importer
                 ->first();
 
             if ($existingOrder && $existingOrder->item_id !== ($itemCode->id ?? null)) {
-                $warnMsg[] = "Same Process Order already exists for this Plant with a different Item Code";
+                $warnMsg[] = 'Same Process Order already exists for this Plant with a different Item Code';
             }
         }
 
-        if (!empty($warnMsg)) {
+        if (! empty($warnMsg)) {
             throw new RowImportFailedException(implode(', ', $warnMsg));
         }
 
@@ -93,21 +91,21 @@ class ProcessOrderImporter extends Importer
             'plant_id' => $plant->id,
             'item_id' => $itemCode->id,
             'process_order' => trim($this->data['process_order']),
-            'coil_number'       => "0",
+            'coil_number' => '0',
             'order_quantity' => 0,
             'received_quantity' => 0,
             'created_by' => $user->name,
         ]);
 
-        //return new ProcessOrder();
+        // return new ProcessOrder();
     }
 
     public static function getCompletedNotificationBody(Import $import): string
     {
-        $body = 'Your process order import has completed and ' . number_format($import->successful_rows) . ' ' . str('row')->plural($import->successful_rows) . ' imported.';
+        $body = 'Your process order 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.';
+            $body .= ' '.number_format($failedRowsCount).' '.str('row')->plural($failedRowsCount).' failed to import.';
         }
 
         return $body;

app/Filament/Resources/ProcessOrderResource.php

@@ -2,29 +2,28 @@
 
 namespace App\Filament\Resources;
 
+use App\Filament\Exports\ProcessOrderExporter;
+use App\Filament\Imports\ProcessOrderImporter;
 use App\Filament\Resources\ProcessOrderResource\Pages;
-use App\Filament\Resources\ProcessOrderResource\RelationManagers;
 use App\Models\Plant;
 use App\Models\ProcessOrder;
+use Filament\Facades\Filament;
 use Filament\Forms;
+use Filament\Forms\Components\Actions\Action;
 use Filament\Forms\Form;
+use Filament\Forms\Get;
+use Filament\Forms\Set;
+use Filament\Notifications\Notification;
 use Filament\Resources\Resource;
 use Filament\Tables;
+use Filament\Tables\Actions\ExportAction;
+use Filament\Tables\Actions\ImportAction;
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\SoftDeletingScope;
-use Storage;
 use Livewire\Features\SupportFileUploads\TemporaryUploadedFile;
-use Filament\Notifications\Notification;
-use Filament\Forms\Components\Actions\Action;
-use Filament\Facades\Filament;
 use Smalot\PdfParser\Parser;
-use Filament\Tables\Actions\ExportAction;
-use Filament\Tables\Actions\ImportAction;
-use App\Filament\Exports\ProcessOrderExporter;
-use App\Filament\Imports\ProcessOrderImporter;
-use Filament\Forms\Get;
-use Filament\Forms\Set;
+use Storage;
 
 class ProcessOrderResource extends Resource
 {
@@ -44,6 +43,7 @@ class ProcessOrderResource 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(),
@@ -58,6 +58,7 @@ class ProcessOrderResource extends Resource
                         if (empty($plantId)) {
                             return [];
                         }
+
                         return \App\Models\Item::where('plant_id', $plantId)->pluck('code', 'id');
                     })
                     ->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
@@ -119,6 +120,12 @@ class ProcessOrderResource extends Resource
                     ->label('Received Quantity')
                     ->default('0')
                     ->required(),
+                Forms\Components\TextInput::make('sfg_number')
+                    ->label('SFG Number')
+                    ->required(),
+                Forms\Components\TextInput::make('machine_name')
+                    ->label('Machine ID')
+                    ->required(),
                 Forms\Components\FileUpload::make('attachment')
                     ->label('PDF Upload')
                     ->acceptedFileTypes(['application/pdf'])
@@ -133,13 +140,12 @@ class ProcessOrderResource extends Resource
                         ->action(function ($get, callable $set) {
                             $uploadedFiles = $get('attachment');
 
-                            if (is_array($uploadedFiles) && count($uploadedFiles) > 0)
-                            {
+                            if (is_array($uploadedFiles) && count($uploadedFiles) > 0) {
                                 $uploaded = reset($uploadedFiles);
 
                                 if ($uploaded instanceof TemporaryUploadedFile) {
                                     $originalName = $uploaded->getClientOriginalName();
-                                    $path = 'uploads/ProcessOrder/' . $originalName;
+                                    $path = 'uploads/ProcessOrder/'.$originalName;
 
                                     // Check if file already exists
                                     if (Storage::disk('local')->exists($path)) {
@@ -148,6 +154,7 @@ class ProcessOrderResource extends Resource
                                             ->body("The file '{$originalName}' already exists in uploads/ProcessOrder.")
                                             ->warning()
                                             ->send();
+
                                         return; // Stop here
                                     }
 
@@ -158,23 +165,20 @@ class ProcessOrderResource extends Resource
                                     );
 
                                     // $fullPath = storage_path('app/' . $storedPath);
-                                   $fullPath = storage_path('app/' . $storedPath);
+                                    $fullPath = storage_path('app/'.$storedPath);
 
                                     // Parse PDF using smalot/pdfparser
-                                    $parser = new Parser();
+                                    $parser = new Parser;
                                     $pdf = $parser->parseContent(file_get_contents($uploaded->getRealPath()));
                                     $text = $pdf->getText();
 
-
                                     // if (preg_match('/Batch ID:\s*(\d+)\s*--/i', $text, $matches))
                                     // {
                                     //     $batchId = $matches[1];
                                     // }
                                     if (preg_match('/Batch ID:\s*(\d+)(?:\s*--)?/i', $text, $matches)) {
                                         $batchId = $matches[1];
-                                    }
-                                    else
-                                    {
+                                    } else {
                                         $batchId = null;
                                     }
 
@@ -187,11 +191,11 @@ class ProcessOrderResource extends Resource
                                             ->body("Batch ID ($batchId) does not match Process Order ($processOrder)")
                                             ->danger()
                                             ->send();
+
                                         return;
                                     }
 
-                                    if ($batchId == $processOrder)
-                                    {
+                                    if ($batchId == $processOrder) {
                                         // If batch matches, store the PDF permanently
                                         $storedPath = $uploaded->storeAs(
                                             'uploads/ProcessOrder',
@@ -204,16 +208,16 @@ class ProcessOrderResource extends Resource
                                             ->body("Batch ID matches Process Order: $batchId. PDF uploaded successfully.")
                                             ->success()
                                             ->send();
+
                                         return;
                                     }
                                 }
-                            }
-                            else
-                            {
+                            } else {
                                 Notification::make()
                                     ->title('No file selected to upload')
                                     ->warning()
                                     ->send();
+
                                 return;
                             }
                         }),
@@ -223,11 +227,12 @@ class ProcessOrderResource extends Resource
                         ->action(function ($get) {
                             $equipmentNumber = $get('process_order');
 
-                            if (!$equipmentNumber) {
+                            if (! $equipmentNumber) {
                                 Notification::make()
                                     ->title('No process order entered')
                                     ->danger()
                                     ->send();
+
                                 return;
                             }
 
@@ -241,11 +246,12 @@ class ProcessOrderResource extends Resource
                                 }
                             }
 
-                            if (!$fileToDownload) {
+                            if (! $fileToDownload) {
                                 Notification::make()
                                     ->title('PDF not found for this process order')
                                     ->danger()
                                     ->send();
+
                                 return;
                             }
 
@@ -312,6 +318,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')
@@ -349,6 +356,16 @@ class ProcessOrderResource extends Resource
                     ->alignCenter()
                     ->searchable()
                     ->sortable(),
+                Tables\Columns\TextColumn::make('sfg_number')
+                    ->label('SFG Number')
+                    ->alignCenter()
+                    ->searchable()
+                    ->sortable(),
+                Tables\Columns\TextColumn::make('machine_name')
+                    ->label('Machine ID')
+                    ->alignCenter()
+                    ->searchable()
+                    ->sortable(),
                 Tables\Columns\TextColumn::make('created_at')
                     ->label('Created At')
                     ->alignCenter()
@@ -396,14 +413,14 @@ class ProcessOrderResource extends Resource
                     ->label('Import Process Order')
                     ->color('warning')
                     ->importer(ProcessOrderImporter::class)
-                    ->visible(function() {
+                    ->visible(function () {
                         return Filament::auth()->user()->can('view import process order');
                     }),
                 ExportAction::make()
                     ->label('Export Process Order')
                     ->color('warning')
                     ->exporter(ProcessOrderExporter::class)
-                    ->visible(function() {
+                    ->visible(function () {
                         return Filament::auth()->user()->can('view export process order');
                     }),
             ]);

app/Models/ProcessOrder.php

@@ -11,16 +11,18 @@ class ProcessOrder extends Model
     use SoftDeletes;
 
     protected $fillable = [
-        "plant_id",
-        "item_id",
-        "process_order",
-        "coil_number",
-        "order_quantity",
-        "received_quantity",
-        "created_at",
-        "created_by",
-        "updated_by",
-        "updated_at"
+        'plant_id',
+        'item_id',
+        'process_order',
+        'coil_number',
+        'order_quantity',
+        'received_quantity',
+        'sfg_number',
+        'machine_name',
+        'created_at',
+        'created_by',
+        'updated_by',
+        'updated_at',
     ];
 
     public function plant(): BelongsTo
@@ -32,5 +34,4 @@ class ProcessOrder extends Model
     {
         return $this->belongsTo(Item::class, 'item_id');
     }
-
 }

database/migrations/2025_11_26_160752_add_sfg_number_and_machine_name_columns_to_process_orders.php

@@ -0,0 +1,38 @@
+<?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
+    {
+        $sql1 = <<<'SQL'
+        ALTER TABLE process_orders
+        ADD COLUMN sfg_number TEXT DEFAULT NULL
+        SQL;
+
+        DB::statement($sql1);
+
+        $sql2 = <<<'SQL'
+        ALTER TABLE process_orders
+        ADD COLUMN machine_name TEXT DEFAULT NULL
+        SQL;
+
+        DB::statement($sql2);
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        // Schema::table('process_orders', function (Blueprint $table) {
+        //     //
+        // });
+    }
+};