poc/pds
1
0
Fork 1
Code Issues Pull Requests 12 Actions Packages Projects Releases Wiki Activity

Merge pull request 'Crted issue in characteristic approver master for filtering plant' (#793) from ranjith-dev into master
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 15s
Details

Browse Source 
Reviewed-on: #793
This commit was merged in pull request #793.
This commit is contained in:
jothi
2026-06-30 12:45:23 +00:00
parent 9ea8163f55 075591459f
commit 069d3bfa7b
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Filament/Resources/CharacteristicApproverMasterResource.php
View File

@@ -411,7 +411,7 @@ class CharacteristicApproverMasterResource extends Resource
if ($userHas && strlen($userHas) > 0) { if ($userHas && strlen($userHas) > 0) {
return Plant::where('id', $userHas)->pluck('name', 'id')->toArray(); return Plant::where('id', $userHas)->pluck('name', 'id')->toArray();
} else { } else {
return Plant::whereHas('requestCharacteristics', function ($query) { return Plant::whereHas('characteristicApproverMaster', function ($query) {
$query->whereNotNull('id'); $query->whereNotNull('id');
})->orderBy('code')->pluck('name', 'id'); })->orderBy('code')->pluck('name', 'id');
} }
@@ -434,7 +434,7 @@ class CharacteristicApproverMasterResource extends Resource
return []; return [];
} }
return Machine::whereHas('requestCharacteristics', function ($query) use ($plantId) { return Machine::whereHas('characteristicApproverMaster', function ($query) use ($plantId) {
if ($plantId) { if ($plantId) {
$query->where('plant_id', $plantId); $query->where('plant_id', $plantId);
} }

5
app/Models/Machine.php
View File

@@ -53,6 +53,11 @@ class Machine extends Model
return $this->hasMany(RequestCharacteristic::class, 'machine_id', 'id'); return $this->hasMany(RequestCharacteristic::class, 'machine_id', 'id');
} }
public function characteristicApproverMaster()
{
return $this->hasMany(CharacteristicApproverMaster::class, 'machine_id', 'id');
}
public function productionCharacteristics() public function productionCharacteristics()
{ {
return $this->hasMany(ProductionCharacteristic::class, 'machine_id', 'id'); return $this->hasMany(ProductionCharacteristic::class, 'machine_id', 'id');

5
app/Models/Plant.php
View File

@@ -193,4 +193,9 @@ class Plant extends Model
// { // {
// return $this->hasMany(LocatorValidation::class, 'plant_id', 'id'); // return $this->hasMany(LocatorValidation::class, 'plant_id', 'id');
// } // }
public function characteristicApproverMaster()
{
return $this->hasMany(CharacteristicApproverMaster::class, 'plant_id', 'id');
}
} }