changed logic in process order report
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 17s
Gemini PR Review / Gemini PR Review (pull_request) Failing after 16s
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (pull_request) Successful in 15s
Laravel Pint / pint (pull_request) Successful in 7m14s
Laravel Larastan / larastan (pull_request) Failing after 7m32s
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 17s
Gemini PR Review / Gemini PR Review (pull_request) Failing after 16s
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (pull_request) Successful in 15s
Laravel Pint / pint (pull_request) Successful in 7m14s
Laravel Larastan / larastan (pull_request) Failing after 7m32s
This commit is contained in:
@@ -87,13 +87,13 @@ class SendProcessOrderReport extends Command
|
||||
// ->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');
|
||||
$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')
|
||||
@@ -126,17 +126,20 @@ class SendProcessOrderReport extends Command
|
||||
|
||||
$processOrder = $order->process_order;
|
||||
|
||||
$total = $statusCounts[$processOrder]->total_count ?? 0;
|
||||
$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)
|
||||
// Calculate percentages using OK + Not OK records
|
||||
$validTotal = $ok + $notOk;
|
||||
|
||||
$notOkPerc = $validTotal > 0
|
||||
? round(($notOk / $validTotal) * 100, 2)
|
||||
: 0;
|
||||
|
||||
$okPerc = $total > 0
|
||||
? round(($ok / $total) * 100, 2)
|
||||
$okPerc = $validTotal > 0
|
||||
? round(($ok / $validTotal) * 100, 2)
|
||||
: 0;
|
||||
|
||||
$tableData[] = [
|
||||
|
||||
Reference in New Issue
Block a user