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

Added unlocking of WO_MAT records and additional

Browse Source 
logging.
This commit is contained in:
Infineon\Mitchem 2025-02-10 09:40:04 -07:00 committed by Stieber Daniel (CSC FI SPS MESLEO)
parent 459345d6c3
commit b01e7e8750
2 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
LSL2/STPROC/MONA_SERVICES.txt
View File

@ -181,10 +181,13 @@ SwapResourceNames:
MonaResource = 'GRP_OPENINSIGHT_MES_OP_FE_DEV_SAP_OUTBOUND' MonaResource = 'GRP_OPENINSIGHT_MES_OP_FE_DEV_SAP_OUTBOUND'
StatusName = 'SFTP-Interface-Outbound-Dev' StatusName = 'SFTP-Interface-Outbound-Dev'
Case ( (MonaResource EQ 'GRP_OPENINSIGHT_MES_OP_FE_SAP_OUTBOUND') and (StatusName EQ 'SetSAPBatchQueue') )
MonaResource = 'GRP_OPENINSIGHT_MES_OP_FE_DEV_SAP_OUTBOUND'
StatusName = 'SetSAPBatchQueue-Dev'
Case ( (MonaResource EQ 'GRP_OPENINSIGHT_MES_OP_FE_SAP_INBOUND') and (StatusName EQ 'SFTP-Interface-Inbound') ) Case ( (MonaResource EQ 'GRP_OPENINSIGHT_MES_OP_FE_SAP_INBOUND') and (StatusName EQ 'SFTP-Interface-Inbound') )
MonaResource = 'GRP_OPENINSIGHT_MES_OP_FE_DEV_SAP_INBOUND' MonaResource = 'GRP_OPENINSIGHT_MES_OP_FE_DEV_SAP_INBOUND'
StatusName = 'SFTP-Interface-Inbound-Dev' StatusName = 'SFTP-Interface-Inbound-Dev'
End Case End Case
return return

32
LSL2/STPROC/OBJ_POST_LOG.txt
View File

@ -7,6 +7,7 @@ COMPILE FUNCTION obj_Post_Log(Method,Parms)
05/12/2008 JCH - Initial Coding 05/12/2008 JCH - Initial Coding
04/22/2019 DJS - Added unlock service statements within POST subroutine wherever an error condition returns 04/22/2019 DJS - Added unlock service statements within POST subroutine wherever an error condition returns
prematurely to prevent POST_LOG service from locking up. prematurely to prevent POST_LOG service from locking up.
02/10/2025 DJM - Added additional logging and unlocking logic for WO_MAT records.
Properties: Properties:
@ -19,15 +20,16 @@ COMPILE FUNCTION obj_Post_Log(Method,Parms)
DECLARE FUNCTION Get_Status, Msg, Utility, obj_Tables, Get_Property, obj_RDS, Database_Services, Environment_Services DECLARE FUNCTION Get_Status, Msg, Utility, obj_Tables, Get_Property, obj_RDS, Database_Services, Environment_Services
DECLARE FUNCTION Logging_Services DECLARE FUNCTION Logging_Services, Datetime, SRP_DateTime
DECLARE SUBROUTINE Set_Status, Msg, obj_Tables, Send_Dyn, Send_Dyn, RList, obj_WO_Log, Send_Event, obj_RDS DECLARE SUBROUTINE Set_Status, Msg, obj_Tables, Send_Dyn, Send_Dyn, RList, obj_WO_Log, Send_Event, obj_RDS
DECLARE SUBROUTINE obj_WO_Mat, Send_Info, obj_Notes, ErrMsg, Logging_Services DECLARE SUBROUTINE obj_WO_Mat, Send_Info, obj_Notes, ErrMsg, Logging_Services, Mona_Services
$INSERT POST_LOG_EQUATES $INSERT POST_LOG_EQUATES
$INSERT WO_MAT_EQUATES $INSERT WO_MAT_EQUATES
$INSERT RDS_EQU $INSERT RDS_EQU
$INSERT REACT_RUN_EQUATES $INSERT REACT_RUN_EQUATES
$INSERT LOGICAL
EQU CRLF$ TO \0D0A\ EQU CRLF$ TO \0D0A\
Equ Comma$ to ',' Equ Comma$ to ','
@ -36,7 +38,7 @@ LogPath = Environment_Services('GetApplicationRootPath') : '\LogFiles\POST_L
LogDate = Oconv(Date(), 'D4/') LogDate = Oconv(Date(), 'D4/')
LogTime = Oconv(Time(), 'MTS') LogTime = Oconv(Time(), 'MTS')
LogFileName = LogDate[7, 4] : '-' : LogDate[1, 2] : '-' : LogDate[4, 2] : ' SAPBatchNo Log.csv' LogFileName = LogDate[7, 4] : '-' : LogDate[1, 2] : '-' : LogDate[4, 2] : ' SAPBatchNo Log.csv'
Headers = 'Logging DTM' : @FM : 'WOMatKey' : @FM : ' SAPBatchNo' Headers = 'Logging DTM' : @FM : 'WOMatKey' : @FM : ' SAPBatchNo' : @FM : 'Failed?'
objLog = Logging_Services('NewLog', LogPath, LogFileName, CRLF$, Comma$, Headers, '', False$, False$) objLog = Logging_Services('NewLog', LogPath, LogFileName, CRLF$, Comma$, Headers, '', False$, False$)
LoggingDTM = LogDate : ' ' : LogTime ; // Logging DTM LoggingDTM = LogDate : ' ' : LogTime ; // Logging DTM
@ -103,6 +105,7 @@ If ( (TableName EQ 'WO_MAT') and (FieldNos EQ WO_MAT_SAP_BATCH_NO$) ) then
LogData<1> = LoggingDTM LogData<1> = LoggingDTM
LogData<2> = TableKey LogData<2> = TableKey
LogData<3> = FieldDataVals LogData<3> = FieldDataVals
LogDate<4> = ''
Logging_Services('AppendLog', objLog, LogData, @RM, @FM) Logging_Services('AppendLog', objLog, LogData, @RM, @FM)
end end
@ -131,7 +134,8 @@ Post:
Unlock hSysLists, ServiceKeyID else Null Unlock hSysLists, ServiceKeyID else Null
RETURN RETURN
END END
If @RecCount EQ 0 then Mona_Services('SendBufferedStatus', 'GRP_OPENINSIGHT_MES_OP_FE_SAP_OUTBOUND', 'SetSAPBatchQueue', 'ok')
Done = 0 Done = 0
LOOP LOOP
READNEXT PostLogKey USING CursorVar ELSE Done = 1 READNEXT PostLogKey USING CursorVar ELSE Done = 1
@ -146,14 +150,30 @@ Post:
RecKey = FIELD(PostLogKey,'*',3,99) RecKey = FIELD(PostLogKey,'*',3,99)
IF RowExists(LogFile,RecKey) THEN IF RowExists(LogFile,RecKey) THEN
errCode = '' errCode = ''
UFParms = LogFile:@RM:RecKey:@RM:@RM UFParms = LogFile:@RM:RecKey:@RM:@RM
UpdateRec = obj_Tables('ReadRec',UFParms) UpdateRec = obj_Tables('ReadRec',UFParms)
IF Get_Status(errCode) THEN IF Get_Status(errCode) THEN
If (Field(PostLogKey, '*', 1) EQ 'WO_MAT') AND (PostLogRec<POST_LOG_FIELD_NO$, 1> EQ WO_MAT_SAP_BATCH_NO$) then
AllowedTime = SRP_DateTime("AddMinutes", DateTime(), -5)
If (Field(PostLogKey, '*', 2)) LT AllowedTime then
Resp = Database_Services('UnlockKeyID', 'WO_MAT', PostLogRec<POST_LOG_REC_KEY1$>)
If Resp NE False$ then
Mona_Services('SendBufferedStatus', 'GRP_OPENINSIGHT_MES_OP_FE_SAP_OUTBOUND', 'SetSAPBatchQueue', 'ok')
end else
Mona_Services('SendBufferedStatus', 'GRP_OPENINSIGHT_MES_OP_FE_SAP_OUTBOUND', 'SetSAPBatchQueue', 'critical')
LogData = ''
LogData<1> = LoggingDTM
LogData<2> = TableKey
LogData<3> = FieldDataVals
LogData<4> = 'Record failed to unlock.'
Logging_Services('AppendLog', objLog, LogData, @RM, @FM)
end
end
end
Set_Status(0) ;* Cant't get the lock or other problem reading the log rec so just bail Set_Status(0) ;* Cant't get the lock or other problem reading the log rec so just bail
obj_Tables('UnlockRec',PlParms) obj_Tables('UnlockRec',PlParms)
END ELSE END ELSE
FieldCnt = COUNT(PostLogRec<POST_LOG_FIELD_NO$>,@VM) + (PostLogRec<POST_LOG_FIELD_NO$> NE '') FieldCnt = COUNT(PostLogRec<POST_LOG_FIELD_NO$>,@VM) + (PostLogRec<POST_LOG_FIELD_NO$> NE '')