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
2025-03-06 12:24:06 -07:00
committed by Infineon\StieberD
parent 6050b346a5
commit 507c6bffba
18 changed files with 5440 additions and 2331 deletions

View File

@ -71,7 +71,6 @@ Return Response or ""
//-----------------------------------------------------------------------------
//----------------------------------------------------------------------------------------------------------------------
// ToggleHold
//
@ -114,6 +113,7 @@ Service ToggleHold(WOMatKey, HoldEntity, HoldEntityID, CtrlEntID, OriginFlag, Ho
End Service
//----------------------------------------------------------------------------------------------------------------------
// ToggleMultipleHolds
//
@ -154,6 +154,7 @@ Service ToggleMultipleHolds(WOMatKeys, HoldEntity, HoldEntityIDs, CtrlEntID, Ori
end service
//----------------------------------------------------------------------------------------------------------------------
// EnableMultipleHolds
//
@ -194,11 +195,6 @@ Service EnableMultipleHolds(WOMatKeys, HoldEntity, HoldEntityIDs, CtrlEntID, Ori
For I = 1 to WOMatCount
If Hold_Services('CheckForHold', WOMatKeys<I>) EQ False$ then
Hold_Services('OnHold', WOMatKeys<I>, HoldEntity, HoldEntityIDs<I>, HoldType, HoldData)
* If Error_Services("NoError") then
* Hold_Services("HoldNotification", HoldEntity, HoldEntityIDs<I>, Reason, True$, HoldType)
* end else
* Response = Error_Services("GetMessage")
* end
end
If CtrlEntID EQ 'NDW_RDS_QUERY' OR CtrlEntID EQ 'NDW_WM_OUT_QUICK_QUERY' then Msg(@window, MsgUp, I, MSGINSTUPDATE$)
Next I
@ -208,6 +204,7 @@ Service EnableMultipleHolds(WOMatKeys, HoldEntity, HoldEntityIDs, CtrlEntID, Ori
end service
//----------------------------------------------------------------------------------------------------------------------
// DisableMultipleHolds
//
@ -248,11 +245,6 @@ Service DisableMultipleHolds(WOMatKeys, HoldEntity, HoldEntityIDs, CtrlEntID, Or
For I = 1 to WOMatCount
If Hold_Services('CheckForHold', WOMatKeys<I>) EQ True$ then
Hold_Services('OffHold', WOMatKeys<I>, HoldEntity, HoldEntityIDs<I>, HoldType, HoldData)
* If Error_Services("NoError") then
* Hold_Services("HoldNotification", HoldEntity, HoldEntityIDs<I>, Reason, False$, HoldType)
* end else
* Response = Error_Services("GetMessage")
* end
end
If CtrlEntID EQ 'NDW_RDS_QUERY' OR CtrlEntID EQ 'NDW_WM_OUT_QUICK_QUERY' then Msg(@window, MsgUp, I, MSGINSTUPDATE$)
Next I
@ -262,6 +254,7 @@ Service DisableMultipleHolds(WOMatKeys, HoldEntity, HoldEntityIDs, CtrlEntID, Or
end service
//----------------------------------------------------------------------------------------------------------------------
// OnHold
//
@ -302,6 +295,8 @@ Service OnHold(WOMatKey, HoldEntity, HoldEntityID, HoldType, HoldData, OperatorI
UserID = HoldData<1>
Reason = HoldData<2>
Extended = HoldData<3>
Stage = HoldData<4>
Interrupted = HoldData<5>
CurrDate = OCONV(Date(),'D4/')
CurrTime = OCONV(Time(),'MTS')
@ -319,7 +314,8 @@ Service OnHold(WOMatKey, HoldEntity, HoldEntityID, HoldType, HoldData, OperatorI
WOMatRec = INSERT(WOMatRec,WO_MAT_HOLD_STOP_REASON$,1,0,'')
WOMatRec = INSERT(WOMatRec,WO_MAT_HOLD_ENTITY$,1,0,HoldEntity)
WOMatRec = INSERT(WOMatRec,WO_MAT_HOLD_ENTITY_ID$,1,0,HoldEntityID)
WOMatRec<WO_MAT_HOLD_STAGE$> = Stage
WOMatRec<WO_MAT_HOLD_INTERRUPTED$> = Interrupted
***********************************************************
// - djs - 10/29/2019
@ -349,6 +345,8 @@ Service OnHold(WOMatKey, HoldEntity, HoldEntityID, HoldType, HoldData, OperatorI
WOMatRec = INSERT(WOMatRec,WO_MAT_SHIP_HOLD_STOP_DTM$,1,0,'')
WOMatRec = INSERT(WOMatRec,WO_MAT_SHIP_HOLD_STOP_USER$,1,0,'')
WOMatRec = INSERT(WOMatRec,WO_MAT_SHIP_HOLD_STOP_REASON$,1,0,'')
WOMatRec<WO_MAT_HOLD_STAGE$> = Stage
WOMatRec<WO_MAT_HOLD_INTERRUPTED$> = Interrupted
END
IF HoldEntity = 'WM_OUT' THEN
@ -371,6 +369,7 @@ Service OnHold(WOMatKey, HoldEntity, HoldEntityID, HoldType, HoldData, OperatorI
End Service
//----------------------------------------------------------------------------------------------------------------------
// OffHold
//
@ -425,6 +424,8 @@ Service OffHold(WOMatKey, HoldEntity, HoldEntityID, HoldType, HoldData, Operator
WOMatRec<WO_MAT_HOLD_STOP_USER$,1> = UserID
WOMatRec<WO_MAT_HOLD_STOP_REASON$,1> = Reason
WOMatRec<WO_MAT_HOLD_EXTENDED$,1> = 0
WOMatRec<WO_MAT_HOLD_STAGE$> = ''
WOMatRec<WO_MAT_HOLD_INTERRUPTED$> = ''
***********************************************************
@ -457,6 +458,8 @@ Service OffHold(WOMatKey, HoldEntity, HoldEntityID, HoldType, HoldData, Operator
WOMatRec<WO_MAT_SHIP_HOLD_STOP_USER$,1> = UserID
WOMatRec<WO_MAT_SHIP_HOLD_STOP_REASON$,1> = Reason
WOMatRec<WO_MAT_SHIP_HOLD_EXTENDED$,1> = 0
WOMatRec<WO_MAT_HOLD_STAGE$> = ''
WOMatRec<WO_MAT_HOLD_INTERRUPTED$> = ''
END
IF HoldEntity = 'WM_OUT' THEN
@ -480,9 +483,9 @@ Service OffHold(WOMatKey, HoldEntity, HoldEntityID, HoldType, HoldData, Operator
end
end
End Service
//----------------------------------------------------------------------------------------------------------------------
// CheckForHold
//
@ -693,6 +696,7 @@ Service EditHoldReason(WOMatKey, ColName, ColValNo, UpdatedText)
End Service
//----------------------------------------------------------------------------------------------------------------------
// CreateComment
//
@ -765,4 +769,3 @@ Service CreateComment(HoldEntity, HoldEntityID, Reason, Transition, HoldType, Op
end service