Merged PR 13911: Allow 7 Digit RDS keys for Tencor and SP1

Removed conditional checks that ensured RDS keys were 6 chars or less from Tencor and SP1 Import routines. Needed to ensure 7 digit rds id's will be compatible with respective metrology import.

Related work items: #225670, #247866, #247867
This commit is contained in:
Ouellette Jonathan (CSC FI SPS MESLEO) 2025-03-27 22:26:35 +01:00
parent 9766e38a93
commit f8c96150f5

View File

@ -1581,8 +1581,7 @@ Service ImportTencorData(RunData)
Swap ' PM' with 'PM' in Timestamp
Timestamp = IConv(Timestamp,'DT')
// If RDSKeyID is not a number or not 6 digits, then ignore. This means it is an engineering run.
If Num(RDSKeyID) AND (Len(RDSKeyID) EQ 6) then
If RowExists('RDS', RDSKeyID) then
// Try to read the CleanInsp datarow. Use this to identify the RDSKeyID.
ReactRunRec = Database_Services('ReadDataRow', 'REACT_RUN', RDSKeyID)
If Error_Services('NoError') then
@ -1808,11 +1807,9 @@ Service ImportTencorData(RunData)
Metrology_Services('LogResults', RDSKeyID, Machine, 'UID001', Service : ' : ' : ErrorMessage)
end
end else
If Num(RDSKeyID) AND (Len(RDSKeyID) GT 0) then
ErrorMessage = 'Invalid RDS Key ID.'
Metrology_Services('LogResults', RDSKeyID, Machine, 'UID001', Service : ' : ' : ErrorMessage)
end
end
ErrorMessage = 'Invalid RDS Key ID.'
Metrology_Services('LogResults', RDSKeyID, Machine, 'UID001', Service : ' : ' : ErrorMessage)
end
If ErrorMessage NE '' then Error_Services('Add', ErrorMessage)
end service
@ -1859,8 +1856,7 @@ Service ImportSP1Data(RunData)
WorkOrder = Work_Order_Services('GetWorkOrder', WorkOrderNo, True$)
GoSub ParseWorkOrder
// If RDSKeyID is not a number or not 6 digits, then ignore. This means it is an engineering run.
If Num(RDSKeyID) AND (Len(RDSKeyID) EQ 6) then
If RowExists('RDS', RDSKeyID) then
// Try to read the CleanInsp datarow. Use this to identify the RDSKeyID.
ReactRunRec = Database_Services('ReadDataRow', 'REACT_RUN', RDSKeyID)
// Check to confirm that the LWI stage has a recipe. If so, then update the UNLOAD stage.
@ -1941,10 +1937,8 @@ Service ImportSP1Data(RunData)
Metrology_Services('LogResults', RDSKeyID, Machine, 'UID001', Service : ' : ' : Error_Services('GetMessage'))
end
end else
If Num(RDSKeyID) AND (Len(RDSKeyID) GT 0) then
Error_Services('Add', 'Invalid RDS Key ID.')
Metrology_Services('LogResults', RDSKeyID, Machine, 'UID001', Service : ' : ' : Error_Services('GetMessage'))
end
Error_Services('Add', 'Invalid RDS Key ID.')
Metrology_Services('LogResults', RDSKeyID, Machine, 'UID001', Service : ' : ' : Error_Services('GetMessage'))
end
end else
Metrology_Services('LogResults', RDSKeyID, Machine, 'UID001', Service : ' : ' : Error_Services('GetMessage'))
@ -2972,3 +2966,4 @@ LoadRunDataToDatabase:
return