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

Merge pull request 'Changed winded_serial_number, part_validation_1, part_validation_2 updated logic on laser post api method' (#598) from ranjith-dev into master
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Has been cancelled
Details

Browse Source 
Reviewed-on: #598
This commit was merged in pull request #598.
This commit is contained in:
jothi
2026-05-15 04:15:44 +00:00
parent 7ceb9dbef2 52cee81573
commit af2b52dc50
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -842,12 +842,12 @@ class CharacteristicsController extends Controller
'name_plate_expected_time' => (string) $napExpecTim,
'name_plate_marked_by' => $curNamePlateMarkBy,
'motor_pump_pumpset_status' => '3',
'winded_serial_number' => (Str::contains($curHead, 'PUMPSET', ignoreCase: true) && $modelType == 'PUMP') ? $curWindNo : ($char['winded_serial_number'] ?? $curWindNo),
'winded_serial_number' => $char['winded_serial_number'] ?? $curWindNo,
'motor_machine_name' => $curMMach,
'pump_machine_name' => $curPMach,
'name_plate_machine_name' => $curNpMach,
'part_validation_1' => (Str::contains($curHead, 'PUMPSET', ignoreCase: true) && $modelType == 'PUMP') ? $curPart1 : ($char['part_validation_1'] ?? $curPart1),
'part_validation_2' => (Str::contains($curHead, 'PUMPSET', ignoreCase: true) && $modelType == 'PUMP') ? $curPart2 : ($char['part_validation_2'] ?? $curPart2),
'part_validation_1' => $char['part_validation_1'] ?? $curPart1,
'part_validation_2' => $char['part_validation_2'] ?? $curPart2,
'samlight_logged_name' => $char['samlight_logged_name'] ?? $slUser,
'pending_released_status' => $char['pending_released_status'] ?? 0,
'has_work_flow_id' => $char['has_work_flow_id'] ?? $curWorkFlow,
@@ -877,10 +877,10 @@ class CharacteristicsController extends Controller
'name_plate_expected_time' => (string) $napExpecTim,
'name_plate_marked_by' => $curNamePlateMarkBy,
'motor_pump_pumpset_status' => '3',
// 'winded_serial_number' => $char['winded_serial_number'] ?? $curWindNo,
'winded_serial_number' => $char['winded_serial_number'] ?? $curWindNo,
'name_plate_machine_name' => $char['name_plate_machine_name'] ?? $curNpMach,
// 'part_validation_1' => $char['part_validation_1'] ?? $curPart1,
// 'part_validation_2' => $char['part_validation_2'] ?? $curPart2,
'part_validation_1' => $char['part_validation_1'] ?? $curPart1,
'part_validation_2' => $char['part_validation_2'] ?? $curPart2,
'samlight_logged_name' => $char['samlight_logged_name'] ?? $slUser,
'pending_released_status' => $char['pending_released_status'] ?? 0,
'has_work_flow_id' => $char['has_work_flow_id'] ?? $curWorkFlow,
@@ -916,10 +916,10 @@ class CharacteristicsController extends Controller
'pump_expected_time' => (string) $pumExpecTim,
'pump_marked_by' => $curPumpMarkBy,
'motor_pump_pumpset_status' => '3',
'winded_serial_number' => (Str::contains($curHead, 'PUMPSET', ignoreCase: true) && $modelType == 'PUMP') ? $curWindNo : ($char['winded_serial_number'] ?? $curWindNo),
'winded_serial_number' => $char['winded_serial_number'] ?? $curWindNo,
'pump_machine_name' => $char['pump_machine_name'] ?? $curPMach,
'part_validation_1' => (Str::contains($curHead, 'PUMPSET', ignoreCase: true) && $modelType == 'PUMP') ? $curPart1 : ($char['part_validation_1'] ?? $curPart1),
'part_validation_2' => (Str::contains($curHead, 'PUMPSET', ignoreCase: true) && $modelType == 'PUMP') ? $curPart2 : ($char['part_validation_2'] ?? $curPart2),
'part_validation_1' => $char['part_validation_1'] ?? $curPart1,
'part_validation_2' => $char['part_validation_2'] ?? $curPart2,
'samlight_logged_name' => $char['samlight_logged_name'] ?? $slUser,
'pending_released_status' => $char['pending_released_status'] ?? 0,
'has_work_flow_id' => $char['has_work_flow_id'] ?? $curWorkFlow,
@@ -1076,12 +1076,12 @@ class CharacteristicsController extends Controller
'name_plate_expected_time' => (string) $napExpecTim,
'name_plate_marked_by' => $curNamePlateMarkBy,
'motor_pump_pumpset_status' => null,
'winded_serial_number' => (Str::contains($curHead, 'PUMPSET', ignoreCase: true) && $modelType == 'PUMP') ? $curWindNo : ($char['winded_serial_number'] ?? $curWindNo),
'winded_serial_number' => $char['winded_serial_number'] ?? $curWindNo,
'motor_machine_name' => $curMMach,
'pump_machine_name' => $curPMach,
'name_plate_machine_name' => $char['name_plate_machine_name'] ?? $curNpMach,
'part_validation_1' => (Str::contains($curHead, 'PUMPSET', ignoreCase: true) && $modelType == 'PUMP') ? $curPart1 : ($char['part_validation_1'] ?? $curPart1),
'part_validation_2' => (Str::contains($curHead, 'PUMPSET', ignoreCase: true) && $modelType == 'PUMP') ? $curPart2 : ($char['part_validation_2'] ?? $curPart2),
'part_validation_1' => $char['part_validation_1'] ?? $curPart1,
'part_validation_2' => $char['part_validation_2'] ?? $curPart2,
'samlight_logged_name' => $char['samlight_logged_name'] ?? $slUser,
'pending_released_status' => $char['pending_released_status'] ?? 0,
'has_work_flow_id' => $char['has_work_flow_id'] ?? $curWorkFlow,
@@ -1132,12 +1132,12 @@ class CharacteristicsController extends Controller
'man_marked_status' => (string) $manStat,
'man_marked_datetime' => $char['man_marked_datetime'] ?? now(),
'man_marked_by' => ($char['man_marked_by'] == 'jothi') ? 'Admin' : $char['man_marked_by'] ?? $curManualMarkBy,
'winded_serial_number' => (Str::contains($curHead, 'PUMPSET', ignoreCase: true) && $modelType == 'PUMP') ? $curWindNo : ($char['winded_serial_number'] ?? $curWindNo),
'winded_serial_number' => $char['winded_serial_number'] ?? $curWindNo,
'motor_machine_name' => $curMMach,
'pump_machine_name' => $curPMach,
'name_plate_machine_name' => $curNpMach,
'part_validation_1' => (Str::contains($curHead, 'PUMPSET', ignoreCase: true) && $modelType == 'PUMP') ? $curPart1 : ($char['part_validation_1'] ?? $curPart1),
'part_validation_2' => (Str::contains($curHead, 'PUMPSET', ignoreCase: true) && $modelType == 'PUMP') ? $curPart2 : ($char['part_validation_2'] ?? $curPart2),
'part_validation_1' => $char['part_validation_1'] ?? $curPart1,
'part_validation_2' => $char['part_validation_2'] ?? $curPart2,
'samlight_logged_name' => $char['samlight_logged_name'] ?? $slUser,
'updated_by' => $userName ?? null,
];