Merge pull request 'ranjith-dev' (#1451) from ranjith-dev into master
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 39s
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 39s
Reviewed-on: #1451
This commit was merged in pull request #1451.
This commit is contained in:
@@ -86,6 +86,28 @@ class SendProcessOrderReport extends Command
|
||||
// ->with(['line', 'item'])
|
||||
// ->get();
|
||||
|
||||
// Total coils grouped by process order
|
||||
$processOrderTotals = DB::table('process_orders')
|
||||
->where('plant_id', $plant->id)
|
||||
->where('coil_number', '!=', 0)
|
||||
->selectRaw('process_order, COUNT(*) AS total_count')
|
||||
->groupBy('process_order')
|
||||
->get()
|
||||
->keyBy('process_order');
|
||||
|
||||
// OK and Not OK counts grouped by process order
|
||||
$statusCounts = DB::table('characteristic_values')
|
||||
->where('plant_id', $plant->id)
|
||||
->whereBetween('created_at', [$startDate, $endDate])
|
||||
->selectRaw("
|
||||
process_order,
|
||||
SUM(CASE WHEN status = 'NotOk' THEN 1 ELSE 0 END) AS notok_count,
|
||||
SUM(CASE WHEN status = 'Ok' THEN 1 ELSE 0 END) AS ok_count
|
||||
")
|
||||
->groupBy('process_order')
|
||||
->get()
|
||||
->keyBy('process_order');
|
||||
|
||||
$latestRecords = ProcessOrder::query()
|
||||
->where('plant_id', $plant->id)
|
||||
->whereBetween('created_at', [$startDate, $endDate])
|
||||
@@ -102,6 +124,22 @@ class SendProcessOrderReport extends Command
|
||||
|
||||
foreach ($latestRecords as $order) {
|
||||
|
||||
$processOrder = $order->process_order;
|
||||
|
||||
$total = $processOrderTotals[$processOrder]->total_count ?? 0;
|
||||
|
||||
$notOk = $statusCounts[$processOrder]->notok_count ?? 0;
|
||||
$ok = $statusCounts[$processOrder]->ok_count ?? 0;
|
||||
|
||||
// Calculate percentages
|
||||
$notOkPerc = $total > 0
|
||||
? round(($notOk / $total) * 100, 2)
|
||||
: 0;
|
||||
|
||||
$okPerc = $total > 0
|
||||
? round(($ok / $total) * 100, 2)
|
||||
: 0;
|
||||
|
||||
$tableData[] = [
|
||||
'no' => $no++,
|
||||
'plant' => $plant->name,
|
||||
@@ -114,79 +152,82 @@ class SendProcessOrderReport extends Command
|
||||
'recQuan' => $receivedSummary[$order->process_order] ?? 0,
|
||||
'scrapQuan' => $order->scrap_quantity,
|
||||
'sfgNo' => $order->sfg_number,
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
$noNotOk = 1;
|
||||
|
||||
$NotOkData = [];
|
||||
|
||||
foreach ($plants as $plant) {
|
||||
|
||||
$processOrderTotals = DB::table('process_orders')
|
||||
->where('plant_id', $plant->id)
|
||||
->where('coil_number', '!=', 0)
|
||||
->selectRaw('
|
||||
process_order,
|
||||
COUNT(*) AS total_count
|
||||
')
|
||||
->groupBy('process_order')
|
||||
->get()
|
||||
->keyBy('process_order');
|
||||
|
||||
$statusCounts = DB::table('characteristic_values')
|
||||
->where('plant_id', $plant->id)
|
||||
->whereBetween('created_at', [$startDate, $endDate])
|
||||
->selectRaw("
|
||||
process_order,
|
||||
SUM(CASE WHEN status = 'NotOk' THEN 1 ELSE 0 END) AS notok_count,
|
||||
SUM(CASE WHEN status = 'Ok' THEN 1 ELSE 0 END) AS ok_count
|
||||
")
|
||||
->groupBy('process_order')
|
||||
->get()
|
||||
->keyBy('process_order');
|
||||
|
||||
$latestRecords = CharacteristicValue::query()
|
||||
->where('plant_id', $plant->id)
|
||||
->whereBetween('created_at', [$startDate, $endDate])
|
||||
->orderBy('process_order')
|
||||
->orderByDesc('created_at')
|
||||
->distinct('process_order')
|
||||
->with(['line', 'item'])
|
||||
->get();
|
||||
|
||||
foreach ($latestRecords as $order) {
|
||||
|
||||
$processOrder = $order->process_order;
|
||||
|
||||
$total = $processOrderTotals[$processOrder]->total_count ?? 0;
|
||||
$notOk = $statusCounts[$processOrder]->notok_count ?? 0;
|
||||
$ok = $statusCounts[$processOrder]->ok_count ?? 0;
|
||||
|
||||
$notOkPerc = $total > 0
|
||||
? round(($notOk / $total) * 100, 2)
|
||||
: 0;
|
||||
|
||||
$okPerc = $total > 0
|
||||
? round(($ok / $total) * 100, 2)
|
||||
: 0;
|
||||
|
||||
|
||||
$NotOkData[] = [
|
||||
'no' => $noNotOk++,
|
||||
'plant' => $plant->name,
|
||||
'line' => $order->line?->name ?? '-',
|
||||
'machineName' => $order->machine_name,
|
||||
'item' => $order->item?->code ?? '-',
|
||||
'processOrder' => $order->process_order,
|
||||
'NotOkPerc' => $notOkPerc . '%',
|
||||
'OkPerc' => $okPerc . '%',
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
$mail = new ProcessOrderMail($scheduleType, $tableData, $NotOkData);
|
||||
// $noNotOk = 1;
|
||||
|
||||
// $NotOkData = [];
|
||||
|
||||
// foreach ($plants as $plant) {
|
||||
|
||||
// $processOrderTotals = DB::table('process_orders')
|
||||
// ->where('plant_id', $plant->id)
|
||||
// ->where('coil_number', '!=', 0)
|
||||
// ->selectRaw('
|
||||
// process_order,
|
||||
// COUNT(*) AS total_count
|
||||
// ')
|
||||
// ->groupBy('process_order')
|
||||
// ->get()
|
||||
// ->keyBy('process_order');
|
||||
|
||||
// $statusCounts = DB::table('characteristic_values')
|
||||
// ->where('plant_id', $plant->id)
|
||||
// ->whereBetween('created_at', [$startDate, $endDate])
|
||||
// ->selectRaw("
|
||||
// process_order,
|
||||
// SUM(CASE WHEN status = 'NotOk' THEN 1 ELSE 0 END) AS notok_count,
|
||||
// SUM(CASE WHEN status = 'Ok' THEN 1 ELSE 0 END) AS ok_count
|
||||
// ")
|
||||
// ->groupBy('process_order')
|
||||
// ->get()
|
||||
// ->keyBy('process_order');
|
||||
|
||||
// $latestRecords = CharacteristicValue::query()
|
||||
// ->where('plant_id', $plant->id)
|
||||
// ->whereBetween('created_at', [$startDate, $endDate])
|
||||
// ->orderBy('process_order')
|
||||
// ->orderByDesc('created_at')
|
||||
// ->distinct('process_order')
|
||||
// ->with(['line', 'item'])
|
||||
// ->get();
|
||||
|
||||
// foreach ($latestRecords as $order) {
|
||||
|
||||
// $processOrder = $order->process_order;
|
||||
|
||||
// $total = $processOrderTotals[$processOrder]->total_count ?? 0;
|
||||
// $notOk = $statusCounts[$processOrder]->notok_count ?? 0;
|
||||
// $ok = $statusCounts[$processOrder]->ok_count ?? 0;
|
||||
|
||||
// $notOkPerc = $total > 0
|
||||
// ? round(($notOk / $total) * 100, 2)
|
||||
// : 0;
|
||||
|
||||
// $okPerc = $total > 0
|
||||
// ? round(($ok / $total) * 100, 2)
|
||||
// : 0;
|
||||
|
||||
|
||||
// $NotOkData[] = [
|
||||
// 'no' => $noNotOk++,
|
||||
// 'plant' => $plant->name,
|
||||
// 'line' => $order->line?->name ?? '-',
|
||||
// 'machineName' => $order->machine_name,
|
||||
// 'item' => $order->item?->code ?? '-',
|
||||
// 'processOrder' => $order->process_order,
|
||||
// 'NotOkPerc' => $notOkPerc . '%',
|
||||
// 'OkPerc' => $okPerc . '%',
|
||||
// ];
|
||||
// }
|
||||
// }
|
||||
|
||||
// $mail = new ProcessOrderMail($scheduleType, $tableData, $NotOkData);
|
||||
$mail = new ProcessOrderMail($scheduleType, $tableData);
|
||||
$contentVars = $mail->content()->with;
|
||||
|
||||
foreach ($mailRules as $rule)
|
||||
|
||||
@@ -23,11 +23,17 @@ class ProcessOrderMail extends Mailable
|
||||
/**
|
||||
* Create a new message instance.
|
||||
*/
|
||||
public function __construct($scheduleType,$tableData = [], $NotOkData)
|
||||
// public function __construct($scheduleType,$tableData = [], $NotOkData)
|
||||
// {
|
||||
// $this->scheduleType = $scheduleType;
|
||||
// $this->tableData = $tableData ?? [];
|
||||
// $this->NotOkData = $NotOkData ?? [];
|
||||
// }
|
||||
|
||||
public function __construct($scheduleType,$tableData = [])
|
||||
{
|
||||
$this->scheduleType = $scheduleType;
|
||||
$this->tableData = $tableData ?? [];
|
||||
$this->NotOkData = $NotOkData ?? [];
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -62,7 +68,7 @@ class ProcessOrderMail extends Mailable
|
||||
'company' => "CRI Digital Manufacturing Solutions",
|
||||
'greeting' => $greeting,
|
||||
'tableData' => $this->tableData,
|
||||
'NotOkData' => $this->NotOkData,
|
||||
// 'NotOkData' => $this->NotOkData,
|
||||
'wishes' => "Thanks & Regards,<br>CRI Digital Manufacturing Solutions"
|
||||
],
|
||||
);
|
||||
|
||||
@@ -37,6 +37,8 @@
|
||||
<th style="text-align: center; border: 1px solid #444; padding: 8px; background: #f2f2f2;">Total Quantity</th>
|
||||
<th style="text-align: center; border: 1px solid #444; padding: 8px; background: #f2f2f2;">Scrap Quantity</th>
|
||||
<th style="text-align: center; border: 1px solid #444; padding: 8px; background: #f2f2f2;">SFG Number</th>
|
||||
<th style="text-align: center; border: 1px solid #444; padding: 8px; background: #f2f2f2;">Not Ok Status (%)</th>
|
||||
<th style="text-align: center; border: 1px solid #444; padding: 8px; background: #f2f2f2;">Ok Status (%)</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@@ -52,12 +54,14 @@
|
||||
<td style="border: 1px solid #444; padding: 8px; text-align: center;">{{ $row['recQuan'] }}</td>
|
||||
<td style="border: 1px solid #444; padding: 8px; text-align: center;">{{ $row['scrapQuan'] }}</td>
|
||||
<td style="border: 1px solid #444; padding: 8px; text-align: center;">{{ $row['sfgNo'] }}</td>
|
||||
<td style="border: 1px solid #444; padding: 8px; text-align: center;">{{ $row['NotOkPerc'] }}</td>
|
||||
<td style="border: 1px solid #444; padding: 8px; text-align: center;">{{ $row['OkPerc'] }}</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
<br>
|
||||
<p><b><u>Process Order Not Ok Report</u></b><p>
|
||||
{{-- <p><b><u>Process Order Not Ok Report</u></b><p>
|
||||
<table style="table-layout: auto; width: 100%; border-collapse: collapse;">
|
||||
<thead>
|
||||
<tr>
|
||||
@@ -85,7 +89,7 @@
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
</table> --}}
|
||||
|
||||
<p>{!! $wishes !!}</p>
|
||||
</body>
|
||||
|
||||
Reference in New Issue
Block a user