re-order the error checking
This commit is contained in:
committed by
Ouellette Jonathan (CSC FI SPS MESLEO)
parent
ba2faa8c9f
commit
2fbf41d528
@ -281,8 +281,9 @@ Event PUB_SIGN.CLICK()
|
|||||||
If Len(ReactorType) GE 3 and ReactorType[1, 3] _EQC 'HTR' then
|
If Len(ReactorType) GE 3 and ReactorType[1, 3] _EQC 'HTR' then
|
||||||
If ( (WONo NE '') and (CassNo NE '') ) then
|
If ( (WONo NE '') and (CassNo NE '') ) then
|
||||||
WoMatKey = WONo:'*':CassNo
|
WoMatKey = WONo:'*':CassNo
|
||||||
WoMatRecord = Database_Services('ReadDataRow', 'WO_MAT', WoMatKey)
|
|
||||||
If RowExists('WO_MAT', WOMatKey) then
|
If RowExists('WO_MAT', WOMatKey) then
|
||||||
|
WoMatRecord = Database_Services('ReadDataRow', 'WO_MAT', WoMatKey)
|
||||||
|
If Error_Services('NoError') then
|
||||||
IsLastCassetteInWo = WO_MAT_Services('CassetteIsLastInWo', WoMatKey)
|
IsLastCassetteInWo = WO_MAT_Services('CassetteIsLastInWo', WoMatKey)
|
||||||
If Error_Services('NoError') then
|
If Error_Services('NoError') then
|
||||||
If IsLastCassetteInWo then
|
If IsLastCassetteInWo then
|
||||||
@ -296,7 +297,6 @@ Event PUB_SIGN.CLICK()
|
|||||||
NextEventIsBlock = Schedule_Services('NextEventIsBlock', Reactor)
|
NextEventIsBlock = Schedule_Services('NextEventIsBlock', Reactor)
|
||||||
end
|
end
|
||||||
If NextEventScheduled EQ False$ or NextEventHasSamePsn EQ False$ or NextEventIsBlock EQ True$ then
|
If NextEventScheduled EQ False$ or NextEventHasSamePsn EQ False$ or NextEventIsBlock EQ True$ then
|
||||||
If Error_Services('NoError') then
|
|
||||||
If WOMatRecord NE '' then
|
If WOMatRecord NE '' then
|
||||||
WoMatRecord<WO_MAT_LAST_CASSETTE_TEST_WAFER_ACK_REQ$> = True$
|
WoMatRecord<WO_MAT_LAST_CASSETTE_TEST_WAFER_ACK_REQ$> = True$
|
||||||
TestWaferRanSinceLoad = WoMatRecord<WO_MAT_LAST_CASSETTE_TEST_WAFER_RAN$>
|
TestWaferRanSinceLoad = WoMatRecord<WO_MAT_LAST_CASSETTE_TEST_WAFER_RAN$>
|
||||||
@ -327,12 +327,12 @@ Event PUB_SIGN.CLICK()
|
|||||||
end else
|
end else
|
||||||
ErrMsg = 'WO_MAT record for ':WOMatKey:' is null!'
|
ErrMsg = 'WO_MAT record for ':WOMatKey:' is null!'
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
end else
|
end else
|
||||||
ErrMsg = Error_Services('GetMessage')
|
ErrMsg = Error_Services('GetMessage')
|
||||||
end
|
end
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end else
|
end else
|
||||||
ErrMsg = 'WO_MAT ':WOMatKey:' does not exist!'
|
ErrMsg = 'WO_MAT ':WOMatKey:' does not exist!'
|
||||||
end
|
end
|
||||||
|
Reference in New Issue
Block a user