more bug fixes

This commit is contained in:
Infineon\StieberD 2024-09-17 15:59:06 -07:00
parent 36be2709c9
commit b8a10dfcc8
6 changed files with 2512 additions and 389 deletions

View File

@ -0,0 +1,11 @@
{
"header": {
"version": 1,
"type": "record"
},
"body": {
"record1": {
"<1>": "DECLARE subroutine Print_Barcode_Label, ErrMsg\r\nDECLARE function Popup\r\n\r\nTypeOver = ''\r\nUserIDs = Popup(@WINDOW,TypeOver,'USER_ID')\t;* Popup uses active select list created with MAKE.LIST\r\n\r\nIF UserIDs = '' THEN\r\n\tErrMsg('No users selected...')\r\n\tRETURN\r\nEND\r\n\r\nUserCnt = COUNT(UserIDs,@VM) + (UserIDs NE '')\r\n\r\n\r\nIDList = ''\r\nFOR I = 1 TO UserCnt\r\n\tUserID = UserIDs<1,I>\r\nNEXT I\r\n\r\nPrint_Barcode_Label ('EmployeeBadge', UserIDs)\r\n\r\nRETURN 0"
}
}
}

View File

@ -8506,7 +8506,7 @@
}
},
"<2>": {
"<2,1>": "",
"<2,1>": "WINDOWS.PROD.EMPLOYEE_BADGE",
"<2,2>": {
"<2,2,1>": {
"<2,2,1,1>": "R",

File diff suppressed because it is too large Load Diff

View File

@ -3,9 +3,9 @@ Compile function JONATHAN_Services(@Service, @Params)
Declare function Gan_Services, Obj_Notes_Sent, msg, Check_Notes, Jonathan_Services, Database_Services, SRP_Datetime
Declare function Lsl_Users_Services, SRP_Time, RList, Error_Services, Obj_Wo_Mat, Pm_Services, Date_Services, Test_Run_Services
Declare function Reactor_Services, Reactor_Log_Services
Declare function Reactor_Services, Reactor_Log_Services, Environment_Services, Logging_Services, Obj_Wm_out, Obj_wo_mat
Declare subroutine Start_Window, RList, Set_Status, Database_Services, Obj_Sap, Sap_Services, Btree.Extract
Declare subroutine Reactor_Services
Declare subroutine Reactor_Services, Logging_Services
$insert LOGICAL
$insert NOTE_PTRS_EQU
@ -39,6 +39,78 @@ Return Response or ""
// SERVICES
//-----------------------------------------------------------------------------
Service GetRDSwithMultipleRDSTestKeys()
debug
LotsWithBadRDSTestKeys = ''
RDSList = Database_Services('ReadDataRow', 'SYSLISTS', 'TEST_JONATHAN')
for each RDS in RDSList using @FM setting rPos
RDSLayerKeys = XLATE('REACT_RUN', RDS, 5, 'X')
for each RDSLayerKey in RDSLayerKeys using @Fm
RDSTestKeys = XLATE('RDS_LAYER', RDSLayerKey, 3, 'X')
IF Dcount(RDSTestKeys, @VM) GE 2 then
LotsWithBadRDSTestKeys<-1> = RDSLayerKey
end
Next RDSLayerKey
Next RDS
end service
Service GetWOMatRepStatus()
debug
WONo = 173078
CassNo = 5
ID = WONo : '*' : CassNo
WOMatRec = Database_Services('ReadDataRow', 'WO_MAT', ID)
test = obj_WO_Mat('ReportStatus',ID:@RM:WOMatRec)
end service
Service GetWMOutRepStatus()
debug
WONo = 173078
CassNo = 5
RepStatus = XLATE('WO_MAT',WONo:'*':CassNo,'REP_STATUS','X')[-1,'B':@VM]
IF RepStatus = '' OR RepStatus[1,3] NE 'WMO' THEN
CurrStatus = Jonathan_Services('GetWMOutCurrStatus')
test = OCONV(CurrStatus,'[WM_OUT_CURR_STATUS_CONV]')
end else
test = RepStatus
END
end service
Service GetWMOutCurrStatus()
debug
RecID = '173078*1*5'
Record = Database_Services('ReadDataRow', 'WM_OUT', RecID)
CurrStatus = OBJ_WM_OUT('CurrStatus', RecID:@RM:Record)
Response = CurrStatus
end service
Service Get5SType()
Datalist = Database_Services('ReadDataRow', 'SYSLISTS', 'TEST_JONATHAN')
PMSpecs = ''
for each data in datalist using @FM setting iPos
PMSpecs<iPos, 1> = data
Is5S = Xlate('PM_SPEC', data, PM_SPEC_FIVE_S_FLAG$, 'X')
PMSpecs<iPos, 2> = Is5S
Next data
debug
end service
Service TestLogging()
Headers = 'Logging DTM' : @FM : 'Machine' : @FM : 'Log'
ColumnWidths = 20 : @FM : 15 : @FM : 300
LogPath = Environment_Services('GetApplicationRootPath') : '\LogFiles\JonathansTest'
LogDate = Oconv(Date(), 'D4/')
LogFileName = LogDate[7, 4] : '-' : LogDate[1, 2] : '-' : LogDate[4, 2] : '_ReactorLogPM.csv'
objLog = Logging_Services('NewLog', LogPath, LogFileName, CRLF$, ' ', Headers, ColumnWidths, False$, False$)
LogData = ''
LogData<1> = ''
LogData<2> = ''
LogData<3> = 'This is a test'
Logging_Services('AppendLog', objLog, LogData, @RM, @FM, False$)
end service
Service UpdateYesterdayAvail()
Today = 20702
DataArray = ''
@ -60,11 +132,7 @@ Service UpdateYesterdayAvail()
Database_Services('WriteDataRow', 'REACTOR_DAILY_UPTIME', ALLRecordKey, ALLUptimeRec, True$, False$, True$)
end service
Service GetReactorNumbersByType()
Debug
test = Reactor_Services('GetReactorNumbers', 'ASM')
test := @FM : Reactor_Services('GetReactorNumbers', 'ASM+')
end service
Service SetReactorMetrics()
Reactors = Reactor_Services('GetReactorNumbers')

View File

@ -68,6 +68,12 @@ LogFileName = LogDate[7, 4] : '-' : LogDate[1, 2] : '-' : LogDate[4, 2] : ' WAF
Headers = 'Logging DTM' : @FM : 'RDS Key ID' : @FM : 'WAFERS_IN'
objWafersLog = Logging_Services('NewLog', LogPath, LogFileName, CRLF$, ',', Headers, '', False$, False$)
LogPath = Environment_Services('GetApplicationRootPath') : '\LogFiles\RDS'
LogFileName = LogDate[7, 4] : '-' : LogDate[1, 2] : '-' : LogDate[4, 2] : ' RDS_TEST_DELETE.csv'
Headers = 'Logging DTM' : @FM : 'RDS Test Key ID' : @FM : 'Message'
objRDSTestDeleteLog = Logging_Services('NewLog', LogPath, LogFileName, CRLF$, ',', Headers, '', False$, False$)
LoggingDTM = LogDate : ' ' : LogTime ; // Logging DTM
IF NOT(ASSIGNED(Method)) THEN ErrorMsg = 'Unassigned parameter "Method" passed to subroutine'
@ -313,6 +319,19 @@ For each Layer in Layers using ','
Next TWKey
end
Database_Services('DeleteDataRow', 'RDS_TEST', RDSTestKey, True$, True$)
If Error_Services('NoError') then
LogData = ''
LogData<1> = LoggingDTM
LogData<2> = RDSTestKey
LogData<3> = 'RDS_Test record deleted without error.'
Logging_Services('AppendLog', objRDSTestDeleteLog , LogData, @RM, @FM, False$)
end else
ErrorMessage = Error_Services('GetMessage')
LogData = ''
LogData<1> = LoggingDTM
LogData<2> = ErrorMessage
Logging_Services('AppendLog', objRDSTestDeleteLog , LogData, @RM, @FM, False$)
end
Next RDSTestKey
end
Database_Services('DeleteDataRow', 'RDS_LAYER', RDSLayerKey, True$, False$)

View File

@ -27,7 +27,8 @@ PageInfo<PI$BOTTOM> = 0.1
PageSetup = '1' ;* Landscape
PrintSetup = '' ;* Preview
PrinterID = 'MESZBRPRT008'
PrinterID = 'MESZBRPRT008'
PrintPath = Printer_Select(PrinterID) ;* Popup is skipped IF Printer ID is passed
If PrintPath NE '' then