ebase 8/22/2025
Modified RDS_Actions to fix RDSNo being unassigned when calling obj_wo_react -> RemRDS various bug fixes Re-initializaing branch Modified RDS_Actions to fix RDSNo being unassigned when calling obj_wo_react -> RemRDS Added a check prior to running Load logic to check that a reactor is assigned.
This commit is contained in:
@ -51,8 +51,6 @@ $insert REACT_STATUS_EQUATES
|
||||
$insert SUPPL_INFO_ARRAY_EQU
|
||||
$insert CLEAN_INSP_EQUATES
|
||||
|
||||
EQU READONLY_GREEN$ TO 192 + (220*256) + (192*65536)
|
||||
|
||||
Equ COL$LOG_FILE to 1
|
||||
Equ COL$LOG_DTM to 2
|
||||
Equ COL$ACTION to 3
|
||||
@ -67,7 +65,7 @@ Equ COL$TOOL_ID to 10
|
||||
Declare subroutine ErrMsg, Set_Status, obj_WO_Mat, obj_WO_Mat_Log, obj_RDS, Set_Property, Send_Event, Database_Services
|
||||
Declare subroutine Qa_Services, RDS_Services, Dialog_Box
|
||||
Declare function Dialog_Box, Msg, MemberOf, obj_WO_Mat, Database_Services, Get_Property, obj_React_Status, Get_Status
|
||||
Declare function QA_Services, Database_Services, Supplement_Services
|
||||
Declare function QA_Services, Database_Services, Supplement_Services, RDS_Services
|
||||
|
||||
SubclassInfo = Form_Services('FindSubclassControl')
|
||||
Subclass = SubclassInfo<1>
|
||||
@ -95,20 +93,16 @@ Return EventFlow else EVENT_CONTINUE$
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
Event WINDOW.CREATE(CreateParam)
|
||||
|
||||
|
||||
GoSub SetupControls
|
||||
|
||||
end event
|
||||
|
||||
|
||||
Event WINDOW.READ()
|
||||
// Disable reactor edit line control if the RDS has been loaded.
|
||||
RDSNo = Get_Property(@Window:'.RDS_NO', 'TEXT')
|
||||
If RDSNo NE '' then
|
||||
LoadSig = Xlate('RDS', RDSNo, 'OPERATOR_IN', 'X')
|
||||
If LoadSig NE '' then
|
||||
Set_Property(@Window:'.REACTOR', 'ENABLED', False$)
|
||||
Set_Property(@Window:'.REACTOR', 'BACKCOLOR', READONLY_GREEN$)
|
||||
end
|
||||
end
|
||||
|
||||
GoSub SetupControls
|
||||
|
||||
end event
|
||||
|
||||
|
||||
@ -132,6 +126,76 @@ end event
|
||||
|
||||
Event PUB_SIGN.CLICK()
|
||||
|
||||
ButtonText = Get_Property(@Window:'.PUB_SIGN', 'TEXT')
|
||||
|
||||
Begin Case
|
||||
Case ButtonText EQ 'Sign'
|
||||
GoSub SignPreEpi
|
||||
Case ButtonText EQ 'Unsign'
|
||||
GoSub UnsignPreEpi
|
||||
End Case
|
||||
|
||||
If Error_Services('HasError') then
|
||||
ErrorMsg = Error_Services('GetMessage')
|
||||
ErrMsg(ErrorMsg)
|
||||
end
|
||||
Set_Property(@Window, 'SAVEWARN', False$)
|
||||
Set_Status(0)
|
||||
Send_Event(@Window, 'READ')
|
||||
|
||||
end event
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
// Internal GoSubs
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
SetupControls:
|
||||
|
||||
RDSNo = Get_Property(@Window:'.RDS_NO', 'TEXT')
|
||||
|
||||
GoSub ReactorEdlCtrlSetup
|
||||
GoSub PubSignCtrlSetup
|
||||
|
||||
return
|
||||
|
||||
ReactorEdlCtrlSetup:
|
||||
|
||||
// Disable reactor edit line control if the RDS has been assigned.
|
||||
If RDSNo NE '' then
|
||||
PreEpiSig = Database_Services('ReadDataColumn', 'RDS', RDSNo, RDS_PRE_EPI_SIG$, True$, 0, False$)
|
||||
If Error_Services('NoError') then
|
||||
If PreEpiSig NE '' then
|
||||
Set_Property(@Window:'.REACTOR', 'ENABLED', False$)
|
||||
Set_Property(@Window:'.REACTOR', 'BACKCOLOR', READONLY_GREEN$)
|
||||
end else
|
||||
Set_Property(@Window:'.REACTOR', 'ENABLED', True$)
|
||||
Set_Property(@Window:'.REACTOR', 'BACKCOLOR', EDIT_ACTIVE_WHITE$)
|
||||
end
|
||||
end else
|
||||
Set_Property(@Window:'.REACTOR', 'ENABLED', False$)
|
||||
Set_Property(@Window:'.REACTOR', 'BACKCOLOR', READONLY_GREEN$)
|
||||
end
|
||||
end
|
||||
|
||||
return
|
||||
|
||||
PubSignCtrlSetup:
|
||||
|
||||
If RDSNo NE '' then
|
||||
PreEpiSig = Database_Services('ReadDataColumn', 'RDS', RDSNo, RDS_PRE_EPI_SIG$, True$, 0, False$)
|
||||
If Error_Services('NoError') then
|
||||
If PreEpiSig NE '' then
|
||||
Set_Property(@Window:'.PUB_SIGN', 'TEXT', 'Unsign')
|
||||
end else
|
||||
Set_Property(@Window:'.PUB_SIGN', 'TEXT', 'Sign')
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
return
|
||||
|
||||
SignPreEpi:
|
||||
|
||||
RDSNo = Get_Property(@Window:'.RDS_NO' ,'DEFPROP')
|
||||
WfrQty = Get_Property(@Window:'.VERIFY_QTY','TEXT')
|
||||
Reactor = Get_Property(@Window:'.REACTOR' ,'TEXT')
|
||||
@ -156,23 +220,29 @@ Event PUB_SIGN.CLICK()
|
||||
Valid = Response<1>
|
||||
If (Valid EQ True$) then
|
||||
QA_Services('SignPreEpiStage', RDSNo, @USER4, WfrQty, Reactor)
|
||||
end
|
||||
end
|
||||
end else
|
||||
QA_Services('SignPreEpiStage', RDSNo, @USER4, WfrQty, Reactor)
|
||||
end
|
||||
end
|
||||
If Error_Services('HasError') then
|
||||
ErrorMsg = Error_Services('GetMessage')
|
||||
ErrMsg(ErrorMsg)
|
||||
end
|
||||
Set_Property(@Window, 'SAVEWARN', False$)
|
||||
Set_Status(0)
|
||||
Send_Event(@Window, 'READ')
|
||||
|
||||
end event
|
||||
return
|
||||
|
||||
UnsignPreEpi:
|
||||
|
||||
RDSNo = Get_Property(@Window:'.RDS_NO','DEFPROP')
|
||||
VerCheckParams = ''
|
||||
VerCheckParams<4> = 'Permission needed for Pre-Epi Unsign on RDS# ' : RDSNo
|
||||
UserVerCheck = Dialog_Box('NDW_VERIFY_USER', @Window, '':@FM:'':@FM:'':@FM:VerCheckParams)
|
||||
ValidUserCheck = UserVerCheck<1>
|
||||
If ValidUserCheck then
|
||||
ValidUserId = UserVerCheck<2>
|
||||
If ValidUserId NE '' then
|
||||
RDS_Services('UnsignPreEpiSignature', RDSNo, ValidUserId)
|
||||
end
|
||||
end
|
||||
|
||||
return
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
// Internal GoSubs
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
Reference in New Issue
Block a user