Merge pull request 'Added laser stop consolidated report scheduler page' (#937) from ranjith-dev into master
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 12s

Reviewed-on: #937
This commit was merged in pull request #937.
This commit is contained in:
2026-08-25 03:39:45 +00:00

View File

@@ -436,42 +436,42 @@ class Scheduler extends Command
//..Laser Stop Final Report
// $laserStopFinalReport = AlertMailRule::where('module', 'LaserStopReport')
// ->where('rule_name', 'LaserStopMail')
// ->select('plant', 'schedule_type', 'machine_id')
// ->distinct()
// ->get();
$laserStopFinalReport = AlertMailRule::where('module', 'LaserStopReport')
->where('rule_name', 'LaserStopMail')
->select('plant', 'schedule_type', 'machine_id')
->distinct()
->get();
// foreach ($laserStopFinalReport as $rule) {
// switch ($rule->schedule_type) {
// case 'Live':
// // Run every minute
// \Artisan::call('send:laser-stop-consolidate-report', [
// 'schedule_type' => $rule->schedule_type,
// 'plant' => $rule->plant,
// 'machine_id' => $rule->machine_id,
// ]);
// break;
// case 'Hourly':
// if (now()->minute == 0) {
// \Artisan::call('send:laser-stop-consolidate-report', [
// 'schedule_type' => $rule->schedule_type,
// 'plant' => $rule->plant,
// 'machine_id' => $rule->machine_id,
// ]);
// }
// break;
// case 'Daily':
// if (now()->format('H:i') == '07:59') {
// \Artisan::call('send:laser-stop-consolidate-report', [
// 'schedule_type' => $rule->schedule_type,
// 'plant' => $rule->plant,
// 'machine_id' => $rule->machine_id,
// ]);
// }
// break;
// }
// }
foreach ($laserStopFinalReport as $rule) {
switch ($rule->schedule_type) {
case 'Live':
// Run every minute
\Artisan::call('send:laser-stop-consolidate-report', [
'schedule_type' => $rule->schedule_type,
'plant' => $rule->plant,
'machine_id' => $rule->machine_id,
]);
break;
case 'Hourly':
if (now()->minute == 0) {
\Artisan::call('send:laser-stop-consolidate-report', [
'schedule_type' => $rule->schedule_type,
'plant' => $rule->plant,
'machine_id' => $rule->machine_id,
]);
}
break;
case 'Daily':
if (now()->format('H:i') == '08:00') {
\Artisan::call('send:laser-stop-consolidate-report', [
'schedule_type' => $rule->schedule_type,
'plant' => $rule->plant,
'machine_id' => $rule->machine_id,
]);
}
break;
}
}
}
/**