Index: EWTOE.mac.rou
===================================================================
diff -u -r52055 -r54159
--- EWTOE.mac.rou	(.../EWTOE.mac.rou)	(revision 52055)
+++ EWTOE.mac.rou	(.../EWTOE.mac.rou)	(revision 54159)
@@ -505,6 +505,7 @@
 UPRCP(C) 
  New R,LEVNr,TOENr,TLUNr,TLUSNr,TLNr,SplitNr,PRNr,TPRNr,Aantal,TAantal
  New BackOrd,BOAantal,WMS,KLNr,ORDNr,OLNr,OLUNr,Text,Link,MailId,BelDat
+ New EventRaiser, EventQueue
  Set $zt="UPTrapCatch^EWTOE"	
  Set TOENr=C("TOENR"),TLUSNr=C("TLUNR"),SplitNr=C("SPLITSNR"),TLUNr=TLUSNr+SplitNr-1
  Set R=$G(^KTO1(TOENr)),LEVNr=$P(R,D)
@@ -520,6 +521,8 @@
  ...If TPRNr=PRNr Do
  ....Set Aantal=C("DELTAIN"),BackOrd='C("COMPLEET")
  ....If TAantal'<Aantal Do
+ .....Set EventRaiser = ##class(TECH.PubSub.OrchestrationContext).GetEventRaiser()
+ .....Set EventQueue = ##class(TECH.PubSub.impl.EventQueue).%New(EventRaiser)
  .....Set BOAantal=0 Set:BackOrd BOAantal=$P(R,D,3)-Aantal
  .....Set R=""
  .....Set $P(R,D)=$G(C("PALETID")),$P(R,D,2)=$G(C("DELTAIN"))
@@ -542,6 +545,7 @@
  ......Set Text(3)="~VZW: "_$$SHOW^KLVERZW(,,ORDNr)_" - LEV.DATUM: "_$$EXTDATE^vhDTyp(BelDat)_" - Halux "_$$HALUXTYP^FLOWCHK("O",ORDNr)
  ......Set Link(1)="KL\"_KLNr_"\R\O",Link(2)="ORD\"_ORDNr_"\R"
  ......Set MailId=$$SYSTEM^vhMAIL("","Order","Halux","HALORDOK",.Text,.Link,"U","A")
+ .....Do EventQueue.ExecuteEventsAsync()
  ....Else  Do ERROR^EWLOG($T(UPAANTNOK)) Xecute "Set C(""ERROR"")="_$P($T(UPAANTNOK),";",2,99)
  ...Else  Do ERROR^EWLOG($T(UPRODNOK)) Xecute "Set C(""ERROR"")="_$P($T(UPRODNOK),";",2,99)
  ..Else  Do ERROR^EWLOG($T(UPROD))
@@ -565,7 +569,8 @@
 	{
 		Set LadeGerecepteerdEventData = ##class(TECH.Events.LadeGerecepteerdEventData).%New(TOENr,TLUNr,PRNr,BatchID,"-1")
 		Set LadeGerecepteerdEvent = ##class(TECH.Events.LadeGerecepteerdEvent).%New(LadeGerecepteerdEventData)
-		Do ##class(TECH.PubSub.OrchestrationContext).GetEventRaiser().RaiseEventAsync(LadeGerecepteerdEvent)
+		;Do ##class(TECH.PubSub.OrchestrationContext).GetEventRaiser().RaiseEventAsync(LadeGerecepteerdEvent)
+		Do EventQueue.AddEvent(LadeGerecepteerdEvent)
 	}
 	Quit
  
Index: TECH/PubSub/impl/EventQueue.cls.xml
===================================================================
diff -u
--- TECH/PubSub/impl/EventQueue.cls.xml	(revision 0)
+++ TECH/PubSub/impl/EventQueue.cls.xml	(revision 54159)
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="TECH.PubSub.impl.EventQueue">
+<Super>%RegisteredObject</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="WachtendEventAanmaken">
+<Type>TECH.PubSub.impl.WachtendEventAanmaken</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="EventList">
+<Type>%ListOfObjects</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>WachtendEventAanmaken:TECH.PubSub.impl.WachtendEventAanmaken</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set WachtendEventAanmaken = WachtendEventAanmaken
+	Set ..EventList = ##class(%ListOfObjects).%New()
+	 
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="ClearEventList">
+<Implementation><![CDATA[	Do ..EventList.Clear()
+]]></Implementation>
+</Method>
+
+<Method name="AddEvent">
+<FormalSpec>Event:TECH.PubSub.Event</FormalSpec>
+<Implementation><![CDATA[	Do ..EventList.Insert(Event)
+]]></Implementation>
+</Method>
+
+<Method name="ExecuteEventsAsync">
+<Implementation><![CDATA[
+	//#dim EventListIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(..EventList)
+	Set EventListIterator = ##class(TECH.ListIterator).%New(..EventList)
+	While EventListIterator.HasNext() {
+		Do ..WachtendEventAanmaken.RaiseEventAsync(EventListIterator.Next())
+	}
+	Do ..EventList.Clear()
+]]></Implementation>
+</Method>
+
+<UDLText name="T">
+<Content><![CDATA[
+/*
+Method ExecuteEventsSync()
+{
+	//#dim EventListIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(..EventList)
+	Set EventListIterator = ##class(TECH.ListIterator).%New(..EventList)
+	While EventListIterator.HasNext() {
+		Do ..WachtendEventAanmaken.RaiseEventSync(EventListIterator.Next())
+	}
+	Do ..EventList.Clear()
+}
+*/
+]]></Content>
+</UDLText>
+</Class>
+</Export>