From 4fc7eb189bb9224d01175a9b9f27dfee88f955a5 Mon Sep 17 00:00:00 2001 From: Chase Tucker Date: Wed, 14 May 2025 11:23:48 -0700 Subject: [PATCH] Add isAuthorizedToOverrideROTR flag --- LSL2/STPROC/SCAN_SERVICES.txt | 19 +++++++++++++++++++ LSL2/STPROCINS/SCANS_EQUATES.txt | 3 +++ 2 files changed, 22 insertions(+) diff --git a/LSL2/STPROC/SCAN_SERVICES.txt b/LSL2/STPROC/SCAN_SERVICES.txt index c8bdbe0..48c31b5 100644 --- a/LSL2/STPROC/SCAN_SERVICES.txt +++ b/LSL2/STPROC/SCAN_SERVICES.txt @@ -335,6 +335,18 @@ Service ProcessScanData(ScanID, ScanJSON) Error_Services('Add', 'Inactive employee.') Case Otherwise$ ScansRow = {EMPLOYEE_ID} + + Username = {EMPLOYEE_ID} + + Member = False$ + Groups = 'LEAD':@VM:'SUPERVISOR':@VM:'ENGINEER':@VM:'ENG_TECH':@VM:'ROTR_OVERRIDE' + + For each Group in Groups using @VM + Member = MemberOf(Username, Group) + Until Member EQ True$ + Next Group + + ScansRow = Member End Case Case ScanData[1, 3] EQ '10S' @@ -520,6 +532,9 @@ Service ProcessScanData(ScanID, ScanJSON) Database_Services('WriteDataRow', 'REACTOR', Reactor, ReactorRec, True$, False$, True$) Database_Services('WriteDataRow', 'RDS', RDSNo, RDSRec, True$, False$, True$) + ScansRow = 0 + ScansRow = '' + ScansRow = '' ScansRow= '' Result = 'Override Performed successfully' end @@ -1674,6 +1689,7 @@ Service ConvertMVScanToJSON(ScanID, mvScan, itemURL) SRP_JSON(objEmployee, 'SetValue', 'authorized', {EMPLOYEE_AUTHORIZED}, 'Boolean') SRP_JSON(objEmployee, 'SetValue', 'notAuthorizedReason', {EMPLOYEE_NOT_AUTHORIZED_REASON}, 'String') SRP_JSON(objEmployee, 'SetValue', 'authenticated' , @Record , 'Boolean');//JRO Change + SRP_JSON(objEmployee, 'SetValue', 'isAuthorizedToOverrideROTR', @Record, 'Boolean') SRP_JSON(objJSONScan, 'Set', 'employee', objEmployee) SRP_JSON(objEmployee, 'Release') @@ -2355,3 +2371,6 @@ return + + + diff --git a/LSL2/STPROCINS/SCANS_EQUATES.txt b/LSL2/STPROCINS/SCANS_EQUATES.txt index b0a1b61..8d9cc47 100644 --- a/LSL2/STPROCINS/SCANS_EQUATES.txt +++ b/LSL2/STPROCINS/SCANS_EQUATES.txt @@ -40,6 +40,9 @@ compile insert SCANS_EQUATES equ SCANS.TW_LOT_QTY$ to 31 equ SCANS.TEST_RUN_TYPE_ID$ to 32 equ SCANS.TEST_RUN_TYPE_NAME$ to 33 + equ SCANS.IS_AUTHORIZED_TO_OVERRIDE_ROTR$ to 34 #endif + +