From f8c96150f5c27d19ca4ac06025612d1cf9153fb2 Mon Sep 17 00:00:00 2001 From: "Ouellette Jonathan (CSC FI SPS MESLEO)" Date: Thu, 27 Mar 2025 22:26:35 +0100 Subject: [PATCH] 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 --- LSL2/STPROC/METROLOGY_SERVICES.txt | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/LSL2/STPROC/METROLOGY_SERVICES.txt b/LSL2/STPROC/METROLOGY_SERVICES.txt index f5d6a25..884cde1 100644 --- a/LSL2/STPROC/METROLOGY_SERVICES.txt +++ b/LSL2/STPROC/METROLOGY_SERVICES.txt @@ -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 +