add requested machines #26

Merged
amirghasempoor merged 1 commits from feature/AddEndKm into develop 2026-06-15 07:37:53 +00:00

View File

@@ -134,7 +134,7 @@ class RequestPortalController extends Controller
// $rpc->store($mission); // $rpc->store($mission);
// } // }
$machine = CMMSMachine::query()->find($request->machine_id); $machine = CMMSMachine::query()->find($request->machine_id, ['id', 'machine_code', 'car_type']);
$newMission = Mission::query()->create([ $newMission = Mission::query()->create([
'user_id' => $user->id, 'user_id' => $user->id,
@@ -168,7 +168,7 @@ class RequestPortalController extends Controller
'driver_id' => $request->driver, 'driver_id' => $request->driver,
'driver_name' => Rahdaran::query()->find($request->driver)->name, 'driver_name' => Rahdaran::query()->find($request->driver)->name,
'km' => $request->end_km, 'km' => $request->end_km,
'requested_machines' => json_encode($mission->requested_machines), 'requested_machines' => json_encode($machine->car_type),
]); ]);
$newMission->rahdaran()->sync($request->rahdaran); $newMission->rahdaran()->sync($request->rahdaran);
@@ -244,7 +244,7 @@ class RequestPortalController extends Controller
$type = $start->diffInMinutes($end) > 480 ? MissionTypes::NO_PROCESS_ROZANE->value : MissionTypes::NO_PROCESS_SAATY->value; $type = $start->diffInMinutes($end) > 480 ? MissionTypes::NO_PROCESS_ROZANE->value : MissionTypes::NO_PROCESS_SAATY->value;
$user = auth()->user(); $user = auth()->user();
$zone = $request->zone; $zone = $request->zone;
$machine = CMMSMachine::query()->where('machine_code', '=', $violation->machine_code)->first(['id', 'machine_code']); $machine = CMMSMachine::query()->where('machine_code', '=', $violation->machine_code)->first(['id', 'machine_code', 'car_type']);
$mission = Mission::query()->create([ $mission = Mission::query()->create([
'user_id' => $user->id, 'user_id' => $user->id,
@@ -274,7 +274,7 @@ class RequestPortalController extends Controller
'request_date' => now(), 'request_date' => now(),
'machine_id' => $machine->id, 'machine_id' => $machine->id,
'machine_code' => $machine->machine_code, 'machine_code' => $machine->machine_code,
'requested_machines' => $machine->car_type, 'requested_machines' => json_encode($machine->car_type),
'station_id' => $user->station_id, 'station_id' => $user->station_id,
'station_name' => RahdariPoint::query()->find($user->station_id)->name, 'station_name' => RahdariPoint::query()->find($user->station_id)->name,
'km' => $violation->km ?? null, 'km' => $violation->km ?? null,