diff --git a/LSL2/STPROC/CONFIG_SERVICES.txt b/LSL2/STPROC/CONFIG_SERVICES.txt index 515d78f..0f97044 100644 --- a/LSL2/STPROC/CONFIG_SERVICES.txt +++ b/LSL2/STPROC/CONFIG_SERVICES.txt @@ -136,9 +136,13 @@ Service GetMaterialTrackSettings(UserId) If (UserId NE '') then RepUserId = UserId Convert @Lower.Case to @Upper.Case in RepUserId - Response = Database_Services('ReadDataRow', 'REPORT_CONFIG', 'MATERIAL_TRACK_WEB*':RepUserId) + If RowExists('REPORT_CONFIG', 'MATERIAL_TRACK_WEB*':RepUserId) then + Response = Database_Services('ReadDataRow', 'REPORT_CONFIG', 'MATERIAL_TRACK_WEB*':RepUserId) + end else + Response = Database_Services('ReadDataRow', 'REPORT_CONFIG', 'MATERIAL_TRACK_WEB*DEFAULT') + end end else - Error_Services('Add', 'Error in ':Service:' service. Null UserId passed into service.') + Response = Database_Services('ReadDataRow', 'REPORT_CONFIG', 'MATERIAL_TRACK_WEB*DEFAULT') end end service @@ -156,3 +160,4 @@ Service UpdateMaterialTrackSettings(MtSettingsJson, UserId) end service + diff --git a/LSL2/STPROC/SIGNATURE_SERVICES.txt b/LSL2/STPROC/SIGNATURE_SERVICES.txt index 5fe6b96..2cec531 100644 --- a/LSL2/STPROC/SIGNATURE_SERVICES.txt +++ b/LSL2/STPROC/SIGNATURE_SERVICES.txt @@ -211,7 +211,6 @@ end service Service CheckSigOrder(WOMatKey, CurrStage, UseCaching, RDSNo) - If UseCaching EQ '' then UseCachine = True$ Response = False$ If RDSNo NE '' then @@ -2549,7 +2548,8 @@ Service QAMetSigReady(RDSNo, QAStage=QA_STAGES, Slot=SLOTS, WOMatQAKey) FailReason = WOMatQARec If ( (FailReason NE '') | and (FailReason NE 'THICK_ONLY UNLOAD product measurement test has not been signed.') | - and (FailReason NE 'CRES UNLOAD product measurement test has not been signed.') ) then + and (FailReason NE 'CRES UNLOAD product measurement test has not been signed.') | + and (FailReason NE 'UNLOAD LW_RHO product measurement test has not been signed.' ) ) then ErrorMessage = 'Error in ':Service:' service. ':FailReason end end