Addressed a bug causing a possible race condition with writing the WMO Curr Status. Removed RDS and WMO comments until a better solution arrives.

This commit is contained in:
Infineon\Ouellette
2024-09-16 16:41:17 -07:00
parent 293d01a2c0
commit 36be2709c9
3 changed files with 41 additions and 36 deletions

View File

@ -36,7 +36,7 @@ $insert NOTIFICATION_EQU
Declare function Scan_Services, Memory_Services, Database_Services, SRP_JSON, RTI_CreateGUID, Memberof
Declare function Get_Property, RDS_Services, EpiPro_Services, DateTime, Signature_Services
Declare subroutine Scan_Services, Memory_Services, Database_Services, SRP_JSON, Security_Services, obj_Notes
Declare subroutine obj_WO_Mat_Log, obj_WO_Mat, Set_Status, SAP_Services, Rds_Services, Wm_Out_Services
Declare subroutine obj_WO_Mat_Log, obj_WO_Mat, Set_Status, SAP_Services, Rds_Services, Wm_Out_Services, Hold_Services
//TODO - flag used during cutover, delete from APP_INFO and removed commented lines reference Use2DBarcode
*Use2DBarcode = Database_Services('ReadDataRow', 'APP_INFO', 'USE_PACKAGING_2D')
@ -148,14 +148,14 @@ Service CompletePackaging(CassetteID, OperatorID, BaggerIdentifier)
// Add CassComp transaction to SAP queue
SAPBatchNo = Xlate('WO_MAT', WOMatKey, 'SAP_BATCH_NO', 'X')
If SAPBatchNo EQ '' then SAP_Services('AddCassCompTransaction', WOMatKey)
Begin Case
Case CommentEntity = 'RDS'
CommentText = 'Packaging completed for RDS ' :CassetteID: ' by user ' : OperatorID
Rds_Services('AddComment', CassetteID, CommentText, OperatorID)
Case CommentEntity = 'WM_OUT'
CommentText = 'Packaging completed for WM_OUT ' :CassetteID: ' by user ' : OperatorID
Wm_Out_Services('AddComment', CassetteID, CommentText, OperatorID)
End Case
* Begin Case
* Case CommentEntity = 'RDS'
* CommentText = 'Packaging completed for RDS ' :CassetteID: ' by user ' : OperatorID
* Rds_Services('AddComment', CassetteID, CommentText, OperatorID)
* Case CommentEntity = 'WM_OUT'
* CommentText = 'Packaging completed for WM_OUT ' :CassetteID: ' by user ' : OperatorID
* Wm_Out_Services('AddComment', CassetteID, CommentText, OperatorID)
* End Case
end
end
@ -255,7 +255,8 @@ Service ProcessScanData(ScanData, ScanType = SCAN_TYPES, Param1, Param2, Param3)
CtrlEntID = False$ ;* Control checked/unchecked
OriginFlag = 'P' ;* Flag to indicate a hold initiated from the packagaing form
Parms = WOMatKey:@RM:HoldEntity:@RM:HoldEntityID:@RM:CtrlEntID:@RM:OriginFlag:@RM:OperatorID
obj_WO_Mat('ToggleHold', Parms)
//obj_WO_Mat('ToggleHold', Parms)
Hold_Services('ToggleHold', WOMatKey, HoldEntity, HoldEntityID, CtrlEntID, OriginFlag, '', OperatorID)
// Write fail packaging record in material log for first cassette ID
LogDate = OCONV( Date(), 'D2/' )
@ -315,7 +316,7 @@ Service ProcessScanData(ScanData, ScanType = SCAN_TYPES, Param1, Param2, Param3)
IF Get_Status(errCode) THEN Error_Services('Add', 'Error code ':errCode:' in ':Service:' service.')
// Add error to error stack
ErrorMessage = 'Lots do not match – operation cannot continue. '|
ErrorMessage = 'Lots do not match - operation cannot continue. '|
: 'Lot has been put on hold - place lot on hold shelf and notify Supervisor, Lead, or Engineering'
Error_Services('Add', ErrorMessage)
end
@ -348,7 +349,7 @@ Service ProcessScanData(ScanData, ScanType = SCAN_TYPES, Param1, Param2, Param3)
// Valid Poly scan - has to be exact match
Response = ScanData[2, 999]
end else
Error_Services('Add', 'Location does not equal POLY – operation cannot continue.')
Error_Services('Add', 'Location does not equal POLY - operation cannot continue.')
end
Case ScanType EQ 'TRILAM'
@ -356,7 +357,7 @@ Service ProcessScanData(ScanData, ScanType = SCAN_TYPES, Param1, Param2, Param3)
// Valid Trilam scan - has to be exact match
Response = ScanData[2, 999]
end else
Error_Services('Add', 'Location does not equal TRILAM – operation cannot continue.')
Error_Services('Add', 'Location does not equal TRILAM - operation cannot continue.')
end
Case ScanType EQ 'CASSETTE_1'
@ -407,7 +408,7 @@ Service ProcessScanData(ScanData, ScanType = SCAN_TYPES, Param1, Param2, Param3)
HoldStatus = Xlate('WO_MAT', CassetteID, 'HOLD', 'X')
FQAComp = Signature_Services('FinalSigComp', CassetteID)
If (HoldStatus EQ True$) then
ErrorMessage = 'Lot is currently on hold – operation cannot continue. ' |
ErrorMessage = 'Lot is currently on hold - operation cannot continue. ' |
: 'Place lot on hold shelf and notify Supervisor, Lead, or Engineering.'
Error_Services('Add', ErrorMessage)
end else If FQAComp NE True$ then
@ -430,7 +431,7 @@ Service ProcessScanData(ScanData, ScanType = SCAN_TYPES, Param1, Param2, Param3)
FQAComp = Epipro_Services('GetFinalQAStatus', CassetteID)
LblCheckComp = Signature_Services('CheckQALabelStatus', WOMatKey)
If (HoldStatus EQ True$) then
ErrorMessage = 'Lot is currently on hold – operation cannot continue. ' |
ErrorMessage = 'Lot is currently on hold - operation cannot continue. ' |
: 'Place lot on hold shelf and notify Supervisor, Lead, or Engineering.'
Error_Services('Add', ErrorMessage)
end else If FQAComp NE True$ then
@ -454,7 +455,7 @@ Service ProcessScanData(ScanData, ScanType = SCAN_TYPES, Param1, Param2, Param3)
WONo = Field(WOMatKey, '*', 1)
CassNo = Field(WOMatKey, '*', 2)
If (HoldStatus EQ True$) then
ErrorMessage = 'Lot is currently on hold – operation cannot continue.' |
ErrorMessage = 'Lot is currently on hold - operation cannot continue.' |
: 'Place lot on hold shelf and notify Supervisor, Lead, or Engineering.'
Error_Services('Add', ErrorMessage)
end else If FQAComp NE True$ then
@ -588,7 +589,8 @@ Service ProcessScanData(ScanData, ScanType = SCAN_TYPES, Param1, Param2, Param3)
CtrlEntID = False$ ;* Control checked/unchecked
OriginFlag = 'P' ;* Flag to indicate a hold initiated from the packagaing form
Parms = WOMatKey:@RM:HoldEntity:@RM:HoldEntityID:@RM:CtrlEntID:@RM:OriginFlag:@RM:OperatorID
obj_WO_Mat('ToggleHold', Parms)
//obj_WO_Mat('ToggleHold', Parms)
Hold_Services('ToggleHold', WOMatKey, HoldEntity, HoldEntityID, CtrlEntID, OriginFlag, '', OperatorID)
// Check if second cassette ID is a valid RDS or WM_OUT key
Convert '.' to '*' in SecondCassID
@ -646,7 +648,8 @@ Service ProcessScanData(ScanData, ScanType = SCAN_TYPES, Param1, Param2, Param3)
CtrlEntID = False$ ;* Control checked/unchecked
OriginFlag = 'P' ;* Flag to indicate a hold initiated from the packagaing form
Parms = WOMatKey:@RM:HoldEntity:@RM:HoldEntityID:@RM:CtrlEntID:@RM:OriginFlag:@RM:OperatorID
obj_WO_Mat('ToggleHold', Parms)
//obj_WO_Mat('ToggleHold', Parms)
Hold_Services('ToggleHold', WOMatKey, HoldEntity, HoldEntityID, CtrlEntID, OriginFlag, '', OperatorID)
end
// Send scan mismatch notification
@ -690,7 +693,3 @@ Service ProcessScanData(ScanData, ScanType = SCAN_TYPES, Param1, Param2, Param3)
end
end service