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

Removed duplicate where condition on generate workFlowId and updated quality approval pending condition and Refactor document retrieval function
Some checks failed
Gemini PR Review / Gemini PR Review (pull_request) Waiting to run
Details
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (pull_request) Waiting to run
Details
Laravel Larastan / larastan (pull_request) Waiting to run
Details
Laravel Pint / pint (pull_request) Waiting to run
Details
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Has been cancelled
Details

Browse Source
This commit is contained in:
dhanabalan
2026-02-11 10:03:25 +05:30
parent 3dd5b30070
commit da178087ea
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/Http/Controllers/CharacteristicsController.php
View File

@@ -2841,7 +2841,7 @@ class CharacteristicsController extends Controller
$app2 = $pendingExists->approver_status2 ?? null;
$app3 = $pendingExists->approver_status3 ?? null;
if ($app1 != 'Rejected' && $app2 != 'Rejected' && $app3 != 'Rejected' && $app1 != 'Approved' && $app2 != 'Approved' && $app3 != 'Approved') {
if ($app1 != 'Approved' && $app2 != 'Approved' && $app3 != 'Approved' && $app1 != 'Rejected' && $app2 != 'Rejected' && $app3 != 'Rejected') {
$pendingCharacteristics[] = strtoupper($charNameUpp);
}
}
@@ -2887,7 +2887,6 @@ class CharacteristicsController extends Controller
$lastWorkflow = RequestCharacteristic::where('work_flow_id', 'like', "{$prefix}%")
// ->where('plant_id', $plantId)
// ->where('machine_id', $MachineId)
->where('work_flow_id', 'like', "{$prefix}%")
->orderByDesc('work_flow_id')
->first();
@@ -2999,10 +2998,11 @@ class CharacteristicsController extends Controller
$app2 = $pendingExists->approver_status2 ?? null;
$app3 = $pendingExists->approver_status3 ?? null;
if ($app1 != 'Approved' && $app2 != 'Approved' && $app3 != 'Approved') {// $app1 != 'Rejected' && $app2 != 'Rejected' && $app3 != 'Rejected' &&
if ($app1 != 'Approved' && $app2 != 'Approved' && $app3 != 'Approved' && $app1 != 'Rejected' && $app2 != 'Rejected' && $app3 != 'Rejected') {
return response()->json([
'status_code' => 'ERROR',
'status_description' => "Quality Approval is already pending for the Job Number : '{$jobNo}'",
// 'status_error' => $pendingExists,
], 404);
}
}
@@ -3014,7 +3014,6 @@ class CharacteristicsController extends Controller
$prefix = "WF-{$year}{$month}{$date}-";
$lastWorkflow = RequestCharacteristic::where('work_flow_id', 'like', "{$prefix}%")
->where('work_flow_id', 'like', "{$prefix}%")
->orderByDesc('work_flow_id')
->first();
@@ -3583,15 +3582,9 @@ class CharacteristicsController extends Controller
'requested_characteristics' => $response,
], 200);
} else {
$filePath = '';
$filename = '';
if ($requestType == 'Characteristic') {
$filePath = "uploads/LaserDocs/{$workFlowId}.pdf";
$filename = "{$workFlowId}.pdf";
} else {
$filePath = "uploads/LaserDocs/{$workFlowId}.png";
$filename = "{$workFlowId}.png";
}
$extension = ($requestType == 'Characteristic') ? 'pdf' : 'png';
$filePath = "uploads/LaserDocs/{$workFlowId}.{$extension}";
$filename = "{$workFlowId}.{$extension}";
$workFlowIdExist = RequestCharacteristic::where('work_flow_id', $workFlowId)->first();