From 981840fd9508917a435074ee7f7ba29d44280ea0 Mon Sep 17 00:00:00 2001 From: "Infineon\\Mitchem" Date: Wed, 3 Sep 2025 13:15:58 -0700 Subject: [PATCH] Bypass validation for REACT_ITEMs being retired. --- LSL2/STPROC/REACT_ITEM.txt | 9 ++- LSL2/STPROC/REACT_ITEM_ACTIONS.txt | 105 ++++++++++++++++------------- 2 files changed, 63 insertions(+), 51 deletions(-) diff --git a/LSL2/STPROC/REACT_ITEM.txt b/LSL2/STPROC/REACT_ITEM.txt index 3ff9883..2da1326 100644 --- a/LSL2/STPROC/REACT_ITEM.txt +++ b/LSL2/STPROC/REACT_ITEM.txt @@ -503,6 +503,7 @@ RETURN LUPktSize: * * * * * * * +Retired = Get_Property(@Window: '.RETIRE_DT', 'TEXT') RIType = Get_Property(@Window:'.RI_TYPE', 'TEXT') If RIType EQ 'S' then PocketQty = '' @@ -533,7 +534,7 @@ If RIType EQ 'S' then Set_Property(@Window:'.PKT_QTY', 'TEXT', PocketQty) END end else - ErrMsg('A valid Part Type (EPP, ASM, HTR) must be selected before selecting Pocket Size.') + If Retired EQ '' then ErrMsg('A valid Part Type (EPP, ASM, HTR) must be selected before selecting Pocket Size.') end end @@ -597,6 +598,7 @@ RETURN PktSizeChange: + Retired = Get_Property(@Window: '.RETIRE_DT', 'TEXT') RIType = Get_Property(@Window:'.RI_TYPE', 'TEXT') If RIType EQ 'S' then PocketQty = '' @@ -624,12 +626,13 @@ PktSizeChange: End Case Set_Property(@Window:'.PKT_QTY', 'TEXT', PocketQty) end else - ErrMsg('A valid Pocket Size (6 or 8 in.) is required.') + If Retired EQ '' then ErrMsg('A valid Pocket Size (6 or 8 in.) is required.') end end else - ErrMsg('A valid Part Type (EPP, ASM, HTR) must be selected before selecting Pocket Size.') + If Retired EQ '' then ErrMsg('A valid Part Type (EPP, ASM, HTR) must be selected before selecting Pocket Size.') end end return + diff --git a/LSL2/STPROC/REACT_ITEM_ACTIONS.txt b/LSL2/STPROC/REACT_ITEM_ACTIONS.txt index 9667ea9..c2f1364 100644 --- a/LSL2/STPROC/REACT_ITEM_ACTIONS.txt +++ b/LSL2/STPROC/REACT_ITEM_ACTIONS.txt @@ -135,56 +135,66 @@ return WRITE_RECORD_PRE: - ErrMsg = '' + ErrMsg = '' + OrigRetireDt = OrigRecord + NewRetireDt = Record - // Req'd parameter checks - ItemType = {RI_TYPE} - - If ItemType EQ '' then ErrMsg := 'Item Type was not specified. ' - - If (ItemType NE 'LE') AND (ItemType NE 'RE') then - SerialNo = Record - If SerialNo EQ '' then - ErrMsg := 'Serial No. is required for this Reactor Item type. ' - end + If OrigRetireDt EQ '' AND NewRetireDt NE '' then + RetireBypass = True$ + end else + RetireBypass = False$ end - - If ItemType EQ 'S' then - PocketQty = Record - PocketSize = Record - If PocketSize EQ '' then - ErrMsg := 'Pocket size is required for Susceptor Item Type. ' + + If RetireBypass EQ False$ then + // Req'd parameter checks + ItemType = {RI_TYPE} + + If ItemType EQ '' then ErrMsg := 'Item Type was not specified. ' + + If (ItemType NE 'LE') AND (ItemType NE 'RE') then + SerialNo = Record + If SerialNo EQ '' then + ErrMsg := 'Serial No. is required for this Reactor Item type. ' + end end - If PocketQty EQ '' then - ErrMsg := 'Pocket quantity is required for Susceptor Item Type. ' - end - If ErrMsg = '' then - ExpectedQty = '' - Begin Case - Case Record EQ 'ASM' - If PocketSize EQ 6 OR PocketSize EQ 8 then - ExpectedQty = 1 + + If ItemType EQ 'S' then + PocketQty = Record + PocketSize = Record + If PocketSize EQ '' then + ErrMsg := 'Pocket size is required for Susceptor Item Type. ' + end + If PocketQty EQ '' then + ErrMsg := 'Pocket quantity is required for Susceptor Item Type. ' + end + If ErrMsg = '' then + ExpectedQty = '' + Begin Case + Case Record EQ 'ASM' + If PocketSize EQ 6 OR PocketSize EQ 8 then + ExpectedQty = 1 + end + Case Record EQ 'HTR' + If PocketSize EQ 8 then + ExpectedQty = 3 + end else + If PocketSize EQ 6 then ExpectedQty = 5 + end + Case Record EQ 'EPP' + If PocketSize EQ 8 then + ExpectedQty = 8 + end else + If PocketSize EQ 6 then ExpectedQty = 18 + end + Case Record EQ '' + ErrMsg := 'Part Type. is required for Susceptor Reactor Item type. ' + Case Otherwise$ + ErrMsg := 'Invalid Part Type for Susceptor Reactor Item Type. ' + End Case + If ExpectedQty NE '' then + If PocketQty NE ExpectedQty then + ErrMsg := 'Invalid Pocket Quantity for Part Type/Pocket Size combination. ' end - Case Record EQ 'HTR' - If PocketSize EQ 8 then - ExpectedQty = 3 - end else - If PocketSize EQ 6 then ExpectedQty = 5 - end - Case Record EQ 'EPP' - If PocketSize EQ 8 then - ExpectedQty = 8 - end else - If PocketSize EQ 6 then ExpectedQty = 18 - end - Case Record EQ '' - ErrMsg := 'Part Type. is required for Susceptor Reactor Item type. ' - Case Otherwise$ - ErrMsg := 'Invalid Part Type for Susceptor Reactor Item Type. ' - End Case - If ExpectedQty NE '' then - If PocketQty NE ExpectedQty then - ErrMsg := 'Invalid Pocket Quantity for Part Type/Pocket Size combination. ' end end end @@ -197,8 +207,6 @@ WRITE_RECORD_PRE: Record = '' ActionFlow = ACTION_STOP$ end else - OrigRetireDt = OrigRecord - NewRetireDt = Record OrigNotes = OrigRecord NewNotes = Record If ( (OrigRetireDt NE NewRetireDt) or (OrigNotes NE NewNotes) ) then @@ -283,3 +291,4 @@ return +