diff --git a/LSL2/STPROC/HOLD_SERVICES.txt b/LSL2/STPROC/HOLD_SERVICES.txt index 72b3047..feb2e98 100644 --- a/LSL2/STPROC/HOLD_SERVICES.txt +++ b/LSL2/STPROC/HOLD_SERVICES.txt @@ -46,19 +46,19 @@ Compile function Hold_Services(@Service, @Params) ***********************************************************************************************************************/ #pragma precomp SRP_PreCompiler -$insert LOGICAL -$Insert SERVICE_SETUP +$Insert APP_INSERTS +$Insert SERVICE_SETUP $Insert MSG_EQUATES $Insert DICT_EQUATES $Insert WO_MAT_EQUATES -$INSERT NOTIFICATION_EQU - +$Insert NOTIFICATION_EQU Declare function Database_Services, Error_Services, Obj_Wm_In, Obj_Wm_Out, Unassigned, Wm_In_Services, Wm_Out_Services Declare function PSN_Services, SRP_Rotate_Array, Datetime, Hold_Services, Memberof, Error_Services, Rds_Services +Declare function Environment_Services, Utility, Logging_Services Declare subroutine Database_Services, Error_Services, Obj_notes, Hold_Services, Obj_Wm_In, Obj_Wm_Out, Wm_In_Services -Declare subroutine Wm_Out_Services, Rds_Services, Lot_Event_Services +Declare subroutine Wm_Out_Services, Rds_Services, Lot_Event_Services, Logging_Services GoToService else Error_Services('Add', Service : ' is not a valid service request within the ' : ServiceModule : ' module.') @@ -268,6 +268,15 @@ end service // Places a lot on hold. //---------------------------------------------------------------------------------------------------------------------- Service OnHold(WOMatKey, HoldEntity, HoldEntityID, HoldType, HoldData, OperatorID, OriginFlag) + + LogDate = Oconv(Date(), 'D4/') + Machine = Environment_Services('GetServer') + Headers = 'Logging DTM' : @FM : 'Machine' : @FM : 'Log' + ColumnWidths = 20 : @FM : 15 : @FM : 300 + LogPath = Environment_Services('GetApplicationRootPath') : '\LogFiles\Holds' + makeDirSuccess = Utility("MAKEDIR", LogPath) + LogFileName = LogDate[7, 4] : '-' : LogDate[1, 2] : '-' : LogDate[4, 2] : '_HoldLog.csv' + objLog = Logging_Services('NewLog', LogPath, LogFileName, CRLF$, ' ', Headers, ColumnWidths, False$, False$) IF WOMatKey = '' or HoldEntity = '' or HoldEntityID = '' or HoldType = '' THEN Error_Services('Add', 'Null parameter WOMatKey, HoldEntity, HoldEntityID, or HoldType passed to service.') @@ -361,29 +370,31 @@ Service OnHold(WOMatKey, HoldEntity, HoldEntityID, HoldType, HoldData, OperatorI If Error_Services("NoError") then Hold_Services("HoldNotification", HoldEntity, HoldEntityID, Reason, True$, HoldType, OperatorID) Hold_Services("CreateComment", HoldEntity, HoldEntityID, Reason, True$, HoldType, OperatorID) - //Add in logging lot event - If UserId EQ '' then - UserId = OperatorId - end + LotKey = '' Begin Case Case HoldEntity EQ 'WM_IN' - WONo = Field(WOMatKey, '*', 1) - StepNo = 1 - CassNo = Field(WOMatKey, '*', 2) + WONo = Field(WOMatKey, '*', 1) + StepNo = 1 + CassNo = Field(WOMatKey, '*', 2) WMInKey = WONo : '*' : StepNo : '*' : CassNo - Lot_Event_Services('CreateLotEvent', WMInKey, CurrDTM, 'HOLD_ON', 'Lot placed on hold.', '', UserId, True$, 'WM_IN') + LotKey = WMInKey Case HoldEntity EQ 'WM_OUT' - WONo = Field(WOMatKey, '*', 1) - StepNo = 1 - CassNo = Field(WOMatKey, '*', 2) + WONo = Field(WOMatKey, '*', 1) + StepNo = 1 + CassNo = Field(WOMatKey, '*', 2) WMOutKey = WONo : '*' : StepNo : '*' : CassNo - Lot_Event_Services('CreateLotEvent', WMOutKey, CurrDTM, 'HOLD_ON', 'Lot placed on hold.', '', UserId, True$, 'WM_OUT') + LotKey = WMOutKey Case HoldEntity EQ 'RDS' - RDSNo = Xlate('WO_MAT', WOMatKey, WO_MAT_RDS_NO$, 'X') - Lot_Event_Services('CreateLotEvent', RDSNo, CurrDTM, 'HOLD_ON', 'Lot placed on hold.', '', UserId, True$, 'RDS') + RDSNo = Xlate('WO_MAT', WOMatKey, WO_MAT_RDS_NO$, 'X') + LotKey = RDSNo Case HoldEntity EQ 'WO_MAT' - Lot_Event_Services('CreateLotEvent', WOMatKey, CurrDTM, 'HOLD_ON', 'Lot placed on hold.', '', UserId, True$, 'WO_MAT') + LotKey = WOMatKey End Case + LogData = '' + LogData<1> = Oconv(Date(), 'D4/') : ' ' : Oconv(Time(), 'MTS') ; // Logging DTM + LogData<2> = Machine + LogData<3> = 'Lot ':LotKey:' of type ':HoldEntity:' placed on hold by user ':OperatorId + Logging_Services('AppendLog', objLog, LogData, @RM, @FM, False$) end end else Error_Services('Add', 'Lot is already on hold.') @@ -406,6 +417,15 @@ End Service // Removes a hold placed on a lot. //---------------------------------------------------------------------------------------------------------------------- Service OffHold(WOMatKey, HoldEntity, HoldEntityID, HoldType, HoldData, OperatorID, OriginFlag) + + LogDate = Oconv(Date(), 'D4/') + Machine = Environment_Services('GetServer') + Headers = 'Logging DTM' : @FM : 'Machine' : @FM : 'Log' + ColumnWidths = 20 : @FM : 15 : @FM : 300 + LogPath = Environment_Services('GetApplicationRootPath') : '\LogFiles\Holds' + makeDirSuccess = Utility("MAKEDIR", LogPath) + LogFileName = LogDate[7, 4] : '-' : LogDate[1, 2] : '-' : LogDate[4, 2] : '_HoldLog.csv' + objLog = Logging_Services('NewLog', LogPath, LogFileName, CRLF$, ' ', Headers, ColumnWidths, False$, False$) IF WOMatKey = '' or HoldEntity = '' or HoldEntityID = '' or HoldType = '' THEN Error_Services('Add', 'Null parameter WOMatKey, HoldEntity, HoldEntityID, or HoldType passed to service.') @@ -497,29 +517,31 @@ Service OffHold(WOMatKey, HoldEntity, HoldEntityID, HoldType, HoldData, Operator If Error_Services("NoError") then Hold_Services("HoldNotification", HoldEntity, HoldEntityID, Reason, False$, HoldType, OperatorID) Hold_Services("CreateComment", HoldEntity, HoldEntityID, Reason, False$, HoldType, OperatorID) - //Add in logging lot event - if UserID EQ '' then - UserId = OperatorId - end - Begin Case - Case HoldEntity EQ 'WM_IN' - WONo = Field(WOMatKey, '*', 1) - StepNo = 1 - CassNo = Field(WOMatKey, '*', 2) - WMInKey = WONo : '*' : StepNo : '*' : CassNo - Lot_Event_Services('CreateLotEvent', WMInKey, CurrDTM, 'HOLD_OFF', 'Lot taken off hold.', '', UserId, True$, 'WM_IN') - Case HoldEntity EQ 'WM_OUT' - WONo = Field(WOMatKey, '*', 1) - StepNo = 1 - CassNo = Field(WOMatKey, '*', 2) - WMOutKey = WONo : '*' : StepNo : '*' : CassNo - Lot_Event_Services('CreateLotEvent', WMOutKey, CurrDTM, 'HOLD_OFF', 'Lot taken off hold.', '', UserId, True$, 'WM_OUT') - Case HoldEntity EQ 'RDS' - RDSNo = Xlate('WO_MAT', WOMatKey, WO_MAT_RDS_NO$, 'X') - Lot_Event_Services('CreateLotEvent', RDSNo, CurrDTM, 'HOLD_OFF', 'Lot taken off hold.', '', UserId, True$, 'RDS') - Case HoldEntity EQ 'WO_MAT' - Lot_Event_Services('CreateLotEvent', WOMatKey, CurrDTM, 'HOLD_OFF', 'Lot taken off hold.', '', UserId, True$, 'WO_MAT') - End Case + LotKey = '' + Begin Case + Case HoldEntity EQ 'WM_IN' + WONo = Field(WOMatKey, '*', 1) + StepNo = 1 + CassNo = Field(WOMatKey, '*', 2) + WMInKey = WONo : '*' : StepNo : '*' : CassNo + LotKey = WMInKey + Case HoldEntity EQ 'WM_OUT' + WONo = Field(WOMatKey, '*', 1) + StepNo = 1 + CassNo = Field(WOMatKey, '*', 2) + WMOutKey = WONo : '*' : StepNo : '*' : CassNo + LotKey = WMOutKey + Case HoldEntity EQ 'RDS' + RDSNo = Xlate('WO_MAT', WOMatKey, WO_MAT_RDS_NO$, 'X') + LotKey = RDSNo + Case HoldEntity EQ 'WO_MAT' + LotKey = WOMatKey + End Case + LogData = '' + LogData<1> = Oconv(Date(), 'D4/') : ' ' : Oconv(Time(), 'MTS') ; // Logging DTM + LogData<2> = Machine + LogData<3> = 'Lot ':LotKey:' of type ':HoldEntity:' taken off hold by user ':OperatorId + Logging_Services('AppendLog', objLog, LogData, @RM, @FM, False$) end end else Error_Services('Add', 'Lot is not on hold.') @@ -815,4 +837,3 @@ Service CreateComment(HoldEntity, HoldEntityID, Reason, Transition, HoldType, Op end service - diff --git a/LSL2/STPROC/RDS_EVENTS.txt b/LSL2/STPROC/RDS_EVENTS.txt index 7da7000..4de6388 100644 --- a/LSL2/STPROC/RDS_EVENTS.txt +++ b/LSL2/STPROC/RDS_EVENTS.txt @@ -86,10 +86,10 @@ 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 Dialog_Box, Qa_Services, Obj_React_Ll, Start_Window, obj_React_Status, Reactor_Services, Rds_Services -Declare subroutine Lot_Event_Services, Override_Log_Services +Declare subroutine Lot_Event_Services, Override_Log_Services, Logging_Services 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 Datetime, Test_Run_Services +Declare function Datetime, Test_Run_Services, Environment_Services, Logging_Services SubclassInfo = Form_Services('FindSubclassControl') Subclass = SubclassInfo<1> @@ -100,11 +100,11 @@ If Event EQ 'OLE' then Transfer Param1 to Event Transfer Param2 to Param1 Transfer Param3 to Param2 - * Transfer Param4 to Param3 - * Transfer Param5 to Param4 - * Transfer Param6 to Param5 - * Transfer Param7 to Param6 - * Transfer Param8 to Param7 + Transfer Param4 to Param3 + Transfer Param5 to Param4 + Transfer Param6 to Param5 + Transfer Param7 to Param6 + Transfer Param8 to Param7 end GoToEvent Event for CtrlEntID @@ -463,7 +463,19 @@ Event PUB_SIGN.CLICK() OverrideUser = Response<2> If Valid then - Lot_Event_Services('CreateLotEvent', RDSNo, Datetime(), 'UNSIGN_LOAD', 'Load stage unsigned', 'Reactor', @User4, True$, 'RDS') + LogDate = Oconv(Date(), 'D4/') + Machine = Environment_Services('GetServer') + Headers = 'Logging DTM' : @FM : 'Machine' : @FM : 'Log' + ColumnWidths = 20 : @FM : 15 : @FM : 300 + LogPath = Environment_Services('GetApplicationRootPath') : '\LogFiles\Load' + makeDirSuccess = Utility("MAKEDIR", LogPath) + LogFileName = LogDate[7, 4] : '-' : LogDate[1, 2] : '-' : LogDate[4, 2] : '_LoadLog.csv' + objLog = Logging_Services('NewLog', LogPath, LogFileName, CRLF$, ' ', Headers, ColumnWidths, False$, False$) + LogData = '' + LogData<1> = Oconv(Date(), 'D4/') : ' ' : Oconv(Time(), 'MTS') ; // Logging DTM + LogData<2> = Machine + LogData<3> = 'LOAD stage unsigned for RDS ':RDSNo:' by user ':@User4 + Logging_Services('AppendLog', objLog, LogData, @RM, @FM, False$) // 4. Remove WO_MAT Unload signature, date, and time WOMatRec = Database_Services('ReadDataRow', 'WO_MAT', WOMatKey) @@ -728,4 +740,3 @@ OLE_LL_Status: return - diff --git a/LSL2/STPROC/RDS_POST_EPI_EVENTS.txt b/LSL2/STPROC/RDS_POST_EPI_EVENTS.txt index 0d200ed..0ce0b77 100644 --- a/LSL2/STPROC/RDS_POST_EPI_EVENTS.txt +++ b/LSL2/STPROC/RDS_POST_EPI_EVENTS.txt @@ -59,7 +59,6 @@ $insert COMPANY_EQUATES $insert WO_MAT_QA_EQUATES $insert WAFER_COUNTER_EQUATES - Equ COL$LOG_FILE to 1 Equ COL$LOG_DTM to 2 Equ COL$ACTION to 3 @@ -88,10 +87,12 @@ EQU APPGREEN$ TO 192 + (220*256) + (192*65536) EQU APPRED$ TO 255 + (128*256) + (128*65536) EQU APPORANGE$ TO 255 + (176*256) + (0*65536) -Declare subroutine ErrMsg, Set_Status, obj_WO_Mat, obj_WO_Mat_Log, obj_RDS, RDS_Services, Signature_Services, obj_Notes -Declare subroutine Comm_RDS, WO_Mat_QA_Services, Wafer_Counter_Services, Dialog_Box, Lot_Event_Services -Declare function Dialog_Box, Msg, MemberOf, obj_WO_Mat, Database_Services, QA_Services, Signature_Services -Declare function RDS_Services, Wafer_Counter_Services, Datetime, Supplement_Services +Declare subroutine ErrMsg, Set_Status, obj_WO_Mat, obj_WO_Mat_Log, obj_RDS, RDS_Services, Signature_Services, obj_Notes +Declare subroutine Comm_RDS, WO_Mat_QA_Services, Wafer_Counter_Services, Dialog_Box, Lot_Event_Services +Declare subroutine Logging_Services +Declare function Dialog_Box, Msg, MemberOf, obj_WO_Mat, Database_Services, QA_Services, Signature_Services +Declare function RDS_Services, Wafer_Counter_Services, Datetime, Supplement_Services, Environment_Services +Declare function Logging_Services SubclassInfo = Form_Services('FindSubclassControl') Subclass = SubclassInfo<1> @@ -102,11 +103,11 @@ If Event EQ 'OLE' then Transfer Param1 to Event Transfer Param2 to Param1 Transfer Param3 to Param2 -* Transfer Param4 to Param3 -* Transfer Param5 to Param4 -* Transfer Param6 to Param5 -* Transfer Param7 to Param6 -* Transfer Param8 to Param7 + Transfer Param4 to Param3 + Transfer Param5 to Param4 + Transfer Param6 to Param5 + Transfer Param7 to Param6 + Transfer Param8 to Param7 end GoToEvent Event for CtrlEntID @@ -603,8 +604,20 @@ Event SIGN_BUTTON.CLICK() Set_Property(@Window : '.POST_EPI_SUP_SIG_DATE', 'TEXT', SigDt) Set_Property(@Window : '.POST_EPI_SUP_SIG_TIME', 'TEXT', SigTmPlusOne) - ** Create LOT_EVENT ** - Lot_Event_Services('CreateLotEvent', RDSNo, Datetime(), 'SIGN_FQA', '', '', @USER4, True$, 'RDS') + + LogDate = Oconv(Date(), 'D4/') + Machine = Environment_Services('GetServer') + Headers = 'Logging DTM' : @FM : 'Machine' : @FM : 'Log' + ColumnWidths = 20 : @FM : 15 : @FM : 300 + LogPath = Environment_Services('GetApplicationRootPath') : '\LogFiles\FQA' + makeDirSuccess = Utility("MAKEDIR", LogPath) + LogFileName = LogDate[7, 4] : '-' : LogDate[1, 2] : '-' : LogDate[4, 2] : '_FQALog.csv' + objLog = Logging_Services('NewLog', LogPath, LogFileName, CRLF$, ' ', Headers, ColumnWidths, False$, False$) + LogData = '' + LogData<1> = Oconv(Date(), 'D4/') : ' ' : Oconv(Time(), 'MTS') ; // Logging DTM + LogData<2> = Machine + LogData<3> = 'FQA stage signed for RDS ':RDSNo:' by user ':@User4 + Logging_Services('AppendLog', objLog, LogData, @RM, @FM, False$) /* Sync up the RDS record with WO_MAT */ IOOptions = Get_Property(@Window, 'IOOPTIONS') diff --git a/LSL2/STPROC/SIGNATURE_SERVICES.txt b/LSL2/STPROC/SIGNATURE_SERVICES.txt index 40a316f..4853d94 100644 --- a/LSL2/STPROC/SIGNATURE_SERVICES.txt +++ b/LSL2/STPROC/SIGNATURE_SERVICES.txt @@ -61,12 +61,12 @@ Equ COL$USER_ID to 8 Equ COL$TAGS to 9 Equ COL$TOOL_ID to 10 -Declare function obj_Prod_Spec, RDS_Services, Error_Services, Signature_Services, Memory_Services, obj_RDS_Test -Declare function SRP_Array -Declare function Database_Services, obj_WO_Mat, Dialog_Box, MemberOf, Msg, QA_Services, Datetime, Supplement_Services -Declare function Environment_Services, GetTickCount +Declare function obj_Prod_Spec, RDS_Services, Error_Services, Signature_Services, Memory_Services, obj_RDS_Test +Declare function SRP_Array, Environment_Services, GetTickCount, QA_Services, Datetime, Supplement_Services +Declare function Database_Services, obj_WO_Mat, Dialog_Box, MemberOf, Msg, Logging_Services Declare subroutine Error_Services, Popup, Memory_Services, SRP_Stopwatch, Set_Status, Database_Services, obj_WO_Mat Declare subroutine Obj_Notes, Signature_Services, Obj_WO_Mat_Log, ErrMsg, Obj_Rds, Lot_Event_Services, Mona_Services +Declare subroutine Logging_Services PSNKey = ServiceKeyID ReactorKey = ServiceKeyID @@ -2849,6 +2849,15 @@ end service Service UnsignFQAStage(RDSNo) + LogDate = Oconv(Date(), 'D4/') + Machine = Environment_Services('GetServer') + Headers = 'Logging DTM' : @FM : 'Machine' : @FM : 'Log' + ColumnWidths = 20 : @FM : 15 : @FM : 300 + LogPath = Environment_Services('GetApplicationRootPath') : '\LogFiles\FQA' + makeDirSuccess = Utility("MAKEDIR", LogPath) + LogFileName = LogDate[7, 4] : '-' : LogDate[1, 2] : '-' : LogDate[4, 2] : '_FQALog.csv' + objLog = Logging_Services('NewLog', LogPath, LogFileName, CRLF$, ' ', Headers, ColumnWidths, False$, False$) + IsEPP = Rds_Services('IsEpiPro', RDSNo) If IsEpp EQ False$ then Database_Services('ActivateRecord', 'RDS', RDSNo) @@ -2893,8 +2902,11 @@ Service UnsignFQAStage(RDSNo) {SUP_VER_SIG_DATE} = '' {SUP_VER_SIG_TIME} = '' Database_Services('WriteDataRow', 'RDS', RDSNo, @Record, True$, False$, False$) - ** Create LOT_EVENT ** - Lot_Event_Services('CreateLotEvent', RDSNo, Datetime(), 'UNSIGN_FQA', '', '', @USER4, True$, 'RDS') + LogData = '' + LogData<1> = Oconv(Date(), 'D4/') : ' ' : Oconv(Time(), 'MTS') ; // Logging DTM + LogData<2> = Machine + LogData<3> = 'FQA stage unsigned for RDS ':RDSNo:' by user ':@User4 + Logging_Services('AppendLog', objLog, LogData, @RM, @FM, False$) end else Error_Services('Add', 'Error accessing RDS.') end @@ -2922,9 +2934,3 @@ GetMostRecentSig: return - - - - - -