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

Merged PR 11840: Added MFS logic to ensure notes data cannot be removed.

Browse Source 
Added MFS logic to ensure notes data cannot be removed.

Related work items: #231781
This commit is contained in:
Ouellette Jonathan (CSC FI SPS MESLEO) 2025-03-03 20:19:19 +01:00
parent 15495aa7ef
commit 6fd0d30717
4 changed files with 10584 additions and 1609 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12029
LSL2/OIWIN/REACTOR_LOG.json
View File

File diff suppressed because it is too large Load Diff

11
LSL2/STPROC/COMM_REACTOR_LOG.txt
View File

@ -372,8 +372,11 @@ Write:
end end
end end
IOOptions = Get_Property(@Window, 'IOOPTIONS')
IOOptions<6> = True$
Set_Property(@Window, 'IOOPTIONS', IOOptions)
Reactor_Log_Events(@Window, 'WRITE') Reactor_Log_Events(@Window, 'WRITE')
Reactor_Log_Events(@Window, 'READ')
Result = 1 Result = 1
RETURN RETURN
@ -676,7 +679,7 @@ TechSign:
If Valid then If Valid then
SuccessfulSign = Reactor_Log_Services('SignReactorLog', ReactorLogNo, @USER4) SuccessfulSign = Reactor_Log_Services('SignReactorLog', ReactorLogNo, @USER4)
If SuccessfulSign EQ 0 then If Not(SuccessfulSign) then
Error_Services('DisplayError') Error_Services('DisplayError')
ActiveRlNicaOrderIds = Nica_Orders_Services('GetActiveOrders', 'REACTOR_LOG', ReactorLogNo) ActiveRlNicaOrderIds = Nica_Orders_Services('GetActiveOrders', 'REACTOR_LOG', ReactorLogNo)
ActiveChecklist = (ActiveRlNicaOrderIds NE '') ActiveChecklist = (ActiveRlNicaOrderIds NE '')
@ -1399,7 +1402,7 @@ PostItems:
RLNo = Vals[1,@RM] RLNo = Vals[1,@RM]
PostBy = Vals[COL2()+1,@RM] PostBy = Vals[COL2()+1,@RM]
PostDTM = Vals[COL2()+1,@RM] PostDTM = Vals[COL2()+1,@RM]
Reactor_Log_Events(@WINDOW, 'WRITE')
CurrRLRec = Get_Property (@Window, "ATRECORD") CurrRLRec = Get_Property (@Window, "ATRECORD")
Database_Services('WriteDataRow', 'REACTOR_LOG', RLNo, CurrRLRec, 1, 0, 1) Database_Services('WriteDataRow', 'REACTOR_LOG', RLNo, CurrRLRec, 1, 0, 1)
Set_Property(@Window, 'SAVEWARN', 0) Set_Property(@Window, 'SAVEWARN', 0)
@ -1658,5 +1661,3 @@ ColorRemRiTable:
return return

125
LSL2/STPROC/REACTOR_LOG_ACTIONS.txt
View File

@ -59,7 +59,7 @@ $Insert WO_MAT_QA_EQUATES
Equ WOCust$ to 2 Equ WOCust$ to 2
Equ Comma$ to ',' Equ Comma$ to ','
Declare function Error_Services, Database_Services, Logging_Services, Environment_Services, Nica_Orders_Services Declare function Error_Services, Database_Services, Logging_Services, Environment_Services, Nica_Orders_Services, SRP_Sort_Array
Declare subroutine Error_Services, Database_Services, Logging_Services, Set_Status, Reactor_Log_Services, Rds_Services Declare subroutine Error_Services, Database_Services, Logging_Services, Set_Status, Reactor_Log_Services, Rds_Services
Declare subroutine Nica_Orders_Services Declare subroutine Nica_Orders_Services
@ -142,65 +142,81 @@ READONLY_RECORD:
return return
WRITE_RECORD_PRE: WRITE_RECORD_PRE:
ActionFlow = ACTION_CONTINUE$
//Ensures notes are not deleted
OrigNotes = OrigRecord<REACTOR_LOG_NOTES$>
UpdatedNotes = Record<REACTOR_LOG_NOTES$>
for each OrigNote in OrigNotes using @VM setting NotePos
If OrigNote NE UpdatedNotes<1, NotePos> then
Error_Services('Add', 'Notes content error.')
OrigFileError = 104:': Notes content error.'
Status = 0
Record = ''
ActionFlow = ACTION_STOP$
end
until ActionFlow EQ ACTION_STOP$
Next UpdatedNote
OrigROTRFlag = OrigRecord<REACTOR_LOG_ROTR$> If ActionFlow NE ACTION_STOP$ then
NewROTRFlag = Record<REACTOR_LOG_ROTR$> OrigROTRFlag = OrigRecord<REACTOR_LOG_ROTR$>
UpdatedROTRFlag = OrigRecord<REACTOR_LOG_ROTR$>
NewROTRFlag = Record<REACTOR_LOG_ROTR$>
ReactNo = Record<REACTOR_LOG_REACTOR$> ReactNo = Record<REACTOR_LOG_REACTOR$>
StopRDS = Xlate('REACT_STATE', ReactNo, 'LAST_RDS_NO', 'X') StopRDS = Xlate('REACT_STATE', ReactNo, 'LAST_RDS_NO', 'X')
OrigWafersRemoved = OrigRecord<REACTOR_LOG_WAFERS_REMOVED$> OrigWafersRemoved = OrigRecord<REACTOR_LOG_WAFERS_REMOVED$>
NewWafersRemoved = Record<REACTOR_LOG_WAFERS_REMOVED$> NewWafersRemoved = Record<REACTOR_LOG_WAFERS_REMOVED$>
If (Not(OrigROTRFlag) and NewROTRFlag EQ True$) or (Not(OrigWafersRemoved) and NewWafersRemoved) then If (Not(OrigROTRFlag) and NewROTRFlag EQ True$) or (Not(OrigWafersRemoved) and NewWafersRemoved) then
If ReactNo NE '' then If ReactNo NE '' then
ReactRec = Database_Services('ReadDataRow', 'REACTOR', ReactNo) ReactRec = Database_Services('ReadDataRow', 'REACTOR', ReactNo)
ReactRec<REACTOR_ROTR_STOP_RDS$> = StopRDS ReactRec<REACTOR_ROTR_STOP_RDS$> = StopRDS
Database_Services('WriteDataRow', 'REACTOR', ReactNo, ReactRec, True$, False$, True$) Database_Services('WriteDataRow', 'REACTOR', ReactNo, ReactRec, True$, False$, True$)
end
end
RdsKeys = Record<REACTOR_LOG_WAFERS_REMOVED_RDS$>
If (Not(OrigWafersRemoved)) and (NewWafersRemoved EQ True$) and (ReactNo NE '') and (RdsKeys NE '') then
LogPath = Environment_Services('GetApplicationRootPath') : '\LogFiles\ReactorLog'
LogDate = Oconv(Date(), 'D4/')
LogTime = Oconv(Time(), 'MTS')
LogFileName = LogDate[7, 4] : '-' : LogDate[1, 2] : '-' : LogDate[4, 2] : 'Wafers Removed Log.csv'
Headers = 'Logging DTM' : @FM : 'ReactorNo' : @FM : 'Notes'
objLog = Logging_Services('NewLog', LogPath, LogFileName, CRLF$, Comma$, Headers, '', False$, False$, True$)
LoggingDTM = LogDate : ' ' : LogTime ; // Logging DTM
// Log metrology modification attempt
Swap @VM with ',' in RdsKeys
LogData = ''
LogData<1> = LoggingDtm
LogData<2> = ReactNo
LogData<3> = 'Wafers removed from reactor, ReactorLog ':Name:'. Attempting to apply abort metrology on RdsKeys ':RdsKeys:'.'
Logging_Services('AppendLog', objLog, LogData, @RM, @FM)
Swap ',' with @FM in RdsKeys
Rds_Services('ApplyAbortMetrology', RdsKeys)
If Error_Services('HasError') then
// Log failure
ErrorMsg = Error_Services('GetMessage')
LogData = ''
LogData<1> = LoggingDtm
LogData<2> = ReactNo
LogData<3> = 'Error applying abort metrology. Error message: ':ErrorMsg
Logging_Services('AppendLog', objLog, LogData, @RM, @FM)
end else
// Log success
LogData = ''
LogData<1> = LoggingDtm
LogData<2> = ReactNo
LogData<3> = 'Successfully applied abort metrology'
Logging_Services('AppendLog', objLog, LogData, @RM, @FM)
end
end end
end end
RdsKeys = Record<REACTOR_LOG_WAFERS_REMOVED_RDS$>
If (Not(OrigWafersRemoved)) and (NewWafersRemoved EQ True$) and (ReactNo NE '') and (RdsKeys NE '') then
LogPath = Environment_Services('GetApplicationRootPath') : '\LogFiles\ReactorLog'
LogDate = Oconv(Date(), 'D4/')
LogTime = Oconv(Time(), 'MTS')
LogFileName = LogDate[7, 4] : '-' : LogDate[1, 2] : '-' : LogDate[4, 2] : 'Wafers Removed Log.csv'
Headers = 'Logging DTM' : @FM : 'ReactorNo' : @FM : 'Notes'
objLog = Logging_Services('NewLog', LogPath, LogFileName, CRLF$, Comma$, Headers, '', False$, False$, True$)
LoggingDTM = LogDate : ' ' : LogTime ; // Logging DTM
// Log metrology modification attempt
Swap @VM with ',' in RdsKeys
LogData = ''
LogData<1> = LoggingDtm
LogData<2> = ReactNo
LogData<3> = 'Wafers removed from reactor, ReactorLog ':Name:'. Attempting to apply abort metrology on RdsKeys ':RdsKeys:'.'
Logging_Services('AppendLog', objLog, LogData, @RM, @FM)
Swap ',' with @FM in RdsKeys
Rds_Services('ApplyAbortMetrology', RdsKeys)
If Error_Services('HasError') then
// Log failure
ErrorMsg = Error_Services('GetMessage')
LogData = ''
LogData<1> = LoggingDtm
LogData<2> = ReactNo
LogData<3> = 'Error applying abort metrology. Error message: ':ErrorMsg
Logging_Services('AppendLog', objLog, LogData, @RM, @FM)
end else
// Log success
LogData = ''
LogData<1> = LoggingDtm
LogData<2> = ReactNo
LogData<3> = 'Successfully applied abort metrology'
Logging_Services('AppendLog', objLog, LogData, @RM, @FM)
end
end
return return
WRITE_RECORD: WRITE_RECORD:
@ -377,3 +393,4 @@ Restore_System_Variables:
return return

18
LSL2/STPROC/REACTOR_LOG_EVENTS.txt
View File

@ -51,7 +51,7 @@ EQU COL$ITEM_ID TO 7
EQU COL$ITEM_RI_NO TO 8 EQU COL$ITEM_RI_NO TO 8
Declare subroutine Post_Event, Database_Services Declare subroutine Post_Event, Database_Services
Declare function Datetime, SRP_String Declare function Datetime, SRP_String, 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
@ -79,9 +79,9 @@ Return EventFlow or 1
Event WINDOW.CREATE(CreateParam) Event WINDOW.CREATE(CreateParam)
GoSub SetupOLEControls GoSub SetupOLEControls
* IOOptions = Get_Property(@Window, 'IOOPTIONS') IOOptions = Get_Property(@Window, 'IOOPTIONS')
* IOOptions<6> = True$ ; // Don't clear on write IOOptions<6> = True$ ; // Don't clear on write
* Set_Property(@Window, 'IOOPTIONS', IOOptions) Set_Property(@Window, 'IOOPTIONS', IOOptions)
end event end event
@ -99,6 +99,10 @@ Event WINDOW.WRITE()
QBF = Get_Property(@Window, "QBFSTATUS") QBF = Get_Property(@Window, "QBFSTATUS")
If QBF EQ False$ then Set_Property(@Window:'.OLE_EDT_NOTES', 'OLE.ARRAY', '') If QBF EQ False$ then Set_Property(@Window:'.OLE_EDT_NOTES', 'OLE.ARRAY', '')
IOOptions = Get_Property(@Window, 'IOOPTIONS')
IOOptions<6> = True$
Set_Property(@Window, 'IOOPTIONS', IOOptions)
end event end event
@ -220,7 +224,8 @@ return
FillForm: FillForm:
AtRecord = Get_Property(@Window, 'ATRECORD') RLNo = Get_Property(@Window:'.REACTOR_LOG_NO', 'TEXT')
AtRecord = Database_Services('ReadDataRow', 'REACTOR_LOG', RLNo)
Notes = AtRecord<REACTOR_LOG_NOTES$> Notes = AtRecord<REACTOR_LOG_NOTES$>
// OI 10 seems to messing up delimiters... // OI 10 seems to messing up delimiters...
Convert @TM to @VM in Notes Convert @TM to @VM in Notes
@ -270,8 +275,9 @@ UpdateNotes:
AtRecord<REACTOR_LOG_NOTES$> = Notes AtRecord<REACTOR_LOG_NOTES$> = Notes
AtRecord<REACTOR_LOG_NOTES_DTMS$> = IConv(NotesDTMs, 'DT') AtRecord<REACTOR_LOG_NOTES_DTMS$> = IConv(NotesDTMs, 'DT')
AtRecord<REACTOR_LOG_NOTES_USERS$> = Get_Property(@Window, '@NOTES_USERNAMES') AtRecord<REACTOR_LOG_NOTES_USERS$> = Get_Property(@Window, '@NOTES_USERNAMES')
Set_Property(@Window, 'ATRECORD', AtRecord)
@Record = AtRecord
Database_Services('WriteDataRow', 'REACTOR_LOG', @ID, AtRecord, True$) Database_Services('WriteDataRow', 'REACTOR_LOG', @ID, AtRecord, True$)
return return