diff --git a/LSL2/POPUP/RDS_CURR_STATUS.json b/LSL2/POPUP/RDS_CURR_STATUS.json index 290c263..96f851b 100644 --- a/LSL2/POPUP/RDS_CURR_STATUS.json +++ b/LSL2/POPUP/RDS_CURR_STATUS.json @@ -122,8 +122,12 @@ "<8,23,1>": "PSV", "<8,23,2>": "Pre Ship Verification" }, - "<8,24>": "", - "<8,25>": "" + "<8,24>": { + "<8,24,1>": "RTF", + "<8,24,2>": "Return To Fab Active" + }, + "<8,25>": "", + "<8,26>": "" }, "<9>": { "<9,1>": { @@ -141,14 +145,6 @@ "<9,2,4>": "C", "<9,2,5>": "", "<9,2,6>": "Current Status Description" - }, - "<9,3>": { - "<9,3,1>": "", - "<9,3,2>": "", - "<9,3,3>": "", - "<9,3,4>": "", - "<9,3,5>": "", - "<9,3,6>": "" } }, "<10>": "L", @@ -175,8 +171,18 @@ "<31>": "0", "<32>": "0", "<33>": "0", - "<34>": "16777215", - "<35>": "16777215" + "<34>": "-2", + "<35>": "-2", + "<36>": "", + "<37>": "", + "<38>": "", + "<39>": "", + "<40>": "-2", + "<41>": "1000", + "<42>": "", + "<43>": "", + "<44>": "", + "<45>": "" } } } \ No newline at end of file diff --git a/LSL2/POPUP/RUN_STATUS.json b/LSL2/POPUP/RUN_STATUS.json index c219c57..5554e5c 100644 --- a/LSL2/POPUP/RUN_STATUS.json +++ b/LSL2/POPUP/RUN_STATUS.json @@ -130,7 +130,11 @@ "<8,25,1>": "PSV", "<8,25,2>": "Pre Ship Verification" }, - "<8,26>": "" + "<8,26>": { + "<8,26,1>": "RTF", + "<8,26,2>": "Return To Fab Active" + }, + "<8,27>": "" }, "<9>": { "<9,1>": { @@ -174,8 +178,18 @@ "<31>": "0", "<32>": "0", "<33>": "0", - "<34>": "16777215", - "<35>": "16777215" + "<34>": "-2", + "<35>": "-2", + "<36>": "", + "<37>": "", + "<38>": "", + "<39>": "", + "<40>": "-2", + "<41>": "1000", + "<42>": "", + "<43>": "", + "<44>": "", + "<45>": "" } } } \ No newline at end of file diff --git a/LSL2/POPUP/WM_OUT_CURR_STATUS.json b/LSL2/POPUP/WM_OUT_CURR_STATUS.json index f630591..5fa329d 100644 --- a/LSL2/POPUP/WM_OUT_CURR_STATUS.json +++ b/LSL2/POPUP/WM_OUT_CURR_STATUS.json @@ -9,7 +9,7 @@ "<2>": "-2", "<3>": "-1", "<4>": "-1", - "<5>": "16777215", + "<5>": "-2", "<6>": { "<6,1>": { "<6,1,1>": "MS Sans Serif", @@ -105,6 +105,10 @@ "<8,19>": { "<8,19,1>": "PACK", "<8,19,2>": "Loaded in PT Out" + }, + "<8,20>": { + "<8,20,1>": "RTF", + "<8,20,2>": "Return To Fab Active" } }, "<9>": { @@ -123,14 +127,6 @@ "<9,2,4>": "C", "<9,2,5>": "", "<9,2,6>": "Current Status Description" - }, - "<9,3>": { - "<9,3,1>": "", - "<9,3,2>": "", - "<9,3,3>": "", - "<9,3,4>": "", - "<9,3,5>": "", - "<9,3,6>": "" } }, "<10>": "L", @@ -158,7 +154,17 @@ "<32>": "0", "<33>": "1", "<34>": "16777215", - "<35>": "16777215" + "<35>": "16777215", + "<36>": "", + "<37>": "", + "<38>": "", + "<39>": "", + "<40>": "-2", + "<41>": "1000", + "<42>": "", + "<43>": "", + "<44>": "", + "<45>": "" } } } \ No newline at end of file diff --git a/LSL2/POPUP/WO_MAT_CURR_STATUS.json b/LSL2/POPUP/WO_MAT_CURR_STATUS.json index d4a56ed..981be0e 100644 --- a/LSL2/POPUP/WO_MAT_CURR_STATUS.json +++ b/LSL2/POPUP/WO_MAT_CURR_STATUS.json @@ -9,7 +9,7 @@ "<2>": "-2", "<3>": "-1", "<4>": "-1", - "<5>": "16777215", + "<5>": "-2", "<6>": { "<6,1>": { "<6,1,1>": "MS Sans Serif", @@ -189,6 +189,10 @@ "<8,40>": { "<8,40,1>": "PACK", "<8,40,2>": "Loaded in PT Out" + }, + "<8,41>": { + "<8,41,1>": "RTF", + "<8,41,2>": "Return To Fab Active" } }, "<9>": { @@ -207,14 +211,6 @@ "<9,2,4>": "C", "<9,2,5>": "", "<9,2,6>": "Current Status Description" - }, - "<9,3>": { - "<9,3,1>": "", - "<9,3,2>": "", - "<9,3,3>": "", - "<9,3,4>": "", - "<9,3,5>": "", - "<9,3,6>": "" } }, "<10>": "L", @@ -242,7 +238,17 @@ "<32>": "0", "<33>": "1", "<34>": "16777215", - "<35>": "16777215" + "<35>": "16777215", + "<36>": "", + "<37>": "", + "<38>": "", + "<39>": "", + "<40>": "-2", + "<41>": "1000", + "<42>": "", + "<43>": "", + "<44>": "", + "<45>": "" } } } \ No newline at end of file diff --git a/LSL2/STPROC/OBJ_RDS.txt b/LSL2/STPROC/OBJ_RDS.txt index 71bc9ff..86e035d 100644 --- a/LSL2/STPROC/OBJ_RDS.txt +++ b/LSL2/STPROC/OBJ_RDS.txt @@ -18,6 +18,7 @@ COMPILE FUNCTION obj_RDS(Method,Parms) DECLARE FUNCTION Get_Status, Msg, Utility, obj_Tables, NextKey, obj_WO_Verify, obj_Prod_Spec, Send_Dyn, obj_RDS_Makeup DECLARE FUNCTION obj_RDS2, obj_RDS_Test, obj_WO_Mat, obj_Clean_Insp, obj_PRS_Prop, Database_Services, RDS_Services +DECLARE FUNCTION Return_To_Fab_Services DECLARE FUNCTION Logging_Services, Environment_Services, Error_Services, Signature_Services, Lot_Services, Supplement_Services DECLARE SUBROUTINE Set_Status, Msg, obj_Tables, Send_Dyn, obj_WO_Step, obj_RDS_Layer, obj_RDS_Test, obj_WM_In DECLARE SUBROUTINE Btree.Extract, RDS_React_Run, Environment_Services, Logging_Services, Error_Services, Send_Info @@ -135,6 +136,13 @@ CurrStatus: RDSCnt = COUNT(RDSNos,@VM) + (RDSNos NE '') FOR R = 1 TO RDSCnt + OpenRTF = Return_To_Fab_Services('GetOpenReturnToFabRecordIdByCassId', RDSNos) + + IF OpenRTF NE '' THEN + ReturnVals<1,R> = 'RTF' ;* Open RTF on RDS * + GOTO StatusHere + END + NCRStatuses = XLATE('NCR',RDSRec,7,'X') IF INDEX(NCRStatuses,'O',1) THEN @@ -1242,3 +1250,4 @@ CalcThickTarget: RETURN + diff --git a/LSL2/STPROC/OBJ_REACT_RUN.txt b/LSL2/STPROC/OBJ_REACT_RUN.txt index e6b4ffd..b02373b 100644 --- a/LSL2/STPROC/OBJ_REACT_RUN.txt +++ b/LSL2/STPROC/OBJ_REACT_RUN.txt @@ -20,6 +20,7 @@ DECLARE SUBROUTINE obj_Clean_Insp, Btree.Extract, Send_Info, obj_WO_Wfr, ErrMsg, DECLARE FUNCTION Get_Status, Msg, Utility, obj_Tables, NextKey, obj_Prod_Spec, Send_Dyn, obj_Clean_Insp DECLARE FUNCTION obj_RDS_Test, obj_Test_Point_Map, obj_Popup, obj_WO_Wfr, Logging_Services, Environment_Services +Declare function Return_To_Fab_Services $INSERT APP_INSERTS $INSERT REACT_RUN_EQUATES @@ -262,6 +263,13 @@ END LSKeys = ReactRunRec +OpenRTF = Return_To_Fab_Services('GetOpenReturnToFabRecordIdByCassId', RDSNo) + +IF OpenRTF NE '' THEN + Result = 'RTF' ;* Open RTF on WO_MAT * + RETURN +END + MetOutOfSpec = SUM(XLATE('RDS_LAYER',LSKeys,'TEST_OUT_OF_SPEC','X')) ;* Updated for Metrology update 4/16/2006 JCH IF MetOutOfSpec > 0 THEN @@ -2278,3 +2286,4 @@ END RETURN + diff --git a/LSL2/STPROC/OBJ_WM_OUT.txt b/LSL2/STPROC/OBJ_WM_OUT.txt index cb9ef2a..89e25a6 100644 --- a/LSL2/STPROC/OBJ_WM_OUT.txt +++ b/LSL2/STPROC/OBJ_WM_OUT.txt @@ -19,7 +19,7 @@ Compile Function obj_WM_Out(Method,Parms) Declare Function Get_Status, Msg, Utility, obj_Tables, NextKey, obj_WO_Verify, obj_Prod_Spec, Send_Dyn, obj_RDS_Makeup Declare Function obj_RDS2, obj_WM_Out, Delete, Signature_Services, Environment_Services, Logging_Services -Declare Function Database_Services, SRP_Array +Declare Function Database_Services, SRP_Array, Return_To_Fab_Services Declare Subroutine Set_Status, Msg, obj_Tables, Send_Dyn, obj_WO_Step, obj_RDS_Layer, obj_RDS_Test, Btree.Extract Declare Subroutine Extract_SI_Keys, obj_WM_Out, obj_WO_Mat, obj_Post_Log, obj_WO_Mat_Log, ErrMsg, obj_WO_Wfr Declare Subroutine Logging_Services, Material_Services, Database_Services, Update_Index, Work_Order_Services @@ -382,12 +382,18 @@ CurrStatus: CurrLocation = XLATE('WO_MAT',WOMatKey,'CURR_LOCATION','X') END - IF WOMatRec = 1 AND WOMatRec = 'WM_OUT' THEN Result = 'HOLD' ;* Box is on Hold RETURN END + OpenRTF = Return_To_Fab_Services('GetOpenReturnToFabRecordIdByCassId', WMOutKey) + + IF OpenRTF NE '' THEN + Result = 'RTF' ;* Open RTF on WM_OUT * + RETURN + END + IF WMOutRec NE '' THEN Result = 'SHIP' @@ -1988,3 +1994,5 @@ ConvertCleanInsp: RETURN + + diff --git a/LSL2/STPROC/OBJ_WO_MAT.txt b/LSL2/STPROC/OBJ_WO_MAT.txt index b1202a5..17e6f3d 100644 --- a/LSL2/STPROC/OBJ_WO_MAT.txt +++ b/LSL2/STPROC/OBJ_WO_MAT.txt @@ -28,7 +28,7 @@ Compile Function obj_WO_Mat(Method,Parms) Declare Function Get_Status, Msg, Utility, obj_Tables, Dialog_Box,NextKey, Popup, Get_Property, obj_RDS, RetStack Declare Function Database_Services, GaN_Services, Logging_Services, Environment_Services, Signature_Services Declare Function obj_WO_Mat, obj_WM_In, obj_WM_Out, obj_Prod_Spec, obj_Clean_Insp, obj_Calendar, obj_Popup -Declare Function Error_Services, Memberof, Datetime, GetTickCount +Declare Function Error_Services, Memberof, Datetime, GetTickCount, Return_To_Fab_Services Declare Subroutine Set_Status, Msg, obj_Tables, Send_Dyn, Btree.Extract, ErrMsg, Send_Dyn, RList, obj_WO_Log, Send_Event Declare Subroutine obj_RDS, Extract_SI_Keys, obj_Pend_Ship_Labels, obj_WO_Mat_QA, Work_Order_Services, Service_Services Declare Subroutine obj_notes, obj_Clean_Insp, obj_Post_Log, Send_Info, obj_WO_Mat_Log, obj_SAP, obj_WO_Mat, obj_WO_Wfr @@ -664,13 +664,22 @@ CurrStatus: RETURN END + WMIKey = WOMatRec + WMOKey = WOMatRec + + OpenRTF = Return_To_Fab_Services('GetOpenReturnToFabRecordIdByCassId', WMOKey) + + IF OpenRTF NE '' THEN + Result = 'RTF' ;* Open RTF on WO_MAT * + Result = Oconv(Result, '[WO_MAT_CURR_STATUS_CONV]') + RETURN + END + IF WOMatRec NE '' THEN Result = 'SHIP' RETURN END - WMIKey = WOMatRec - WMOKey = WOMatRec LocCnt = COUNT(WOMatRec,@VM) + (WOMatRec NE '') @@ -3284,7 +3293,20 @@ ReportStatus: WMIStatus = WOMatRec WMOStatus = WOMatRec - IF WMOStatus = 'COMP' THEN + + + OpenRTF = Return_To_Fab_Services('GetOpenReturnToFabRecordIdByCassId', RDSNo) + If OpenRTF EQ '' then + OpenRTF = Return_To_Fab_Services('GetOpenReturnToFabRecordIdByCassId', WMOKey) + end + + IF OpenRTF NE '' THEN + Result = 'RTF' ;* Open RTF on WO_MAT * + Result = Oconv(Result, '[WO_MAT_CURR_STATUS_CONV]') + RETURN + END + + IF WMOStatus = 'COMP' THEN WMOStatus = obj_WO_Mat('CurrStatus',WOMatKey:@RM:WOMatRec) END @@ -5714,3 +5736,5 @@ ExpCOA: RETURN + + diff --git a/LSL2/STPROC/RETURN_TO_FAB_SERVICES.txt b/LSL2/STPROC/RETURN_TO_FAB_SERVICES.txt index a9270ec..12f3e88 100644 --- a/LSL2/STPROC/RETURN_TO_FAB_SERVICES.txt +++ b/LSL2/STPROC/RETURN_TO_FAB_SERVICES.txt @@ -1320,3 +1320,4 @@ Service MigrateLegacyRTFRecord(RTFRecordId) end end service +