Commit to save progress.
Feature complete. Ready for UAT. Minor changes to ZPL Hold header and darkness. Implement post UAT changes. fixed small bug in WMO reprint event logic formatted code and removed commented out code
This commit is contained in:
Infineon\Mitchem
committed by
Infineon\StieberD
Infineon\StieberD
parent
6050b346a5
commit
507c6bffba
@ -15,12 +15,13 @@ DECLARE SUBROUTINE Print_Prod_Labels, obj_WO_Mat_Log, obj_Post_Log, obj_Tables,
|
||||
DECLARE SUBROUTINE obj_Appwindow, Start_Window, Btree.Extract, Msg, Start_Window,Print_Cleanroom_Labels_Thermal, Error_Services
|
||||
DECLARE SUBROUTINE obj_RDS_Test, obj_Notes, Print_Control_Plan, obj_WO_Mat, Send_Event, Print_RDS_Instruction, obj_RDS
|
||||
DECLARE SUBROUTINE Start_Window, Development_Services, Dialog_Box, SAP_Services, End_Window, Logging_Services, Rds_Services
|
||||
Declare subroutine Labeling_Services
|
||||
|
||||
DECLARE FUNCTION Get_Property, Get_Status, Dialog_Box, Utility, Send_Message, Popup, obj_RDS_Makeup, Msg, obj_RDS
|
||||
DECLARE FUNCTION obj_Tables, obj_Clean_Insp, obj_WO_Mat_QA, obj_RDS_Test, obj_WO_Mat, Signature_Services
|
||||
DECLARE FUNCTION obj_WO_Step, Security_Check, obj_RDS_Audit, obj_WM_In, Create_Dialog, obj_NCR, obj_WO_Mat, MemberOf
|
||||
DECLARE FUNCTION Start_Window, Database_Services, Development_Services, RDS_Services, RTI_Lock_Owner, Logging_Services
|
||||
DECLARE FUNCTION Environment_Services, Wafer_Counter_Services, Error_Services, Hold_Services
|
||||
DECLARE FUNCTION Environment_Services, Wafer_Counter_Services, Error_Services, Hold_Services, Datetime
|
||||
|
||||
EQU CRLF$ TO \0D0A\
|
||||
|
||||
@ -200,7 +201,7 @@ BEGIN CASE
|
||||
CASE Method = 'OverrideLog' ; GOSUB OverrideLog
|
||||
CASE Method = 'AddComment' ; GOSUB AddComment
|
||||
CASE Method = 'ViewComments' ; GOSUB ViewComments
|
||||
CASE Method = 'ViewLotHistory' ; GOSUB ViewLotHistory
|
||||
CASE Method = 'ViewLotHistory' ; GOSUB ViewLotHistory
|
||||
CASE Method = 'Close' ; GOSUB Close
|
||||
CASE 1
|
||||
ErrMsg(ErrTitle:@SVM:'Unknown method ':QUOTE(Method):' passed to routine.')
|
||||
@ -211,6 +212,7 @@ END CASE
|
||||
RETURN Result
|
||||
|
||||
|
||||
|
||||
* * * * * * *
|
||||
RdsLF:
|
||||
* * * * * * *
|
||||
@ -314,8 +316,10 @@ Refresh:
|
||||
HoldCheck = Hold_Services('CheckForHold', WOMatKey, '')
|
||||
IF HoldCheck THEN
|
||||
Set_Property(@WINDOW:'.HOLD_BUTTON2','TEXT','Remove Hold')
|
||||
Set_Property(@Window:'.MENU.PRINT.REPRINT_HOLD_LABEL', 'ENABLED', True$)
|
||||
END ELSE
|
||||
Set_Property(@WINDOW:'.HOLD_BUTTON2','TEXT','Place on Hold')
|
||||
Set_Property(@Window:'.MENU.PRINT.REPRINT_HOLD_LABEL', 'ENABLED', False$)
|
||||
END
|
||||
|
||||
|
||||
@ -2054,6 +2058,14 @@ HoldClick:
|
||||
|
||||
RDSNo = Get_Property(@WINDOW:'.RDS_NO','DEFPROP')
|
||||
CtrlEnt = Get_Property(@WINDOW,'FOCUS')
|
||||
PSN = Get_Property(@WINDOW:'.PSN','TEXT')
|
||||
ReactorType = Get_Property(@WINDOW:'.REACTOR_TYPE','TEXT')
|
||||
|
||||
If ReactorType = 'EPP' then
|
||||
Reactor = 'EPP'
|
||||
end else
|
||||
Reactor = Get_Property(@WINDOW:'.REACTOR','TEXT')
|
||||
end
|
||||
|
||||
Send_Event(@WINDOW,'WRITE')
|
||||
Send_Event(@WINDOW,'CLEAR') ; // 12/21/2017 - DMB - Although WRITE normally clears the form, QBF mode will prevent the clear so do this explicitly so the lock is removed from the RDS record.
|
||||
@ -2063,14 +2075,33 @@ HoldClick:
|
||||
WOMatKey = Xlate('RDS', RDSNo, 'WO_MAT_KEY', 'X', '')
|
||||
//obj_WO_Mat('ToggleHold',WOMatKey:@RM:HoldEntity:@RM:HoldEntityID:@RM:CtrlEnt)
|
||||
Transition = Hold_Services('CheckForHold', WOMatKey, CtrlEnt)
|
||||
Stage = Xlate('WO_MAT', WOMatKey, WO_MAT_HOLD_STAGE$, 'X')
|
||||
Interrupted = Xlate('WO_MAT', WOMatKey, WO_MAT_HOLD_INTERRUPTED$, 'X')
|
||||
HoldType = 'HOLD'
|
||||
HoldData = ''
|
||||
HoldData = Dialog_Box('DIALOG_HOLD',@WINDOW,Transition:@FM:@FM:HoldType)
|
||||
HoldData = Dialog_Box('DIALOG_HOLD',@WINDOW,Transition:@FM:@FM:HoldType:@FM:Stage:@FM:Interrupted)
|
||||
|
||||
If HoldData NE 'Cancel' then
|
||||
Hold_Services('ToggleHold', WOMatKey, HoldEntity, HoldEntityID, CtrlEnt, '', HoldData, '')
|
||||
IF Error_Services("HasError") THEN
|
||||
ErrCode = Error_Services("GetMessage")
|
||||
ErrMsg(errCode)
|
||||
end else
|
||||
If Transition EQ False$ then
|
||||
MsgInfo = ''
|
||||
MsgInfo<MTYPE$> = 'BNY'
|
||||
MsgInfo<MTEXT$> = 'Hold Successful. Would you like to print label(s)?'
|
||||
MsgInfo<MICON$> = '!'
|
||||
PrintLabel = Msg(@WINDOW,MsgInfo,'')
|
||||
HoldBy = HoldData<1>
|
||||
Reason = HoldData<2>
|
||||
Stage = HoldData<4>
|
||||
Interrupted = HoldData<5>
|
||||
DTM = Datetime()
|
||||
If PrintLabel EQ True$ then
|
||||
Labeling_Services('PrintHoldLabel', HoldEntity, HoldEntityID, Stage, Reason, HoldBy, DTM, PSN, Reactor, Interrupted)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -2737,6 +2768,7 @@ LUPostCode:
|
||||
|
||||
RETURN
|
||||
|
||||
|
||||
* * * * * * *
|
||||
SigProfile:
|
||||
* * * * * * *
|
||||
@ -2792,24 +2824,24 @@ RETURN
|
||||
Overridelog:
|
||||
* * * * * * * *
|
||||
|
||||
RDSNo = Get_Property(@WINDOW:'.RDS_NO','TEXT')
|
||||
orKeys = XLATE('RDS',RDSNo, 295, 'X')
|
||||
RDSNo = Get_Property(@WINDOW:'.RDS_NO','TEXT')
|
||||
orKeys = XLATE('RDS',RDSNo, 295, 'X')
|
||||
|
||||
Display = ''
|
||||
overriderec = ''
|
||||
i = 1
|
||||
For Each orKey in orKeys using @VM
|
||||
overriderec = Xlate('OVERRIDE_LOG', orKey, '', 'X')
|
||||
Display<1,I,1> = overriderec<3>
|
||||
Display<1,I,2> = overriderec<4>
|
||||
Display<1,I,3> = overriderec<5>
|
||||
Display<1,I,4> = overriderec<6>
|
||||
i = i + 1
|
||||
Next orKey
|
||||
Display = ''
|
||||
overriderec = ''
|
||||
i = 1
|
||||
For Each orKey in orKeys using @VM
|
||||
overriderec = Xlate('OVERRIDE_LOG', orKey, '', 'X')
|
||||
Display<1,I,1> = overriderec<3>
|
||||
Display<1,I,2> = overriderec<4>
|
||||
Display<1,I,3> = overriderec<5>
|
||||
Display<1,I,4> = overriderec<6>
|
||||
i = i + 1
|
||||
Next orKey
|
||||
|
||||
TypeOver = ''
|
||||
TypeOver<PDISPLAY$> = Display
|
||||
void = Popup(@WINDOW,TypeOver,'OVERRIDES')
|
||||
TypeOver = ''
|
||||
TypeOver<PDISPLAY$> = Display
|
||||
void = Popup(@WINDOW,TypeOver,'OVERRIDES')
|
||||
|
||||
RETURN
|
||||
|
||||
@ -2826,6 +2858,7 @@ AddComment:
|
||||
|
||||
return
|
||||
|
||||
|
||||
* * * * * * * *
|
||||
ViewComments:
|
||||
* * * * * * * *
|
||||
|
||||
Reference in New Issue
Block a user