Merged PR 21598: Refactored receive and release codebase.

Refactored receive and release codebase.

bug fixes and performance improvements

modified WO_REC form to use the same receive and same release dtm for all cassettes released in a given batch

Related work items: #259878
This commit is contained in:
Stieber Daniel (CSC FI SPS MESLEO)
2025-07-23 15:40:25 +00:00
parent 84da66ccd5
commit de2e6af5f7
26 changed files with 53999 additions and 14791 deletions

View File

@ -54,7 +54,7 @@ $Insert MSG_EQUATES
$Insert POPUP_EQUATES
$Insert WO_LOG_EQUATES
Declare subroutine Errmsg, Btree.Extract, Set_Status, Logging_Services, Work_Order_Services
Declare subroutine Errmsg, Btree.Extract, Set_Status, Logging_Services, Work_Order_Services, PlaceDialog
Declare function obj_WO_Log, Work_Order_Services, Environment_Services, Logging_Services, Database_Services
LogPath = Environment_Services('GetApplicationRootPath') : '\LogFiles\WO_LOG'
@ -92,7 +92,7 @@ Return EventFlow or 1
Event WINDOW.CREATE(CreateParam)
SRP_Show_Window(@Window, '', 'C', 'C', 1, '', False$, False$, FormSize)
PlaceDialog(-2, -2)
End Event
@ -156,44 +156,6 @@ Event PUB_RX.CLICK()
end event
Event PUB_RELEASE.CLICK()
WONo = Get_Property(@Window:'.EDL_WO_NO', 'TEXT')
If WONo NE '' then
NumRelCass = 0
ReleaseStartTime = Time()
NumRelCass = Work_Order_Services('ReleaseCassettes', WONo)
ReleaseStopTime = Time()
If Error_Services('HasError') then
ErrorMsg = Error_Services('GetMessage')
ErrMsg(ErrorMsg)
end
RefreshStartTime = Time()
GoSub PopulateControls
RefreshStopTime = Time()
ReleaseDuration = ReleaseStopTime - ReleaseStartTime
RefreshDuration = RefreshStopTime - RefreshStartTime
TotalDuration = ReleaseDuration + RefreshDuration
If NumRelCass GT 0 then
SecPerCass = TotalDuration / NumRelCass
end else
SecPerCass = 'N/A'
end
LogData = ''
LogData<1> = LoggingDTM
LogData<2> = WONo
LogData<3> = @User4
LogData<4> = NumRelCass
LogData<5> = ReleaseDuration
LogData<6> = RefreshDuration
LogData<7> = TotalDuration
LogData<8> = SecPerCass
Logging_Services('AppendLog', objReleaseLog, LogData, @RM, @FM)
end
end event
Event PUB_LABELS.CLICK()
WONo = Get_Property(@Window:'.EDL_WO_NO', 'TEXT')
@ -250,12 +212,14 @@ PopulateControls:
NumCtrls = DCount(Ctrls, ',')
Def = ""
Def<MCAPTION$> = "Loading Work Order Details..."
Def<MTYPE$> = "GC"
Def<MEXTENT$> = NumCtrls
Def<MTEXTWIDTH$> = 600
MsgUp = Msg(@WINDOW, Def) ;* Start gas guage message
Def = ""
Def<MCAPTION$> = "Loading Work Order Details..."
Def<MTYPE$> = "GC"
Def<MEXTENT$> = NumCtrls
Def<MTEXTWIDTH$> = 600
Def<MCOL$> = -2
Def<MROW$> = -2
MsgUp = Msg(@WINDOW, Def) ;* Start gas guage message
Swap ',' with @VM in Ctrls
Swap ',' with @VM in Cols