poc/pds
1
0
Fork 1
Code Issues Pull Requests 8 Actions Packages Projects Releases Wiki Activity

Merge pull request 'ranjith-dev' (#11) from ranjith-dev into master
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 11s
Details

Browse Source 
Reviewed-on: #11
This commit was merged in pull request #11.
This commit is contained in:
jothi
2025-11-26 14:17:41 +00:00
parent 0b0bb90efb 73d863b200
commit 5fdced003a
5 changed files with 194 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Filament/Exports/ProcessOrderExporter.php
View File

@@ -14,6 +14,7 @@ class ProcessOrderExporter extends Exporter
public static function getColumns(): array public static function getColumns(): array
{ {
static $rowNumber = 0; static $rowNumber = 0;
return [ return [
ExportColumn::make('no') ExportColumn::make('no')
->label('NO') ->label('NO')
@@ -21,8 +22,8 @@ class ProcessOrderExporter extends Exporter
// Increment and return the row number // Increment and return the row number
return ++$rowNumber; return ++$rowNumber;
}), }),
ExportColumn::make('plant.name') ExportColumn::make('plant.code')
->label('PLANT NAME'), ->label('PLANT CODE'),
ExportColumn::make('item.code') ExportColumn::make('item.code')
->label('ITEM CODE'), ->label('ITEM CODE'),
ExportColumn::make('process_order') ExportColumn::make('process_order')
@@ -33,6 +34,10 @@ class ProcessOrderExporter extends Exporter
->label('ORDER QUANTITY'), ->label('ORDER QUANTITY'),
ExportColumn::make('received_quantity') ExportColumn::make('received_quantity')
->label('RECEIVED QUANTITY'), ->label('RECEIVED QUANTITY'),
ExportColumn::make('sfg_number')
->label('SFG NUMBER'),
ExportColumn::make('machine_name')
->label('MACHINE ID'),
ExportColumn::make('created_at') ExportColumn::make('created_at')
->label('CREATED AT'), ->label('CREATED AT'),
ExportColumn::make('updated_at') ExportColumn::make('updated_at')

42
app/Filament/Imports/ProcessOrderImporter.php
View File

@@ -6,11 +6,11 @@ use App\Models\Item;
use App\Models\Plant; use App\Models\Plant;
use App\Models\ProcessOrder; use App\Models\ProcessOrder;
use App\Models\User; use App\Models\User;
use Filament\Actions\Imports\Exceptions\RowImportFailedException;
use Filament\Actions\Imports\ImportColumn; use Filament\Actions\Imports\ImportColumn;
use Filament\Actions\Imports\Importer; use Filament\Actions\Imports\Importer;
use Filament\Actions\Imports\Models\Import; use Filament\Actions\Imports\Models\Import;
use Str; use Str;
use Filament\Actions\Imports\Exceptions\RowImportFailedException;
class ProcessOrderImporter extends Importer class ProcessOrderImporter extends Importer
{ {
@@ -21,27 +21,28 @@ class ProcessOrderImporter extends Importer
return [ return [
ImportColumn::make('plant') ImportColumn::make('plant')
->requiredMapping() ->requiredMapping()
->exampleHeader('Plant Code') ->exampleHeader('PLANT CODE')
->example('1000') ->example('1000')
->label('Plant Code') ->label('PLANT CODE')
->relationship(resolveUsing: 'code') ->relationship(resolveUsing: 'code')
->rules(['required']), ->rules(['required']),
ImportColumn::make('item') ImportColumn::make('item')
->requiredMapping() ->requiredMapping()
->exampleHeader('Item Code') ->exampleHeader('ITEM CODE')
->example('123456') ->example('123456')
->label('Item Code') ->label('ITEM CODE')
->relationship(resolveUsing: 'code') ->relationship(resolveUsing: 'code')
->rules(['required']), ->rules(['required']),
ImportColumn::make('process_order') ImportColumn::make('process_order')
->exampleHeader('Process Order') ->exampleHeader('PROCESS ORDER')
->example('200000166843') ->example('202500123456')
->label('Process Order') ->label('PROCESS ORDER')
->rules(['required']), ->rules(['required']),
ImportColumn::make('created_by') ImportColumn::make('created_by')
->exampleHeader('Created By') ->exampleHeader('CREATED BY')
->example('RAW01234') ->example('RAW01234')
->label('Created By'), ->label('CREATED BY')
->rules(['required']),
]; ];
} }
@@ -53,25 +54,22 @@ class ProcessOrderImporter extends Importer
$iCode = trim($this->data['item']); $iCode = trim($this->data['item']);
if (! $plant) { if (! $plant) {
$warnMsg[] = "Plant not found"; $warnMsg[] = 'Plant not found';
} } elseif (Str::length($iCode) < 6 || ! ctype_alnum($iCode)) {
else if (Str::length($iCode) < 6 || !ctype_alnum($iCode)) { $warnMsg[] = 'Invalid item code found';
$warnMsg[] = "Invalid item code found"; } elseif (! $itemCode) {
} $warnMsg[] = 'Item Code not found';
else if(!$itemCode)
{
$warnMsg[] = "Item Code not found";
} }
$processOrder = trim($this->data['process_order'] ?? ''); $processOrder = trim($this->data['process_order'] ?? '');
if ($processOrder == '') { if ($processOrder == '') {
$warnMsg[] = "Process Order cannot be empty"; $warnMsg[] = 'Process Order cannot be empty';
} }
$user = User::where('name', $this->data['created_by'])->first(); $user = User::where('name', $this->data['created_by'])->first();
if (! $user) { if (! $user) {
$warnMsg[] = "User not found"; $warnMsg[] = 'User not found';
} }
if ($plant && $processOrder != '') { if ($plant && $processOrder != '') {
@@ -81,7 +79,7 @@ class ProcessOrderImporter extends Importer
->first(); ->first();
if ($existingOrder && $existingOrder->item_id !== ($itemCode->id ?? null)) { 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';
} }
} }
@@ -93,7 +91,7 @@ class ProcessOrderImporter extends Importer
'plant_id' => $plant->id, 'plant_id' => $plant->id,
'item_id' => $itemCode->id, 'item_id' => $itemCode->id,
'process_order' => trim($this->data['process_order']), 'process_order' => trim($this->data['process_order']),
'coil_number' => "0", 'coil_number' => '0',
'order_quantity' => 0, 'order_quantity' => 0,
'received_quantity' => 0, 'received_quantity' => 0,
'created_by' => $user->name, 'created_by' => $user->name,

63
app/Filament/Resources/ProcessOrderResource.php
View File

@@ -2,29 +2,28 @@
namespace App\Filament\Resources; 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\Pages;
use App\Filament\Resources\ProcessOrderResource\RelationManagers;
use App\Models\Plant; use App\Models\Plant;
use App\Models\ProcessOrder; use App\Models\ProcessOrder;
use Filament\Facades\Filament;
use Filament\Forms; use Filament\Forms;
use Filament\Forms\Components\Actions\Action;
use Filament\Forms\Form; use Filament\Forms\Form;
use Filament\Forms\Get;
use Filament\Forms\Set;
use Filament\Notifications\Notification;
use Filament\Resources\Resource; use Filament\Resources\Resource;
use Filament\Tables; use Filament\Tables;
use Filament\Tables\Actions\ExportAction;
use Filament\Tables\Actions\ImportAction;
use Filament\Tables\Table; use Filament\Tables\Table;
use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\SoftDeletingScope; use Illuminate\Database\Eloquent\SoftDeletingScope;
use Storage;
use Livewire\Features\SupportFileUploads\TemporaryUploadedFile; use Livewire\Features\SupportFileUploads\TemporaryUploadedFile;
use Filament\Notifications\Notification;
use Filament\Forms\Components\Actions\Action;
use Filament\Facades\Filament;
use Smalot\PdfParser\Parser; use Smalot\PdfParser\Parser;
use Filament\Tables\Actions\ExportAction; use Storage;
use Filament\Tables\Actions\ImportAction;
use App\Filament\Exports\ProcessOrderExporter;
use App\Filament\Imports\ProcessOrderImporter;
use Filament\Forms\Get;
use Filament\Forms\Set;
class ProcessOrderResource extends Resource class ProcessOrderResource extends Resource
{ {
@@ -44,6 +43,7 @@ class ProcessOrderResource extends Resource
->relationship('plant', 'name') ->relationship('plant', 'name')
->options(function (callable $get) { ->options(function (callable $get) {
$userHas = Filament::auth()->user()->plant_id; $userHas = Filament::auth()->user()->plant_id;
return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::pluck('name', 'id')->toArray(); return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::pluck('name', 'id')->toArray();
}) })
->required(), ->required(),
@@ -58,6 +58,7 @@ class ProcessOrderResource extends Resource
if (empty($plantId)) { if (empty($plantId)) {
return []; return [];
} }
return \App\Models\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) { ->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
@@ -119,6 +120,12 @@ class ProcessOrderResource extends Resource
->label('Received Quantity') ->label('Received Quantity')
->default('0') ->default('0')
->required(), ->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') Forms\Components\FileUpload::make('attachment')
->label('PDF Upload') ->label('PDF Upload')
->acceptedFileTypes(['application/pdf']) ->acceptedFileTypes(['application/pdf'])
@@ -133,8 +140,7 @@ class ProcessOrderResource extends Resource
->action(function ($get, callable $set) { ->action(function ($get, callable $set) {
$uploadedFiles = $get('attachment'); $uploadedFiles = $get('attachment');
if (is_array($uploadedFiles) && count($uploadedFiles) > 0) if (is_array($uploadedFiles) && count($uploadedFiles) > 0) {
{
$uploaded = reset($uploadedFiles); $uploaded = reset($uploadedFiles);
if ($uploaded instanceof TemporaryUploadedFile) { if ($uploaded instanceof TemporaryUploadedFile) {
@@ -148,6 +154,7 @@ class ProcessOrderResource extends Resource
->body("The file '{$originalName}' already exists in uploads/ProcessOrder.") ->body("The file '{$originalName}' already exists in uploads/ProcessOrder.")
->warning() ->warning()
->send(); ->send();
return; // Stop here return; // Stop here
} }
@@ -161,20 +168,17 @@ class ProcessOrderResource extends Resource
$fullPath = storage_path('app/'.$storedPath); $fullPath = storage_path('app/'.$storedPath);
// Parse PDF using smalot/pdfparser // Parse PDF using smalot/pdfparser
$parser = new Parser(); $parser = new Parser;
$pdf = $parser->parseContent(file_get_contents($uploaded->getRealPath())); $pdf = $parser->parseContent(file_get_contents($uploaded->getRealPath()));
$text = $pdf->getText(); $text = $pdf->getText();
// if (preg_match('/Batch ID:\s*(\d+)\s*--/i', $text, $matches)) // if (preg_match('/Batch ID:\s*(\d+)\s*--/i', $text, $matches))
// { // {
// $batchId = $matches[1]; // $batchId = $matches[1];
// } // }
if (preg_match('/Batch ID:\s*(\d+)(?:\s*--)?/i', $text, $matches)) { if (preg_match('/Batch ID:\s*(\d+)(?:\s*--)?/i', $text, $matches)) {
$batchId = $matches[1]; $batchId = $matches[1];
} } else {
else
{
$batchId = null; $batchId = null;
} }
@@ -187,11 +191,11 @@ class ProcessOrderResource extends Resource
->body("Batch ID ($batchId) does not match Process Order ($processOrder)") ->body("Batch ID ($batchId) does not match Process Order ($processOrder)")
->danger() ->danger()
->send(); ->send();
return; return;
} }
if ($batchId == $processOrder) if ($batchId == $processOrder) {
{
// If batch matches, store the PDF permanently // If batch matches, store the PDF permanently
$storedPath = $uploaded->storeAs( $storedPath = $uploaded->storeAs(
'uploads/ProcessOrder', 'uploads/ProcessOrder',
@@ -204,16 +208,16 @@ class ProcessOrderResource extends Resource
->body("Batch ID matches Process Order: $batchId. PDF uploaded successfully.") ->body("Batch ID matches Process Order: $batchId. PDF uploaded successfully.")
->success() ->success()
->send(); ->send();
return; return;
} }
} }
} } else {
else
{
Notification::make() Notification::make()
->title('No file selected to upload') ->title('No file selected to upload')
->warning() ->warning()
->send(); ->send();
return; return;
} }
}), }),
@@ -228,6 +232,7 @@ class ProcessOrderResource extends Resource
->title('No process order entered') ->title('No process order entered')
->danger() ->danger()
->send(); ->send();
return; return;
} }
@@ -246,6 +251,7 @@ class ProcessOrderResource extends Resource
->title('PDF not found for this process order') ->title('PDF not found for this process order')
->danger() ->danger()
->send(); ->send();
return; return;
} }
@@ -312,6 +318,7 @@ class ProcessOrderResource extends Resource
$paginator = $livewire->getTableRecords(); $paginator = $livewire->getTableRecords();
$perPage = method_exists($paginator, 'perPage') ? $paginator->perPage() : 10; $perPage = method_exists($paginator, 'perPage') ? $paginator->perPage() : 10;
$currentPage = method_exists($paginator, 'currentPage') ? $paginator->currentPage() : 1; $currentPage = method_exists($paginator, 'currentPage') ? $paginator->currentPage() : 1;
return ($currentPage - 1) * $perPage + $rowLoop->iteration; return ($currentPage - 1) * $perPage + $rowLoop->iteration;
}), }),
Tables\Columns\TextColumn::make('plant.name') Tables\Columns\TextColumn::make('plant.name')
@@ -349,6 +356,16 @@ class ProcessOrderResource extends Resource
->alignCenter() ->alignCenter()
->searchable() ->searchable()
->sortable(), ->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') Tables\Columns\TextColumn::make('created_at')
->label('Created At') ->label('Created At')
->alignCenter() ->alignCenter()

23
app/Models/ProcessOrder.php
View File

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

38
database/migrations/2025_11_26_160752_add_sfg_number_and_machine_name_columns_to_process_orders.php Normal file
View File

@@ -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) {
// //
// });
}
};