From 3b82149a6d4c51c7012a904c96114205327a1f8f Mon Sep 17 00:00:00 2001 From: amirghasempoor Date: Sun, 16 Nov 2025 10:23:06 +0330 Subject: [PATCH] debug --- app/Enums/CmmsMachineStatus.php | 19 +++++++++++++++++++ .../Mission/RequestPortalController.php | 2 +- .../Mission/TransportationUnitController.php | 5 +++-- .../TransportaionUnit/AllocateRequest.php | 2 +- 4 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 app/Enums/CmmsMachineStatus.php diff --git a/app/Enums/CmmsMachineStatus.php b/app/Enums/CmmsMachineStatus.php new file mode 100644 index 00000000..b679da8f --- /dev/null +++ b/app/Enums/CmmsMachineStatus.php @@ -0,0 +1,19 @@ + 'آماده', + self::RESERVE => 'رزرو', + self::DAR_MAMORIAT => 'در ماموریت', + }; + } +} \ No newline at end of file diff --git a/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php b/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php index 3691a8e9..564e8356 100644 --- a/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php +++ b/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php @@ -169,7 +169,7 @@ class RequestPortalController extends Controller public function destroy(Mission $mission): JsonResponse { DB::transaction(function () use ($mission) { - $mission->rahdaran()->delete(); + $mission->rahdaran()->detach(); $mission->delete(); }); diff --git a/app/Http/Controllers/V3/Dashboard/Mission/TransportationUnitController.php b/app/Http/Controllers/V3/Dashboard/Mission/TransportationUnitController.php index b4eb0e76..8f78d51b 100644 --- a/app/Http/Controllers/V3/Dashboard/Mission/TransportationUnitController.php +++ b/app/Http/Controllers/V3/Dashboard/Mission/TransportationUnitController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers\V3\Dashboard\Mission; +use App\Enums\CmmsMachineStatus; use App\Enums\MissionStates; use App\Http\Controllers\Controller; use App\Http\Requests\V3\Mission\TransportaionUnit\AllocateRequest; @@ -58,7 +59,7 @@ class TransportationUnitController extends Controller public function deallocate(DeallocateRequest $request, Mission $mission): JsonResponse { DB::transaction(function () use ($request, $mission) { - $mission->rahdaran()->wherePivot('is_driver', '=', true)->delete(); + $mission->rahdaran()->wherePivot('is_driver', '=', true)->detach(); $mission->histories()->create([ 'user_id' => auth()->user()->id, @@ -86,7 +87,7 @@ class TransportationUnitController extends Controller return $this->successResponse( CMMSMachine::query() ->where('car_type', '=', $mission->car_type) - ->where('status', '<>', 3) +// ->where('status', '<>', CmmsMachineStatus::DAR_MAMORIAT->value) ->get(['machine_code', 'id', 'plak_number', 'car_name']) ); } diff --git a/app/Http/Requests/V3/Mission/TransportaionUnit/AllocateRequest.php b/app/Http/Requests/V3/Mission/TransportaionUnit/AllocateRequest.php index 31ff913d..d5cc2956 100644 --- a/app/Http/Requests/V3/Mission/TransportaionUnit/AllocateRequest.php +++ b/app/Http/Requests/V3/Mission/TransportaionUnit/AllocateRequest.php @@ -35,7 +35,7 @@ class AllocateRequest extends FormRequest { return [ function (Validator $validator) { - $duplicateMission = Mission::query()->where('machine_id', $this->machine_id) + $duplicateMission = Mission::query()->where('machine_id', '=', $this->machine_id) ->whereBetween('start_date', [$this->mission->start_date, $this->mission->end_date]) ->orWhereBetween('end_date', [$this->mission->start_date, $this->mission->end_date]) ->exists();