Merged PR 19430: Fix references to old supplement system.

This commit is contained in:
Mitchem Dakota (CSC FI SPS MESLEO External)
2025-06-24 21:20:40 +02:00
parent 1db89a3d3f
commit 52499b7616
5 changed files with 88 additions and 59 deletions

View File

@ -18,10 +18,10 @@ 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
DECLARE FUNCTION Logging_Services, Environment_Services, Error_Services, Signature_Services
DECLARE FUNCTION Logging_Services, Environment_Services, Error_Services, Signature_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
DECLARE SUBROUTINE SRP_Stopwatch, Database_Services, Lot_Services
DECLARE SUBROUTINE SRP_Stopwatch, Database_Services, Lot_Services, Supplement_Services
$INSERT MSG_EQUATES
$INSERT WO_VERIFY_EQU
@ -464,32 +464,7 @@ Create:
NEXT I
********************************
*Automatically Apply Supplement*
********************************
// If first cassette in work order, then there is no supplement in place, therefore skip this step.
If RDSRec<RDS_CASS_NO$> GT 1 then
WoStepKey = RDSRec<RDS_WO_STEP_KEY$>
WoStepRec = Database_Services('ReadDataRow', 'WO_STEP', WoStepKey)
If Error_Services('NoError') then
LastRDSKey = WoStepRec<WO_STEP_RDS_KEY$>[-1, 'B' : @VM]
LastRDSRec = Database_Services('ReadDataRow', 'RDS', LastRDSKey)
If Error_Services('NoError') then
HasSupplement = LastRDSRec<RDS_SUPPLEMENT$>
If HasSupplement then
RDSRec<RDS_SUPPLEMENT$> = True$
RDSRec<RDS_SUPPL_INST$> = LastRDSRec<RDS_SUPPL_INST$>
RDSRec<RDS_SUPPL_ENTRY_ID$> = LastRDSRec<RDS_SUPPL_ENTRY_ID$>
RDSRec<RDS_SUPPL_ENTRY_DATE$> = LastRDSRec<RDS_SUPPL_ENTRY_DATE$>
RDSRec<RDS_SUPPL_ENTRY_TIME$> = LastRDSRec<RDS_SUPPL_ENTRY_TIME$>
end
end else
Logging_Services('AppendLog', objLog, LoggingDTM : ',' : @USER4 : ',' : RDSNo : ',' : 'Error automatically applying supplement to new RDS.')
end
end else
Logging_Services('AppendLog', objLog, LoggingDTM : ',' : @USER4 : ',' : RDSNo : ',' : 'Error automatically applying supplement to new RDS.')
end
end
Send_Info('Saving RDS record...')
@ -502,6 +477,29 @@ Create:
END ELSE
Lot_Services('CreateNewLot', 'RDS', '', WaferQty, SubPartNo, LotNo, SubVendCd, @User4, '', RDSNo)
Result = RDSNo
********************************
*Automatically Apply Supplement*
********************************
// If first cassette in work order, then there is no supplement in place, therefore skip this step.
If RDSRec<RDS_CASS_NO$> GT 1 then
WoStepKey = RDSRec<RDS_WO_STEP_KEY$>
WoStepRec = Database_Services('ReadDataRow', 'WO_STEP', WoStepKey)
If Error_Services('NoError') then
RDSKeyCount = Dcount(WoStepRec<WO_STEP_RDS_KEY$>, @VM)
LastRDSKey = WoStepRec<WO_STEP_RDS_KEY$, RDSKeyCount - 1>
LastRDSRec = Database_Services('ReadDataRow', 'RDS', LastRDSKey)
If Error_Services('NoError') then
HasSupplement = Supplement_Services('HasSupplements', 'RDS', LastRDSKey, '')
If HasSupplement then
Supplement_Services('CopySupplementsToNewLot', 'RDS', LastRDSKey, RDSNo)
end
end else
Logging_Services('AppendLog', objLog, LoggingDTM : ',' : @USER4 : ',' : RDSNo : ',' : 'Error automatically applying supplement to new RDS.')
end
end else
Logging_Services('AppendLog', objLog, LoggingDTM : ',' : @USER4 : ',' : RDSNo : ',' : 'Error automatically applying supplement to new RDS.')
end
end
END
* * * * * * *
@ -1479,3 +1477,5 @@ CalcThickTarget:
RETURN