jothi/poc-pds1
1
0
Fork 0
forked from poc/pds
Code Pull Requests Activity

Report table column order changed and Added passing invoice name without extension while import to check status on database

Browse Source
This commit is contained in:
dhanabalan
2025-05-20 09:31:34 +05:30
parent b4116c7492
commit 1af5a7d0b6
1 changed files with 33 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
app/Filament/Resources/InvoiceValidationResource.php
View File

@@ -204,68 +204,76 @@ class InvoiceValidationResource extends Resource
->sortable(), ->sortable(),
Tables\Columns\TextColumn::make('invoice_number') Tables\Columns\TextColumn::make('invoice_number')
->label('Invoice Number') ->label('Invoice Number')
->alignCenter()
->sortable(), //->searchable() ->sortable(), //->searchable()
Tables\Columns\TextColumn::make('stickerMaster.item.code') Tables\Columns\TextColumn::make('stickerMaster.item.code')
->label('Material Code') ->label('Item Code')
->alignCenter()
->sortable(), //->searchable() ->sortable(), //->searchable()
Tables\Columns\TextColumn::make('serial_number') Tables\Columns\TextColumn::make('serial_number')
->label('Serial Number') ->label('Serial Number')
->alignCenter()
->sortable(), //->searchable() ->sortable(), //->searchable()
Tables\Columns\TextColumn::make('motor_scanned_status') Tables\Columns\TextColumn::make('motor_scanned_status')
->label('Motor Scanned Status') ->label('Motor Scanned Status')
->sortable(), ->alignCenter(),
Tables\Columns\TextColumn::make('pump_scanned_status') Tables\Columns\TextColumn::make('pump_scanned_status')
->label('Pump Scanned Status') ->label('Pump Scanned Status')
->sortable(), ->alignCenter(),
Tables\Columns\TextColumn::make('scanned_status_set') Tables\Columns\TextColumn::make('scanned_status_set')
->label('Pump Set Scanned Status') ->label('Pump Set Scanned Status')
->sortable(), ->alignCenter(),
Tables\Columns\TextColumn::make('capacitor_scanned_status') Tables\Columns\TextColumn::make('capacitor_scanned_status')
->label('Capacitor Scanned Status') ->label('Capacitor Scanned Status')
->sortable(), ->alignCenter(),
Tables\Columns\TextColumn::make('scanned_status') Tables\Columns\TextColumn::make('scanned_status')
->label('Scanned Status') ->label('Scanned Status')
->sortable(), ->alignCenter(),
Tables\Columns\TextColumn::make('panel_box_supplier') Tables\Columns\TextColumn::make('panel_box_supplier')
->label('Panel Box Supplier') ->label('Panel Box Supplier')
->sortable(), ->alignCenter(),
Tables\Columns\TextColumn::make('panel_box_serial_number') Tables\Columns\TextColumn::make('panel_box_serial_number')
->label('Panel Box Serial Number') ->label('Panel Box Serial Number')
->sortable(), ->alignCenter(),
Tables\Columns\TextColumn::make('load_rate') Tables\Columns\TextColumn::make('load_rate')
->label('Load Rate') ->label('Load Rate')
->numeric() ->numeric()
->sortable(), ->alignCenter(),
Tables\Columns\TextColumn::make('upload_status') Tables\Columns\TextColumn::make('upload_status')
->label('Upload Status') ->label('Upload Status')
->sortable(), ->alignCenter(),
Tables\Columns\TextColumn::make('batch_number') Tables\Columns\TextColumn::make('batch_number')
->label('Batch Number') ->label('Batch Number')
->sortable(), ->alignCenter(),
Tables\Columns\TextColumn::make('quantity') Tables\Columns\TextColumn::make('quantity')
->label('Quantity') ->label('Quantity')
->numeric() ->alignCenter()
->sortable(), ->numeric(),
Tables\Columns\TextColumn::make('operator_id')
->label('Operator ID')
->sortable(),
Tables\Columns\TextColumn::make('plant.name') Tables\Columns\TextColumn::make('plant.name')
->label('Plant') ->label('Plant')
->alignCenter()
->sortable(), ->sortable(),
Tables\Columns\TextColumn::make('created_at') Tables\Columns\TextColumn::make('created_at')
->label('Created At') ->label('Created At')
->dateTime() ->dateTime()
->alignCenter()
->sortable(), ->sortable(),
Tables\Columns\TextColumn::make('updated_at') Tables\Columns\TextColumn::make('updated_at')
->label('Updated At') ->label('Updated At')
->dateTime() ->dateTime()
->alignCenter()
->sortable() ->sortable()
->toggleable(isToggledHiddenByDefault: true), ->toggleable(isToggledHiddenByDefault: true),
Tables\Columns\TextColumn::make('deleted_at') Tables\Columns\TextColumn::make('deleted_at')
->label('Deleted At') ->label('Deleted At')
->dateTime() ->dateTime()
->alignCenter()
->sortable() ->sortable()
->toggleable(isToggledHiddenByDefault: true), ->toggleable(isToggledHiddenByDefault: true),
Tables\Columns\TextColumn::make('operator_id')
->label('Operator ID')
->alignCenter()
->sortable(),
]) ])
->headerActions([ ->headerActions([
@@ -316,6 +324,8 @@ class InvoiceValidationResource extends Resource
// Get original filename // Get original filename
$originalName = $uploadedFile->getClientOriginalName(); // e.g. 3RA0018732.xlsx $originalName = $uploadedFile->getClientOriginalName(); // e.g. 3RA0018732.xlsx
$originalNameOnly = pathinfo($originalName, PATHINFO_FILENAME);
// Store manually using storeAs to keep original name // Store manually using storeAs to keep original name
$path = $uploadedFile->storeAs('uploads/temp', $originalName, 'local'); // returns relative path $path = $uploadedFile->storeAs('uploads/temp', $originalName, 'local'); // returns relative path
// uploads/temp/3RA0018735.xlsx // uploads/temp/3RA0018735.xlsx
@@ -323,8 +333,8 @@ class InvoiceValidationResource extends Resource
$fullPath = Storage::disk('local')->path($path); $fullPath = Storage::disk('local')->path($path);
// /home/iot-dev/projects/pds/storage/app/private/uploads/temp/3RA0018735.xlsx // /home/iot-dev/projects/pds/storage/app/private/uploads/temp/3RA0018735.xlsx
$totQuan = InvoiceValidation::where('invoice_number', $originalName)->where('plant_id', $plantId)->count(); $totQuan = InvoiceValidation::where('invoice_number', $originalNameOnly)->where('plant_id', $plantId)->count();
$scanSQuan = InvoiceValidation::where('invoice_number', $originalName)->where('scanned_status', 'Scanned')->where('plant_id', $plantId)->count(); $scanSQuan = InvoiceValidation::where('invoice_number', $originalNameOnly)->where('scanned_status', 'Scanned')->where('plant_id', $plantId)->count();
if($totQuan == $scanSQuan && $totQuan > 0) if($totQuan == $scanSQuan && $totQuan > 0)
{ {
@@ -594,12 +604,14 @@ class InvoiceValidationResource extends Resource
// Get original filename // Get original filename
$originalName = $uploadedFile->getClientOriginalName(); $originalName = $uploadedFile->getClientOriginalName();
$originalNameOnly = pathinfo($originalName, PATHINFO_FILENAME);
$path = $uploadedFile->storeAs('uploads/temp', $originalName, 'local'); $path = $uploadedFile->storeAs('uploads/temp', $originalName, 'local');
$fullPath = Storage::disk('local')->path($path); $fullPath = Storage::disk('local')->path($path);
$totQuan = InvoiceValidation::where('invoice_number', $originalName)->where('plant_id', $plantId)->count(); $totQuan = InvoiceValidation::where('invoice_number', $originalNameOnly)->where('plant_id', $plantId)->count();
$scanMQuan = InvoiceValidation::where('invoice_number', $originalName)->whereNotNull('serial_number')->where('serial_number', '!=', '')->where('plant_id', $plantId)->count(); $scanMQuan = InvoiceValidation::where('invoice_number', $originalNameOnly)->whereNotNull('serial_number')->where('serial_number', '!=', '')->where('plant_id', $plantId)->count();
if($totQuan == $scanMQuan && $totQuan > 0) if($totQuan == $scanMQuan && $totQuan > 0)
{ {