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
This commit is contained in:
parent
f1316d0e8f
commit
ed6f6cfc0d
@ -652,7 +652,12 @@ NextOpenSlots:
|
|||||||
IsMULot = WMOutRec EQ True$
|
IsMULot = WMOutRec EQ True$
|
||||||
IsFQASigned = WMOutRec<WM_OUT_SUP_VER_SIG$> NE ''
|
IsFQASigned = WMOutRec<WM_OUT_SUP_VER_SIG$> NE ''
|
||||||
IsVoided = WMOutRec<WM_OUT_VOID$>
|
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
|
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
|
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
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -28,7 +28,7 @@ OPEN 'REACTOR_LOG' TO ReactLogTable ELSE
|
|||||||
RETURN
|
RETURN
|
||||||
END
|
END
|
||||||
|
|
||||||
OPEN 'DICT.REACTOR_LOG' TO @DICT ELSE
|
OPEN 'DICT.REACTOR_LOG' TO hReactLogDict ELSE
|
||||||
ErrorMsg = 'Unable to open "DICT.Reactor_LOG" table.'
|
ErrorMsg = 'Unable to open "DICT.Reactor_LOG" table.'
|
||||||
ErrMsg(ErrorTitle:@SVM:ErrorMsg)
|
ErrMsg(ErrorTitle:@SVM:ErrorMsg)
|
||||||
RETURN
|
RETURN
|
||||||
@ -430,3 +430,4 @@ END
|
|||||||
|
|
||||||
RETURN
|
RETURN
|
||||||
|
|
||||||
|
|
||||||
|
@ -349,7 +349,7 @@ Service GetTestRunsByUsername(Username, StartDTM, StopDTM)
|
|||||||
End Case
|
End Case
|
||||||
|
|
||||||
table = "TEST_RUN"
|
table = "TEST_RUN"
|
||||||
Open "DICT ":table To @DICT Else
|
Open "DICT ":table To hTestRunDict Else
|
||||||
Error_Services('Add', 'Error opening TEST_RUN dictionary')
|
Error_Services('Add', 'Error opening TEST_RUN dictionary')
|
||||||
End
|
End
|
||||||
If Error_Services('NoError') then
|
If Error_Services('NoError') then
|
||||||
@ -357,7 +357,7 @@ Service GetTestRunsByUsername(Username, StartDTM, StopDTM)
|
|||||||
keylist = ""
|
keylist = ""
|
||||||
option = ""
|
option = ""
|
||||||
flag = ""
|
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
|
Swap @VM with @FM in keylist
|
||||||
Response = keylist
|
Response = keylist
|
||||||
end
|
end
|
||||||
@ -884,3 +884,4 @@ Service IsNewTWSystemActive(UserId)
|
|||||||
end
|
end
|
||||||
|
|
||||||
end service
|
end service
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user