Merge pull request 'changed logic in process order report' (#1453) from ranjith-dev into master
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 19s

Reviewed-on: #1453
This commit was merged in pull request #1453.
This commit is contained in:
2026-11-17 11:18:52 +00:00

View File

@@ -87,13 +87,13 @@ class SendProcessOrderReport extends Command
// ->get(); // ->get();
// Total coils grouped by process order // Total coils grouped by process order
// $processOrderTotals = DB::table('process_orders') $processOrderTotals = DB::table('process_orders')
// ->where('plant_id', $plant->id) ->where('plant_id', $plant->id)
// ->where('coil_number', '!=', 0) ->where('coil_number', '!=', 0)
// ->selectRaw('process_order, COUNT(*) AS total_count') ->selectRaw('process_order, COUNT(*) AS total_count')
// ->groupBy('process_order') ->groupBy('process_order')
// ->get() ->get()
// ->keyBy('process_order'); ->keyBy('process_order');
// OK and Not OK counts grouped by process order // OK and Not OK counts grouped by process order
$statusCounts = DB::table('characteristic_values') $statusCounts = DB::table('characteristic_values')
@@ -126,17 +126,20 @@ class SendProcessOrderReport extends Command
$processOrder = $order->process_order; $processOrder = $order->process_order;
$total = $statusCounts[$processOrder]->total_count ?? 0; $total = $processOrderTotals[$processOrder]->total_count ?? 0;
$notOk = $statusCounts[$processOrder]->notok_count ?? 0; $notOk = $statusCounts[$processOrder]->notok_count ?? 0;
$ok = $statusCounts[$processOrder]->ok_count ?? 0; $ok = $statusCounts[$processOrder]->ok_count ?? 0;
$notOkPerc = $total > 0 // Calculate percentages using OK + Not OK records
? round(($notOk / $total) * 100, 2) $validTotal = $ok + $notOk;
$notOkPerc = $validTotal > 0
? round(($notOk / $validTotal) * 100, 2)
: 0; : 0;
$okPerc = $total > 0 $okPerc = $validTotal > 0
? round(($ok / $total) * 100, 2) ? round(($ok / $validTotal) * 100, 2)
: 0; : 0;
$tableData[] = [ $tableData[] = [