From ed6f6cfc0da20d7f1989da1f4ee4f32787d95816 Mon Sep 17 00:00:00 2001
From: "Ouellette Jonathan (CSC FI SPS MESLEO)"
 <Jonathan.Ouellette@infineon.com>
Date: Mon, 15 Sep 2025 16:42:20 +0000
Subject: [PATCH] Merged PR 25836: Weekend Bug Fixes

1. Change to exlude on-hold WMO's from showing up as available.
2. Change to Test Run Services -> Get Test Runs By Username to not utilize the @DICT variable in a btree extract.

Related work items: #325597
---
 LSL2/STPROC/OBJ_WM_OUT.txt           | 8 +++++++-
 LSL2/STPROC/PRINT_REACTOR_MAINT1.txt | 3 ++-
 LSL2/STPROC/TEST_RUN_SERVICES.txt    | 5 +++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/LSL2/STPROC/OBJ_WM_OUT.txt b/LSL2/STPROC/OBJ_WM_OUT.txt
index 89e25a6..53840e1 100644
--- a/LSL2/STPROC/OBJ_WM_OUT.txt
+++ b/LSL2/STPROC/OBJ_WM_OUT.txt
@@ -652,7 +652,12 @@ NextOpenSlots:
 		IsMULot     = WMOutRec EQ True$
 		IsFQASigned = WMOutRec<WM_OUT_SUP_VER_SIG$> NE ''
 		IsVoided = WMOutRec<WM_OUT_VOID$>
-		If Not(IsMULot) AND Not(IsFQASigned) AND Not(IsVoided) then
+		WOMatKey = WONo : '*' : CassNo 
+		WOMatRec = Database_Services('ReadDataRow', 'WO_MAT', WOMatKey, True$, 0, False$)
+		WOMatHold = WOMatRec<WO_MAT_HOLD$>
+		WOMatHoldEntity = WOMatRec<WO_MAT_HOLD_ENTITY$>
+		IsOnHold = WOMatHold EQ True$ and WOMatHoldEntity EQ 'WM_OUT'
+		If Not(IsMULot) AND Not(IsFQASigned) AND Not(IsVoided) AND Not(IsOnHold) then
 			FOR N = SlotCnt TO 1 STEP -1
 				IF WMOutRec<WM_OUT_SLOT_NO$,N> NE '' AND WMOutRec<WM_OUT_RDS$,N> = ''  AND WMOutRec<WM_OUT_SLOT_NCR$,N> = '' AND WMOutRec<WM_OUT_UMW_CASS_ID$,N> = '' THEN
 					
@@ -1996,3 +2001,4 @@ RETURN
 
 
 
+
diff --git a/LSL2/STPROC/PRINT_REACTOR_MAINT1.txt b/LSL2/STPROC/PRINT_REACTOR_MAINT1.txt
index 2417a5a..6a35d36 100644
--- a/LSL2/STPROC/PRINT_REACTOR_MAINT1.txt
+++ b/LSL2/STPROC/PRINT_REACTOR_MAINT1.txt
@@ -28,7 +28,7 @@ OPEN 'REACTOR_LOG' TO ReactLogTable ELSE
 	RETURN
 END
 
-OPEN 'DICT.REACTOR_LOG' TO @DICT ELSE
+OPEN 'DICT.REACTOR_LOG' TO hReactLogDict ELSE
 	ErrorMsg = 'Unable to open "DICT.Reactor_LOG" table.'
 	ErrMsg(ErrorTitle:@SVM:ErrorMsg)
 	RETURN
@@ -430,3 +430,4 @@ END
 							
 RETURN	 
 
+
diff --git a/LSL2/STPROC/TEST_RUN_SERVICES.txt b/LSL2/STPROC/TEST_RUN_SERVICES.txt
index 53e34e2..69fc5c6 100644
--- a/LSL2/STPROC/TEST_RUN_SERVICES.txt
+++ b/LSL2/STPROC/TEST_RUN_SERVICES.txt
@@ -349,7 +349,7 @@ Service GetTestRunsByUsername(Username, StartDTM, StopDTM)
         End Case
         
         table = "TEST_RUN"
-        Open "DICT ":table To @DICT Else
+        Open "DICT ":table To hTestRunDict Else
             Error_Services('Add', 'Error opening TEST_RUN dictionary')
         End
         If Error_Services('NoError') then
@@ -357,7 +357,7 @@ Service GetTestRunsByUsername(Username, StartDTM, StopDTM)
             keylist         = ""
             option          = ""
             flag            = ""
-            Btree.Extract(srch_strng, table, @DICT, keylist, option, flag)
+            Btree.Extract(srch_strng, table, hTestRunDict, keylist, option, flag)
             Swap @VM with @FM in keylist
             Response = keylist
         end
@@ -884,3 +884,4 @@ Service IsNewTWSystemActive(UserId)
     end
     
 end service
+