diff --git a/app/Http/Controllers/CreateProjectController.php b/app/Http/Controllers/CreateProjectController.php
index 701d1456..3ba65867 100644
--- a/app/Http/Controllers/CreateProjectController.php
+++ b/app/Http/Controllers/CreateProjectController.php
@@ -530,13 +530,16 @@ public function showStep2($company_projects_id)
->with('listEquipmentsProjects', $listEquipmentsProjects)
->with('typeEquipments', $typeEquipments)
->with('checkEquipments', $checkEquipments)
- ->with('checkUnits', $checkUnits);
+ ->with('checkUnits', $checkUnits)
+ ->with('receiveNumberProject',$project);
+
}
return view('projectsClients/articulated_2', ['step' => 2, 'numberProject' => $numberProject])
->with('listEquipmentsProjects', $listEquipmentsProjects)
->with('typeEquipments', $typeEquipments)
->with('checkEquipments', $checkEquipments)
- ->with('checkUnits', $checkUnits);
+ ->with('checkUnits', $checkUnits)
+ ->with('receiveNumberProject',$project);
}
public function createEquipmentManual(Request $request)
diff --git a/app/Http/Controllers/ProjectoDatacontroller.php b/app/Http/Controllers/ProjectoDatacontroller.php
index 028b373f..10cb25a8 100644
--- a/app/Http/Controllers/ProjectoDatacontroller.php
+++ b/app/Http/Controllers/ProjectoDatacontroller.php
@@ -21,6 +21,26 @@
class ProjectoDatacontroller extends Controller
{
+ public function receiveAllInstallationEquipment($receiveNumberProject)
+ {
+
+ $receveProject = CompanyProject::find($receiveNumberProject);
+ $receveEquipments = Equipment::whereHas('unit.plant', function ($query) use ($receveProject) {
+ $query->where('plants.plant_id', '=', $receveProject->plant_id);
+ })
+ ->with(['equipmentType', 'unit', 'equipmentAssociationAmbit.ambitsEquipment'])
+ ->get();
+
+ return DataTables::of($receveEquipments)
+ ->addColumn('equipment_type', function ($row) {
+ return $row->equipmentType->equipment_type_name;
+ })
+ ->addColumn('unit', function ($row) {
+ return $row->unit->unit_name;
+ })
+ ->toJson();
+ }
+
public function HomePage()
{
diff --git a/app/Models/Unit.php b/app/Models/Unit.php
index 61476dfc..326dc327 100644
--- a/app/Models/Unit.php
+++ b/app/Models/Unit.php
@@ -21,4 +21,11 @@ public function equipments(){
public function pendingEquipments(){
return $this->hasMany(PendingEquipment::class, 'pending_equipment_unit_id', 'unit_id');
}
+
+ public function plant()
+ {
+ return $this->belongsTo(Plant::class, 'plant_id');
+ }
+
+
}
diff --git a/resources/views/projectsClients/articulated_2.blade.php b/resources/views/projectsClients/articulated_2.blade.php
index d5aa1994..94a8f26b 100644
--- a/resources/views/projectsClients/articulated_2.blade.php
+++ b/resources/views/projectsClients/articulated_2.blade.php
@@ -28,6 +28,9 @@
@endif
+
+
+