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

Merge pull request 'ranjith-dev' (#330) from ranjith-dev into master
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Has been cancelled
Details

Browse Source 
Reviewed-on: #330
This commit was merged in pull request #330.
This commit is contained in:
jothi
2026-02-12 05:41:41 +00:00
parent be5d02bc50 96aca2697f
commit 4ffc2d7a92
2 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/Filament/Resources/RequestCharacteristicResource.php
View File

@@ -910,6 +910,7 @@ class RequestCharacteristicResource extends Resource
->sortable(),
Tables\Columns\TextColumn::make('characteristic_name')
->label('Characteristic Name')
->default('-')
->alignCenter()
->searchable()
->formatStateUsing(fn (string $state): string => strtoupper(__($state)))
@@ -917,13 +918,21 @@ class RequestCharacteristicResource extends Resource
->sortable(),
Tables\Columns\TextColumn::make('current_value')
->label('Current Value')
->default('-')
->alignCenter()
->searchable()
->formatStateUsing(function ($record) {
return empty($record->characteristic_name) ? '-' : $record->current_value;
})
->sortable(),
Tables\Columns\TextColumn::make('update_value')
->label('Update Value')
->default('-')
->alignCenter()
->searchable()
->formatStateUsing(function ($record) {
return empty($record->characteristic_name) ? '-' : $record->update_value;
})
->sortable(),
Tables\Columns\TextColumn::make('characteristicApproverMaster.name1')
->label('Approver Name 1')
@@ -1011,8 +1020,21 @@ class RequestCharacteristicResource extends Resource
->sortable(),
Tables\Columns\TextColumn::make('mail_status')
->label('Mail Status')
->default('-')
->alignCenter()
->searchable()
->formatStateUsing(function ($state) {
if (! $state || $state == '' || $state == null) {
return '-';
}
return match ($state) {
'Sent' => 'Sent-Mail1',
'Sent-Mail2' => 'Sent-Mail2',
'Sent-Mail3' => 'Sent-Mail3',
default => '-',
};
})
->sortable()
->toggleable(isToggledHiddenByDefault: true),
Tables\Columns\TextColumn::make('trigger_at')

11
app/Http/Controllers/PdfController.php
View File

@@ -590,6 +590,13 @@ class PdfController extends Controller
->orderBy('id', 'desc')
->first();
$lastRecord1 = ProcessOrder::with('item')
->where('plant_id', $plant->id)
->where('process_order', $processOrder)
->where('rework_status', 0)
->orderBy('id', 'desc')
->first();
$totalReceivedQty = $processOrderRecords->sum('received_quantity');
// $lastRecord = $processOrderRecords->first();
$item = $lastRecord->item;
@@ -612,12 +619,14 @@ class PdfController extends Controller
$notOkQty = CharacteristicValue::where('plant_id', $plant->id)->where('process_order', $processOrder)->where('status', 'NotOk')->get()->count();
$currentCoil = ($lastRecord->rework_status == 1) ? (string) $lastRecord1->coil_number : (string) $lastRecord->coil_number;
return response()->json([
'item_code' => $item?->code ?? '',
'description' => $item?->description ?? '',
// 'coil_number' => $proOrdAgPlant->coil_number ?? "",
// 'order_quantity' => (string)$proOrdAgPlant->order_quantity ?? "",
'coil_number' => (string) $lastRecord->coil_number ?? '0',
'coil_number' => $currentCoil,
'order_quantity' => (string) $lastRecord->order_quantity ?? '0.000',
'ok_quantity' => (string) $okQty ?? '0',
'not_ok_quantity' => (string) $notOkQty ?? '0',