Merged PR 13428: Added in override logging for test wafer tracking. Refactored Override logging
Added in override logging for test wafer tracking. Refactored Override logging
This commit is contained in:
parent
61435345ad
commit
c50e536791
@ -4,8 +4,8 @@ Compile function Override_Log_Services(@Service, @Params)
|
||||
$insert LOGICAL
|
||||
$Insert OVERRIDE_LOG_EQUATES
|
||||
|
||||
Declare function Datetime, NextKey, Error_Services
|
||||
Declare subroutine Database_Services
|
||||
Declare function Datetime, NextKey, Error_Services, SRP_Datetime
|
||||
Declare subroutine Database_Services, Btree.Extract, Error_Services
|
||||
|
||||
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='')
|
||||
RecKey = Nextkey('OVERRIDE_LOG')
|
||||
|
||||
orRec = ''
|
||||
orRec<OVERRIDE_LOG_TABLE$> = Table
|
||||
orRec<OVERRIDE_LOG_KEY$> = Key
|
||||
orRec<OVERRIDE_LOG_USER$> = OverrideUser
|
||||
orRec<OVERRIDE_LOG_COMMENT$> = OverrideComment
|
||||
orRec<OVERRIDE_LOG_DTM$> = Datetime()
|
||||
orRec<OVERRIDE_LOG_CATEGORY$> = OverrideType
|
||||
orRec<OVERRIDE_LOG_CAUSE$> = OverrideCause
|
||||
|
||||
Database_Services('WriteDataRow', 'OVERRIDE_LOG', RecKey, orRec)
|
||||
|
||||
RecKey = ''
|
||||
for each TableName in Table using @VM setting TablePos
|
||||
RecKey<1,-1> = Nextkey('OVERRIDE_LOG')
|
||||
orRec = ''
|
||||
orRec<OVERRIDE_LOG_TABLE$> = Table<1, TablePos>
|
||||
orRec<OVERRIDE_LOG_KEY$> = Key<1, TablePos>
|
||||
orRec<OVERRIDE_LOG_USER$> = OverrideUser
|
||||
orRec<OVERRIDE_LOG_COMMENT$> = OverrideComment
|
||||
orRec<OVERRIDE_LOG_DTM$> = Datetime()
|
||||
orRec<OVERRIDE_LOG_CATEGORY$> = OverrideType
|
||||
orRec<OVERRIDE_LOG_CAUSE$> = OverrideCause
|
||||
|
||||
Database_Services('WriteDataRow', 'OVERRIDE_LOG', RecKey, orRec)
|
||||
Next TablePos
|
||||
|
||||
If Error_Services('NoError') then
|
||||
Response = RecKey
|
||||
@ -42,4 +45,39 @@ Service Create(Table, Key, OverrideUser, OverrideComment, OverrideType=OVERRIDE_
|
||||
|
||||
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
|
||||
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user