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

Merge pull request 'removed machine name logic in get api of process order' (#1054) 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: #1054
This commit was merged in pull request #1054.
This commit is contained in:
jothi
2026-09-18 12:03:25 +00:00
parent b692c69937 3559c4c4ee
commit 4b31263eb3
1 changed files with 3 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/Http/Controllers/PdfController.php
View File

@@ -535,7 +535,7 @@ class PdfController extends Controller
$processOrder = $request->header('process-order');
$machineName = $request->header('machine-name');
// $machineName = $request->header('machine-name');
if (! $plantCode) {
return response()->json([
@@ -548,12 +548,6 @@ class PdfController extends Controller
'status_description' => 'Process Order cannot be empty!',
], 404);
}
elseif (! $machineName) {
return response()->json([
'status_code' => 'ERROR',
'status_description' => 'Machine Name cannot be empty!',
], 404);
}
$plant = Plant::where('code', $plantCode)->first();
$plantId = $plant->id;
@@ -574,26 +568,14 @@ class PdfController extends Controller
], 404);
}
$proOrdAgPlan = ProcessOrder::where('plant_id', $plantId)
->where('process_order', $processOrder)
->first();
if (! $proOrdAgPlan) {
return response()->json([
'status_code' => 'ERROR',
'status_description' => 'Process order not found for this plant!',
], 404);
}
$proOrdAgPlant = ProcessOrder::where('plant_id', $plantId)
->where('process_order', $processOrder)
->where('machine_name', $machineName)
->first();
if (! $proOrdAgPlant) {
return response()->json([
'status_code' => 'ERROR',
'status_description' => 'Process order not found for this plant and machine name!',
'status_description' => 'Process order not found for this plant!',
], 404);
}
@@ -602,20 +584,17 @@ class PdfController extends Controller
$processOrderRecords = ProcessOrder::with('item')
->where('plant_id', $plant->id)
->where('process_order', $processOrder)
->where('machine_name', $machineName)
->get();
$lastRecord = ProcessOrder::with('item')
->where('plant_id', $plant->id)
->where('process_order', $processOrder)
->where('machine_name', $machineName)
->orderBy('id', 'desc')
->first();
$lastRecord1 = ProcessOrder::with('item')
->where('plant_id', $plant->id)
->where('process_order', $processOrder)
->where('machine_name', $machineName)
->where('rework_status', 0)
->orderBy('id', 'desc')
->first();
@@ -627,7 +606,7 @@ class PdfController extends Controller
if ($totalReceivedQty == $proOrdAgPlant->order_quantity) {
return response()->json([
'status_code' => 'ERROR',
'status_description' => "Process order '{$processOrder}' for plant '{$plantCode}' and machine name '{$machineName}' has already reached its order quantity.",
'status_description' => "Process order '{$processOrder}' for plant '{$plantCode}' has already reached its order quantity.",
], 404);
}