phares3757/open-insight
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged PR 13428: Added in override logging for test wafer tracking. Refactored Override logging

Browse Source 
Added in override logging for test wafer tracking. Refactored Override logging
This commit is contained in:
Ouellette Jonathan (CSC FI SPS MESLEO) 2025-03-20 21:54:31 +01:00
parent 61435345ad
commit c50e536791
4 changed files with 3693 additions and 1109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4456
LSL2/OIWIN/OVERRIDE_REPORT.json
View File

File diff suppressed because it is too large Load Diff

66
LSL2/STPROC/OVERRIDE_LOG_SERVICES.txt
View File

@ -4,8 +4,8 @@ Compile function Override_Log_Services(@Service, @Params)
$insert LOGICAL $insert LOGICAL
$Insert OVERRIDE_LOG_EQUATES $Insert OVERRIDE_LOG_EQUATES
Declare function Datetime, NextKey, Error_Services Declare function Datetime, NextKey, Error_Services, SRP_Datetime
Declare subroutine Database_Services Declare subroutine Database_Services, Btree.Extract, Error_Services
GoToService GoToService
@ -21,18 +21,21 @@ Options OVERRIDE_TYPES = 'ROTR_BLOCK,UNSIGN,CLEAN_INSP,REACTOR_PROVE_IN,REAC
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
Service Create(Table, Key, OverrideUser, OverrideComment, OverrideType=OVERRIDE_TYPES, OverrideCause='') Service Create(Table, Key, OverrideUser, OverrideComment, OverrideType=OVERRIDE_TYPES, OverrideCause='')
RecKey = Nextkey('OVERRIDE_LOG')
RecKey = ''
orRec = '' for each TableName in Table using @VM setting TablePos
orRec<OVERRIDE_LOG_TABLE$> = Table RecKey<1,-1> = Nextkey('OVERRIDE_LOG')
orRec<OVERRIDE_LOG_KEY$> = Key orRec = ''
orRec<OVERRIDE_LOG_USER$> = OverrideUser orRec<OVERRIDE_LOG_TABLE$> = Table<1, TablePos>
orRec<OVERRIDE_LOG_COMMENT$> = OverrideComment orRec<OVERRIDE_LOG_KEY$> = Key<1, TablePos>
orRec<OVERRIDE_LOG_DTM$> = Datetime() orRec<OVERRIDE_LOG_USER$> = OverrideUser
orRec<OVERRIDE_LOG_CATEGORY$> = OverrideType orRec<OVERRIDE_LOG_COMMENT$> = OverrideComment
orRec<OVERRIDE_LOG_CAUSE$> = OverrideCause orRec<OVERRIDE_LOG_DTM$> = Datetime()
orRec<OVERRIDE_LOG_CATEGORY$> = OverrideType
Database_Services('WriteDataRow', 'OVERRIDE_LOG', RecKey, orRec) orRec<OVERRIDE_LOG_CAUSE$> = OverrideCause
Database_Services('WriteDataRow', 'OVERRIDE_LOG', RecKey, orRec)
Next TablePos
If Error_Services('NoError') then If Error_Services('NoError') then
Response = RecKey Response = RecKey
@ -42,4 +45,39 @@ Service Create(Table, Key, OverrideUser, OverrideComment, OverrideType=OVERRIDE_
End Service End Service
Service GetOverrideLogKeys(EntityId, Table, Type, User, DateTimeFrom, DateTimeTo)
If DateTimeFrom EQ '' OR Not(Num(DateTimeFrom)) Or DateTimeFrom GT DateTimeTo then
DateTimeFrom = SRP_Datetime('AddDays', Datetime(), -30)
end
If DateTimeTo EQ '' OR Not(Num(DateTimeFrom)) then
DateTimeTo = Datetime()
end
Open 'DICT.OVERRIDE_LOG' To @DICT then
SearchString = ''
SearchString := 'DTM':@VM:DateTimeFrom:'~':DateTimeTo:@FM
if EntityId NE '' then
SearchString := 'KEY':@VM:EntityId:@FM
end
If Table NE '' then
SearchString := 'TABLE':@VM:Table:@FM
end
If Type NE '' then
SearchString := 'CATEGORY':@VM:Type:@FM
end
If User NE '' then
SearchString := 'USER':@VM:User:@FM
end
keylist = ''
option = ''
flag = ''
Btree.Extract(SearchString, 'OVERRIDE_LOG', @DICT, keylist, option, flag)
end else
Error_Services('Add', 'Error in ' : service : ' unable to open OVERRIDE_LOG dictionary.')
end
Response = keylist
end service

261
LSL2/STPROC/OVERRIDE_REPORT_EVENTS.txt
View File

@ -14,7 +14,7 @@ $insert OVERRIDE_LOG_EQUATES
Declare subroutine SRP_Show_Window, Msg Declare subroutine SRP_Show_Window, Msg
Declare function Utility, Datetime, SRP_DateTime, SRP_SORT_ARRAY Declare function Utility, Datetime, SRP_DateTime, SRP_SORT_ARRAY, Override_Log_Services, Database_Services
// Update the arguments so that the OpenInsight OLE event will treate the ActiveX event as a native event handler. // Update the arguments so that the OpenInsight OLE event will treate the ActiveX event as a native event handler.
If Event EQ 'OLE' then If Event EQ 'OLE' then
@ -74,7 +74,7 @@ Event PUB_DATE_TO.CLICK:
return return
Event PUB_DIR_BROWSE.CLICK Event PUB_DIR_BROWSE.CLICK
value = "Select a directory" : @fm : "c:\temp" value = "Select a directory." : @fm : "c:\temp"
dir = Utility( "CHOOSEDIR", @window, value) dir = Utility( "CHOOSEDIR", @window, value)
if dir NE '' then if dir NE '' then
@ -133,242 +133,52 @@ Event SEARCH.CLICK
Set_Property(@WINDOW:'.OVERRIDE_TABLE','LABEL','') Set_Property(@WINDOW:'.OVERRIDE_TABLE','LABEL','')
DynamicFields = 'RDS':@FM:'REACTOR' DynamicFields = 'RDS':@FM:'REACTOR'
SearchType = Get_Property(@WINDOW:'.REPORT_BY','DEFPROP') SearchType = Get_Property(@WINDOW:'.REPORT_BY','DEFPROP')
Filter = Get_Property(@WINDOW:'.ITEM_FILTER','DEFPROP') EntityId = Get_Property(@WINDOW:'.ITEM_FILTER','DEFPROP')
OverrideType = Get_Property(@Window : '.OVERRIDE_TYPE', 'DEFPROP')
OverrideUser = Get_Property(@WINDOW:'.EDL_USER', 'TEXT')
DateFrom = Get_Property(@WINDOW:'.DATE_FROM','DEFPROP') DateFrom = Get_Property(@WINDOW:'.DATE_FROM','DEFPROP')
DateFrom = ICONV(DateFrom,'DT') DateFrom = ICONV(DateFrom,'DT4/HS')
DateTo = Get_Property(@WINDOW:'.DATE_TO','DEFPROP') DateTo = Get_Property(@WINDOW:'.DATE_TO','DEFPROP')
DateTo = ICONV(DateTo,'DT') DateTo = ICONV(DateTo,'DT')
TableData = ''
IF DateTo EQ '' then IF DateTo EQ '' then
DateTo = DateTime() DateTo = DateTime()
end end
IF DateFrom EQ '' then IF DateFrom EQ '' then
DateFrom = SRP_DateTime('AddDays', DateTo, -7) DateFrom = SRP_DateTime('AddDays', DateTo, -7)
end end
dataarray = ''
open "OVERRIDE_LOG" To OverRideTable else
Status = Set_FSError()
return
end
select OverRideTable
Begin Case Begin Case
Case SearchType EQ 'ALL'
Case SearchType = 'ALL' EntityType = ''
Case Otherwise$
Done = 0 EntityType = SearchType
Loop
ReadNext @ID else Done = 1
Until Done Do
read @Record from OverRideTable, @ID else
status = Set_FSError()
return
end
RecordTime = @RECORD<OVERRIDE_LOG_DTM$>
IF RecordTime GE DateFrom AND RecordTime LE DateTo Then
RecToWrite = @Record
DynamicValues = ''
User = @Record<OVERRIDE_LOG_USER$>
Comment = @Record<OVERRIDE_LOG_COMMENT$>
LogTime = OCONV(@Record<OVERRIDE_LOG_DTM$>,'DT4/HS')
Category = @Record<OVERRIDE_LOG_CATEGORY$>
Cause = @Record<OVERRIDE_LOG_CAUSE$>
keys = @Record<OVERRIDE_LOG_KEY$>
for i = 1 to DCount(keys,@VM)
pairedTable = @RECORD<OVERRIDE_LOG_TABLE$, i>
Locate pairedTable in DynamicFields using @FM setting fPos then
DynamicValues<1,fPos> = keys<1,i>
end
Next i
dataarray:= User :@VM:Comment:@VM:LogTime:@VM:Category:@VM:Cause:@VM:DynamicValues :@FM
end
Repeat
swap @VM with @FM in DynamicFields
HeaderText = Get_Property(@WINDOW:'.OVERRIDE_TABLE','LABEL')
HeaderText<6> = DynamicFields
//////////////////////
Case SearchType = 'RDS' Or SearchType = 'REACTOR'
if Filter Eq '' then
Msg(@Window, 'No search string entered. Please enter a valid ' : SearchType)
return
end
Done = 0
Loop
ReadNext @ID else Done = 1
Until Done Do
read @Record from OverRideTable, @ID else
status = Set_FSError()
return
end
RecordTables = @RECORD<OVERRIDE_LOG_TABLE$>
RecordKeys = @RECORD<OVERRIDE_LOG_KEY$>
Locate SearchType in RecordTables using @VM setting tPos then
RecordTime = @RECORD<OVERRIDE_LOG_DTM$>
IF RecordTime GE DateFrom AND RecordTime LE DateTo AND RecordKeys<1,tPos> EQ Filter Then
RecToWrite = @Record
DynamicValues = ''
User = @Record<OVERRIDE_LOG_USER$>
Comment = @Record<OVERRIDE_LOG_COMMENT$>
LogTime = OCONV(@Record<OVERRIDE_LOG_DTM$>,'DT4/HS')
Category = @Record<OVERRIDE_LOG_CATEGORY$>
Cause = @Record<OVERRIDE_LOG_CAUSE$>
keys = @Record<OVERRIDE_LOG_KEY$>
for i = 1 to DCount(keys,@VM)
pairedTable = @RECORD<OVERRIDE_LOG_TABLE$, i>
Locate pairedTable in DynamicFields using @FM setting fPos then
DynamicValues<1,fPos> = keys<1,i>
end
Next i
dataarray:= User :@VM:Comment:@VM:LogTime:@VM:Category:@VM:Cause:@VM:DynamicValues :@FM
//swap @VM with @FM in DynamicFields
end
end
Repeat
////////////////////
Case SearchType = 'OVERRIDE'
OverrideFilter = Get_Property(@WINDOW:'.OVERRIDE_TYPE','DEFPROP')
Done = 0
Loop
ReadNext @ID else Done = 1
Until Done Do
read @Record from OverRideTable, @ID else
status = Set_FSError()
return
end
RecordTime = @RECORD<OVERRIDE_LOG_DTM$>
IF RecordTime GE DateFrom AND RecordTime LE DateTo AND @RECORD<OVERRIDE_LOG_CATEGORY$> EQ OverrideFilter Then
RecToWrite = @Record
DynamicValues = ''
User = @Record<OVERRIDE_LOG_USER$>
Comment = @Record<OVERRIDE_LOG_COMMENT$>
LogTime = OCONV(@Record<OVERRIDE_LOG_DTM$>,'DT4/HS')
Category = @Record<OVERRIDE_LOG_CATEGORY$>
Cause = @Record<OVERRIDE_LOG_CAUSE$>
keys = @Record<OVERRIDE_LOG_KEY$>
for i = 1 to DCount(keys,@VM)
pairedTable = @RECORD<OVERRIDE_LOG_TABLE$, i>
Locate pairedTable in DynamicFields using @FM setting fPos then
DynamicValues<1,fPos> = keys<1,i>
end
Next i
dataarray:= User :@VM:Comment:@VM:LogTime:@VM:Category:@VM:Cause:@VM:DynamicValues :@FM
swap @VM with @FM in DynamicFields
end
Repeat
Case SearchType = 'USER'
Done = 0
Loop
ReadNext @ID else Done = 1
Until Done Do
read @Record from OverRideTable, @ID else
status = Set_FSError()
return
end
RecordTime = @RECORD<OVERRIDE_LOG_DTM$>
IF RecordTime GE DateFrom AND RecordTime LE DateTo AND @RECORD<OVERRIDE_LOG_USER$> EQ Filter Then
RecToWrite = @Record
DynamicValues = ''
User = @Record<OVERRIDE_LOG_USER$>
Comment = @Record<OVERRIDE_LOG_COMMENT$>
LogTime = OCONV(@Record<OVERRIDE_LOG_DTM$>,'DT4/HS')
Category = @Record<OVERRIDE_LOG_CATEGORY$>
Cause = @Record<OVERRIDE_LOG_CAUSE$>
keys = @Record<OVERRIDE_LOG_KEY$>
for i = 1 to DCount(keys,@VM)
pairedTable = @RECORD<OVERRIDE_LOG_TABLE$, i>
Locate pairedTable in DynamicFields using @FM setting fPos then
DynamicValues<1,fPos> = keys<1,i>
end
Next i
dataarray:= User :@VM:Comment:@VM:LogTime:@VM:Category:@VM:Cause:@VM:DynamicValues :@FM
swap @VM with @FM in DynamicFields
end
Repeat
End Case End Case
If OverrideType = 'ALL' then
OverrideType = ''
end
OverrideLogRecordKeys = Override_Log_Services('GetOverrideLogKeys', EntityId, EntityType, OverrideType, OverrideUser)
for each OverrideLogRecordKey in OverrideLogRecordKeys using @VM
dataarray = SRP_SORT_Array(dataarray, "DR3", 1) OverrideLogRec = Database_Services('ReadDataRow', 'OVERRIDE_LOG', OverrideLogRecordKey, True$, 0, False$)
//second loop to handle legacy multivalues in Table and Key columns. New overrides shouldn't have multivalues.
for each Table in OverrideLogRec<OVERRIDE_LOG_TABLE$> using @VM setting TablePos
OverrideDtm = OverrideLogRec<OVERRIDE_LOG_DTM$>
EntityId = OverrideLogRec<OVERRIDE_LOG_KEY$, TablePos>
EntityType = OverrideLogRec<OVERRIDE_LOG_TABLE$, TablePos>
OverrideUser = OverrideLogRec<OVERRIDE_LOG_USER$>
OverrideType = OverrideLogRec<OVERRIDE_LOG_CATEGORY$>
OverrideCause = OverrideLogRec<OVERRIDE_LOG_CAUSE$>
OverrideComment = OverrideLogRec<OVERRIDE_LOG_COMMENT$>
TableData<-1> = OverrideDtm : @VM : EntityId : @VM : EntityType : @VM : OverrideUser : @VM : OverrideUser : @VM : OverrideType : @VM : OverrideCause : @VM : OverrideComment
Next Table
Next OverrideLogRecordKey
TableData = SRP_SORT_Array(TableData, "DR1", 1)
For each line in TableData using @FM
Next line
Set_Property(@WINDOW:'.OVERRIDE_TABLE','LIST',TableData)
Set_Property(@WINDOW:'.OVERRIDE_TABLE','LIST',dataarray)
HeaderText = 'USER':@FM:'COMMENT':@FM:'DATE/TIME':@FM:'OVERRIDE TYPE':@FM:'CAUSE':@FM:DynamicFields
Set_Property(@WINDOW:'.OVERRIDE_TABLE','LABEL',HeaderText)
* HeaderText<COL$REC_NO> = HeaderText<COL$REC_NO>:CHAR(13):'<dc>'
* HeaderText<COL$THK_UNITS> = HeaderText<COL$THK_UNITS>:CHAR(13):'<dc>'
* HeaderText<COL$RES_UNITS> = HeaderText<COL$RES_UNITS>:CHAR(13):'<dc>'
* HeaderText<COL$CON_UNITS> = HeaderText<COL$CON_UNITS>:CHAR(13):'<dc>'
* HeaderText<COL$CRES_UNITS> = HeaderText<COL$CRES_UNITS>:CHAR(13):'<dc>'
*
* Set_Property(@WINDOW:'.LS_TABLE','LABEL',HeaderText)
//NewList = SRP_Sort_Array(List, "AL2", 1)
//Set_Property(@Window:".EDT_TEST", "LIST", NewList)
return
end event
Event REPORT_BY.ALL.CLICK
Set_Property(@Window:'.ITEM_FILTER', 'ENABLED', -1)
Set_Property(@WINDOW:'.LABEL_FILTER','TEXT','')
Set_Property(@Window:'.OVERRIDE_TYPE', 'ENABLED', 0)
return
end event
Event REPORT_BY.RDS.CLICK
Set_Property(@Window:'.ITEM_FILTER', 'ENABLED', 1)
Set_Property(@WINDOW:'.LABEL_FILTER','TEXT', 'RDS No:')
Set_Property(@Window:'.OVERRIDE_TYPE', 'ENABLED', 0)
end event
Event REPORT_BY.REACTOR.CLICK
Set_Property(@Window:'.ITEM_FILTER', 'ENABLED', 1)
Set_Property(@WINDOW:'.LABEL_FILTER','TEXT', 'Reactor No:')
Set_Property(@Window:'.OVERRIDE_TYPE', 'ENABLED', 0)
end event
Event REPORT_BY.OVERRIDE.CLICK
Set_Property(@Window:'.OVERRIDE_TYPE', 'ENABLED', 1)
Set_Property(@Window:'.ITEM_FILTER', 'ENABLED', -1)
Set_Property(@WINDOW:'.LABEL_FILTER','TEXT','')
end event
Event REPORT_BY.USER.CLICK
Set_Property(@Window:'.ITEM_FILTER', 'ENABLED', 1)
Set_Property(@WINDOW:'.LABEL_FILTER','TEXT', 'User:')
Set_Property(@Window:'.OVERRIDE_TYPE', 'ENABLED', 0)
end event end event
Setup_OLE_Controls: Setup_OLE_Controls:
@ -401,3 +211,4 @@ return

19
LSL2/STPROC/RDS_EVENTS.txt
View File

@ -86,7 +86,7 @@ EQU READONLY_GREEN$ TO 192 + (220*256) + (192*65536)
Declare subroutine ErrMsg, Set_Status, obj_WO_Mat, obj_WO_Mat_Log, obj_RDS, Set_Property, Send_Event, Database_Services Declare subroutine ErrMsg, Set_Status, obj_WO_Mat, obj_WO_Mat_Log, obj_RDS, Set_Property, Send_Event, Database_Services
Declare subroutine Dialog_Box, Qa_Services, Obj_React_Ll, Start_Window, obj_React_Status, Reactor_Services, Rds_Services Declare subroutine Dialog_Box, Qa_Services, Obj_React_Ll, Start_Window, obj_React_Status, Reactor_Services, Rds_Services
Declare subroutine Lot_Services Declare subroutine Lot_Services, Override_Log_Services
Declare function Dialog_Box, Msg, MemberOf, obj_WO_Mat, Database_Services, Get_Property, obj_React_Status, Get_Status Declare function Dialog_Box, Msg, MemberOf, obj_WO_Mat, Database_Services, Get_Property, obj_React_Status, Get_Status
Declare function QA_Services, Database_Services, Rds_Services, Obj_Calendar, Override_Log_Services, Max, Supplement_Services Declare function QA_Services, Database_Services, Rds_Services, Obj_Calendar, Override_Log_Services, Max, Supplement_Services
Declare function Datetime, Test_Run_Services Declare function Datetime, Test_Run_Services
@ -370,12 +370,17 @@ Event PUB_SIGN.CLICK()
//User has stated that they are using test wafers //User has stated that they are using test wafers
TWLogResult = Dialog_Box('NDW_LOG_TEST_WAFER_USAGE', @Window, RDSNo : @VM : 'STANDARD' : @VM : 'REACTOR' : @VM : Reactor) TWLogResult = Dialog_Box('NDW_LOG_TEST_WAFER_USAGE', @Window, RDSNo : @VM : 'STANDARD' : @VM : 'REACTOR' : @VM : Reactor)
If TWLogResult NE True$ then If TWLogResult NE True$ then
//User exited the the TW log form without logging anything. //User exited the the TW log prompt answering that they are not using any test wafers.
UserMsg = "Unable to sign load because test wafer logging is required on this run. A supervisor or lead may override." UserMsg = "Unable to sign load because test wafer logging is required on this run. A supervisor or lead may override."
OverrideGroups = 'LEAD':@VM:'SUPERVISOR':@VM:'ENGINEERING':@VM:'ENG_TECH' OverrideGroups = 'LEAD':@VM:'SUPERVISOR':@VM:'ENGINEERING':@VM:'ENG_TECH'
UserVerification = Dialog_Box('NDW_VERIFY_USER', @WINDOW, @USER4:@FM:OverrideGroups:@FM:'':@FM:UserMsg) UserVerification = Dialog_Box('NDW_VERIFY_USER', @WINDOW, @USER4:@FM:OverrideGroups:@FM:'':@FM:UserMsg)
Override = UserVerification<1> Override = UserVerification<1>
If Not(Override) then return OverrideUser = UserVerification<2>
If Override then
Override_log_services('Create', 'RDS', RDSNo, OverrideUser, '', 'TW_USAGE', '')
end else
return
end
end end
end else end else
//User has stated that they are NOT using test wafers //User has stated that they are NOT using test wafers
@ -383,7 +388,12 @@ Event PUB_SIGN.CLICK()
OverrideGroups = 'LEAD':@VM:'SUPERVISOR':@VM:'ENGINEERING':@VM:'ENG_TECH' OverrideGroups = 'LEAD':@VM:'SUPERVISOR':@VM:'ENGINEERING':@VM:'ENG_TECH'
UserVerification = Dialog_Box('NDW_VERIFY_USER', @WINDOW, @USER4:@FM:OverrideGroups:@FM:'':@FM:UserMsg) UserVerification = Dialog_Box('NDW_VERIFY_USER', @WINDOW, @USER4:@FM:OverrideGroups:@FM:'':@FM:UserMsg)
Override = UserVerification<1> Override = UserVerification<1>
If Not(Override) then return OverrideUser = UserVerification<2>
If Override then
Override_log_services('Create', 'RDS', RDSNo, OverrideUser, '', 'TW_USAGE', '')
end else
return
end
end end
end end
end end
@ -726,3 +736,4 @@ return