diff --git a/LSL2/STPROC/METROLOGY_SERVICES.txt b/LSL2/STPROC/METROLOGY_SERVICES.txt index 6087095..18089d7 100644 --- a/LSL2/STPROC/METROLOGY_SERVICES.txt +++ b/LSL2/STPROC/METROLOGY_SERVICES.txt @@ -925,7 +925,7 @@ Service ImportBioRadData(RunData, FileName) RDSLayerRec = Database_Services('ReadDataRow', 'RDS_LAYER', RDSLayerKeyID) If Error_Services('NoError') then RDSTestKeyIDs = RDSLayerRec - + // Verify the scan recipe matches the spec recipe RecipeMatches = Metrology_Services('ScanRecipeMatchesRdsTestSpecThickMrecipe', RDSKeyID, LayerForValidation, ScanRecipe, RDSTestKeyIDs, ZoneForValidation) If RecipeMatches EQ False$ then @@ -1219,7 +1219,7 @@ end service Service ImportHgCVData(RunData, FileName) - + Machine = 'HgCV' /* Resistivity */ FieldPos = 53 FieldPosIncrement = 9 @@ -1462,7 +1462,7 @@ Service ImportHgCVData(RunData, FileName) WOMatQARec = DataRow Next Index // ------------------------------------------------------------------------------------------------------------ - + // Send data to SPC ------------------------------------------------------------------------------------------- LogPath = Environment_Services('GetSpcFilesharePath') SpcFileDtm = OConv(Datetime(), 'DT2^HS ') @@ -2830,31 +2830,15 @@ CalculateResults: end Database_Services('WriteDataRow', 'RDS_TEST', RDSTestKeyID, RDSTestRec, True$, False$, True$) - ThkTestCheck = Xlate('RDS_TEST', RDSTestKeyID, RDS_TEST_THICK_AVG$, 'X') - ResTestCheck = Xlate('RDS_TEST', RDSTestKeyID, RDS_TEST_RES_AVG$, 'X') - SheetRhoTestCheck = Xlate('RDS_TEST', RDSTestKeyID, RDS_TEST_SHEETRHO_AVG$, 'X') - HGCV1TestCheck = Xlate('RDS_TEST', RDSTestKeyID, RDS_TEST_HGCV1_RES_AVG$, 'X') - // Check to make sure data was written and alert if it wasn't - IF ResTestCheck EQ '' AND ThkTestCheck NE '' AND (SheetRhoTestCheck NE '' OR HGCV1TestCheck NE '')then - Recipients = XLATE('SEC_GROUPS', 'OI_ADMIN', 'USER', 'X') - SentFrom = 'OI Admin' - Subject = 'Missing auto-calculated data detected' - Message = RDSTestRec : ' : ' : RDSTestKeyID: ' failed to auto caluclate results on automated data upload. Failed on Database Write' - AttachWindow = '' - AttachKey = '' - SendToGroup = '' - Parms = Recipients:@RM:SentFrom:@RM:Subject:@RM:Message:@RM:AttachWindow:@RM:AttachKey:@RM:SendToGroup - obj_Notes('Create',Parms) - end - - If Error_Services('NoError') then - Metrology_Services('LogResults', RDSKeyID, Machine, 'UID000', Service : ' : Success - Calculated Results.') - end else - Metrology_Services('LogResults', RDSKeyID, Machine, 'UID002', Service : ' : UID002 - ' : Error_Services('GetMessage')) + + If Error_Services('NoError') then + Metrology_Services('LogResults', RDSKeyID, Machine, 'UID000', Service : ' : Success - Calculated Results.') + end else + Metrology_Services('LogResults', RDSKeyID, Machine, 'UID002', Service : ' : UID002 - ' : Error_Services('GetMessage')) + end end end -end - + return @@ -2987,4 +2971,3 @@ LoadRunDataToDatabase: return -