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

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

Browse Source 
Reviewed-on: #1112
This commit was merged in pull request #1112.
This commit is contained in:
jothi
2026-09-29 05:08:14 +00:00
parent 0137533f32 71358225ff
commit b9c62cb672
2 changed files with 151 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
app/Console/Commands/SendProductionReport.php
View File

@@ -249,6 +249,33 @@ class SendProductionReport extends Command
$efficiency = 0;
}
$dayShiftPlanQuan = ($totalTargetQuantity / 2);
$nightShiftPlanQuan = ($totalTargetQuantity / 2);
if (strtolower($line->type) == 'fg line') {
$dayproductionQuantity = \App\Models\QualityValidation::where('plant_id', $plant->id)
->where('line_id', $line->id)
->whereBetween('created_at', [
$startDate->copy()->setTime(8, 0, 0),
$endDate->copy()->setTime(19, 30, 0),
])
->count();
$nightproductionQuantity = \App\Models\QualityValidation::where('plant_id', $plant->id)
->where('line_id', $line->id)
->whereBetween('created_at', [
$startDate->copy()->setTime(19, 30, 0),
$endDate->copy()->addDay()->setTime(8, 0, 0),
])
->count();
}
$dayShiftEfficiency = $dayShiftPlanQuan > 0 ? ($dayproductionQuantity / $dayShiftPlanQuan) * 100 : 0;
$nightShiftEfficiency = $dayShiftPlanQuan > 0 ? ($nightproductionQuantity / $nightShiftPlanQuan) * 100 : 0;
$efficiency = round($efficiency, 2);
$tableData[] = [
@@ -257,6 +284,12 @@ class SendProductionReport extends Command
'type' => $line->type,
'line' => $line->name,
'capacityQuantity' => floor($capacityQuan),
'dayShiftPlanQuantity' => floor($dayShiftPlanQuan),
'dayShiftActualQuantity' => floor($dayShiftPlanQuan),
'dayShiftEfficiency' => floor($dayShiftEfficiency),
'nightShiftPlanQuantity' => floor($nightShiftPlanQuan),
'nightShiftActualQuantity' => floor($nightShiftPlanQuan),
'nightShiftEfficiency' => floor($nightShiftEfficiency),
'targetQuantity' => floor($totalTargetQuantity),
'productionQuantity' => $productionQuantity,
'efficiency' => $efficiency . '%',

128
resources/views/mail/production_report.blade.php
View File

@@ -55,15 +55,26 @@
</tbody>
</table> --}}
<table style="table-layout: auto; width: 100%; border-collapse: collapse;">
{{-- <table style="table-layout: auto; width: 100%; border-collapse: collapse;">
<thead>
<tr>
<th style="text-align: center; border: 1px solid #444; padding: 8px; background: #f2f2f2;">No</th>
<th style="text-align: center; border: 1px solid #444; padding: 8px; background: #f2f2f2; white-space: nowrap;">Plant</th>
<th style="text-align: center; border: 1px solid #444; padding: 8px; background: #f2f2f2; white-space: nowrap;">Line</th>
<th style="text-align: center; border: 1px solid #444; padding: 8px; background: #f2f2f2;">Line Type</th>
{{-- <th style="text-align: center; border: 1px solid #444; padding: 8px; background: #f2f2f2;">Capacity Quantity</th> --}}
<th style="text-align: center; border: 1px solid #444; padding: 8px; background: #f2f2f2;">Plan Quantity</th>
<th style="text-align: center; border: 1px solid #444; padding: 8px; background: #f2f2f2;">Line Type</th> --}}
{{-- <th style="text-align: center; border: 1px solid #444; padding: 8px; background: #f2f2f2;">Plan Quantity</th> --}}
{{-- <th style="border:1px solid #ccc; padding:0; background:#f2f2f2; width:300px;">
<div style="text-align:center; padding:8px; border-bottom:1px solid #ccc;">
Plan Quantity
</div>
<table style="width:100%; border-collapse:collapse; table-layout:fixed;">
<tr>
<th style="width:33.33%; text-align:center; padding:8px; border-right:1px solid #ccc; background:#f2f2f2;">Day Shift</th>
<th style="width:33.33%; text-align:center; padding:8px; border-right:1px solid #ccc; background:#f2f2f2;">Plan Quantity</th>
<th style="width:33.33%; text-align:center; padding:8px; background:#f2f2f2;">Efficiency</th>
</tr>
</table>
</th>
<th style="text-align: center; border: 1px solid #444; padding: 8px; background: #f2f2f2;">Actual Quantity</th>
<th style="text-align: center; border: 1px solid #444; padding: 8px; background: #f2f2f2;">Plan Vs Actual Efficiency(%)</th>
</tr>
@@ -72,7 +83,7 @@
@foreach($tableData as $row)
@php $efficiency = (float) $row['efficiency']; if ($efficiency < 80) { $bgColor = '#ff4d4d';
}
elseif ($efficiency < 99) { $bgColor = '#ffd633';
elseif ($efficiency < 95) { $bgColor = '#ffd633';
}
else { $bgColor = '#4caf50';
} @endphp
@@ -80,17 +91,26 @@
<td style="border: 1px solid #444; padding: 8px; text-align: center;">{{ $row['no'] }}</td>
<td style="border: 1px solid #444; padding: 8px; text-align: center; white-space: nowrap;">{{ $row['plant'] }}</td>
<td style="border: 1px solid #444; padding: 8px; text-align: center; white-space: nowrap;">{{ $row['line'] }}</td>
<td style="border: 1px solid #444; padding: 8px; text-align: center;">{{ $row['type'] }}</td>
<td style="border: 1px solid #444; padding: 8px; text-align: center;">{{ $row['type'] }}</td> --}}
{{-- <td style="border: 1px solid #444; padding: 8px; text-align: center;">{{ $row['capacityQuantity'] }}</td> --}}
<td style="border: 1px solid #444; padding: 8px; text-align: center;">{{ $row['targetQuantity'] }}</td>
<td style="border: 1px solid #444; padding: 8px; text-align: center;">{{ $row['productionQuantity'] }}</td>
{{-- <td style="border: 1px solid #444; padding: 8px; text-align: center;">{{ $row['targetQuantity'] }}</td> --}}
{{-- <td style="border:1px solid #444; padding:0; width:300px;">
<table style="width:100%; border-collapse:collapse; table-layout:fixed;">
<tr>
<td style="width:33.33%; text-align:center; padding:8px; border-right:1px solid #444;">{{ $row['dayShift'] ?? '-' }}</td>
<td style="width:33.33%; text-align:center; padding:8px; border-right:1px solid #444;">{{ $row['targetQuantity'] }}</td>
<td style="width:33.33%; text-align:center; padding:8px;">{{ $row['planEfficiency'] ?? '-' }}</td>
</tr>
</table>
</td>
<td style="border: 1px solid #444; padding: 8px; text-align: center;">{{ $row['productionQuantity'] }}</td> --}}
{{-- <td style="border: 1px solid #444; padding: 8px; text-align: center;">{{ $row['efficiency'] }}</td> --}}
<td style="
{{-- <td style="
border: 1px solid #444;
padding: 8px;
text-align: center;
background-color: {{ $bgColor }};
color: {{ $efficiency < 80 || $efficiency >= 99 ? '#ffffff' : '#000000' }};
color: {{ $efficiency < 80 || $efficiency >= 95 ? '#ffffff' : '#000000' }};
font-weight: bold;
">
{{ $row['efficiency'] }}
@@ -98,6 +118,94 @@
</tr>
@endforeach
</tbody>
</table> --}}
{{-- new logic --}}
<table style="width: 100%; border-collapse: collapse; table-layout: auto;">
<thead>
<tr>
<th rowspan="2" style="border:1px solid #444; padding:8px; background:#f2f2f2; vertical-align:middle;">No</th>
<th rowspan="2" style="border:1px solid #444; padding:8px; background:#f2f2f2; vertical-align:middle;">Plant</th>
<th rowspan="2" style="border:1px solid #444; padding:8px; background:#f2f2f2; vertical-align:middle;">Line</th>
<th rowspan="2" style="border:1px solid #444; padding:8px; background:#f2f2f2; vertical-align:middle;">Line Type</th>
<th colspan="3" style="border:1px solid #444; padding:8px; background:#f2f2f2; text-align:center;">
Day Shift
</th>
<th colspan="3" style="border:1px solid #444; padding:8px; background:#f2f2f2; text-align:center;">
Night Shift
</th>
<th rowspan="2" style="border:1px solid #444; padding:8px; background:#f2f2f2; vertical-align:middle;">Plan Quantity</th>
<th rowspan="2" style="border:1px solid #444; padding:8px; background:#f2f2f2; vertical-align:middle;">Actual Quantity</th>
<th rowspan="2" style="border:1px solid #444; padding:8px; background:#f2f2f2; vertical-align:middle;">Plan Vs Actual Efficiency(%)</th>
</tr>
<tr>
<th style="border:1px solid #444; padding:8px; background:#f2f2f2; text-align:center;">Plan Quantity</th>
<th style="border:1px solid #444; padding:8px; background:#f2f2f2; text-align:center;">Actual Quantity</th>
<th style="border:1px solid #444; padding:8px; background:#f2f2f2; text-align:center;">Plan Vs Actual Efficiency(%)</th>
<th style="border:1px solid #444; padding:8px; background:#f2f2f2; text-align:center;">Plan Quantity</th>
<th style="border:1px solid #444; padding:8px; background:#f2f2f2; text-align:center;">Actual Quantity</th>
<th style="border:1px solid #444; padding:8px; background:#f2f2f2; text-align:center;">Plan Vs Actual Efficiency(%)</th>
</tr>
</thead>
<tbody>
@foreach($tableData as $row)
@php $efficiency = (float) $row['efficiency']; if ($efficiency < 80) { $bgColor = '#ff4d4d';
}
elseif ($efficiency < 95) { $bgColor = '#ffd633';
}
else { $bgColor = '#4caf50';
} @endphp
<tr>
<td style="border: 1px solid #444; padding: 8px; text-align: center;">{{ $row['no'] }}</td>
<td style="border: 1px solid #444; padding: 8px; text-align: center; white-space: nowrap;">{{ $row['plant'] }}</td>
<td style="border: 1px solid #444; padding: 8px; text-align: center; white-space: nowrap;">{{ $row['line'] }}</td>
<td style="border: 1px solid #444; padding: 8px; text-align: center;">{{ $row['type'] }}</td>
<td style="text-align:center; border:1px solid #444; padding:8px;">
{{ $row['dayShiftPlanQuantity'] }}
</td>
<td style="text-align:center; border:1px solid #444; padding:8px;">
{{ $row['dayShiftActualQuantity'] }}
</td>
<td style="text-align:center; border:1px solid #444; padding:8px;">
{{ $row['dayShiftEfficiency'] }}
</td>
<td style="text-align:center; border:1px solid #444; padding:8px;">
{{ $row['nightShiftPlanQuantity'] }}
</td>
<td style="text-align:center; border:1px solid #444; padding:8px;">
{{ $row['nightShiftActualQuantity'] }}
</td>
<td style="text-align:center; border:1px solid #444; padding:8px;">
{{ $row['nightShiftEfficiency'] }}
</td>
<td style="text-align:center; border:1px solid #444; padding:8px;">
{{ $row['targetQuantity'] }}
</td>
<td style="text-align:center; border:1px solid #444; padding:8px;">
{{ $row['productionQuantity'] }}
</td>
<td style="text-align:center; border:1px solid #444; padding:8px;">
{{ $row['efficiency'] }}
</td>
</tr>
@endforeach
</tbody>
</table>
<p>{!! $wishes !!}</p>