Index: APPS/VisiDot/impl/EndAfhandelaar.cls.xml
===================================================================
diff -u -r2783 -r2786
--- APPS/VisiDot/impl/EndAfhandelaar.cls.xml	(.../EndAfhandelaar.cls.xml)	(revision 2783)
+++ APPS/VisiDot/impl/EndAfhandelaar.cls.xml	(.../EndAfhandelaar.cls.xml)	(revision 2786)
@@ -21,7 +21,6 @@
 	Do ..RecepteerProducten()
 	Do ..ToeleveringIngescand()
 	
-	
 	Set BestandNaam = "EndInfo_OUT.xml"
 	Do ..BewaarData(ProcessedData,BestandNaam)
 ]]></Implementation>
@@ -52,15 +51,15 @@
 <Implementation><![CDATA[
 	Set ReturnStatus = $$$OK
 	
+	
+	Set ProductAPI = ##class(DOM.DomeinContext).Instance().GeefProductAPI()
 	/// Enkel uitvoeren als er een batch te discoveren is.	
 	If (..CaptureHelper.GeefBatchID()){
 		Set ProductionHelper = ##class(APPS.VisiDot.impl.VHossProductionHelper).%New()
 		
-						
 		Set UserID = "VisiDot"
 		Set ReceptieGroepID = "VisiDot"
-		Set FrameID = "Vhoss"
-		Set Locatie = "Locatie"
+		Set LocatieTransit = "04020101"
 		
 		/// Nieuwe bufferVolgNr opbouwen
 		Set ..bfrVolgNr = ##class(BL.MB.UGLYPicking.Receptie).CreateNewBuffer(ReceptieGroepID,UserID)
@@ -71,21 +70,25 @@
 			/// QueueElement As DS.PPS.TBX.Queue
 			Set QueueElement = QueueIterator.Next()
 			
+			Set QueueHelper = ##class(APPS.VisiDot.impl.QueueHelper).%New(QueueElement,ProductAPI)
+			
 			Set $ZTRAP = "CatchReceptieProbleem"
 			
 			If (QueueElement.Status = "W"){
 				
-				Set ProductID = QueueElement.Product.ProductNr
+				Set ProductID = QueueHelper.GeefProductNr()
 				Set BatchID = ..CaptureHelper.GeefBatchID()	
+				Set ToeleveringID = QueueElement.TOENr
 				Set Dossier = QueueElement.DOSNr
+				Set FrameID = ProductionHelper.GeefPalletIDVanVHossID(QueueHelper.GeefFrameID())
 				Set ProdIsInKOM = ""
 				Set DomeinContext = ##class(TECH.Context.RuntimeContext).Instance()
 				Set GebruikerInitialen = DomeinContext.GeefGebruikerInitialen()
-				Set Status = ##class(BL.MB.UGLYPicking.Receptie).AddToBuffer(ReceptieGroepID,..bfrVolgNr,ProductID,Dossier,Locatie,FrameID,GebruikerInitialen,.ProdIsInKOM)
+				Set Status = ##class(BL.MB.UGLYPicking.Receptie).AddToBuffer(ReceptieGroepID,..bfrVolgNr,ProductID,Dossier,LocatieTransit,FrameID,GebruikerInitialen,.ProdIsInKOM,ToeleveringID)
 				
 				If ($LG(Status,1) < 0)
 				{
-					Set FoutString = "##class(BL.MB.UGLYPicking.Receptie).AddToBuffer("_ReceptieGroepID_","_..bfrVolgNr_","_ProductID_","_Dossier_","_Locatie_","_FrameID_","_GebruikerInitialen_","_ProdIsInKOM_")"					
+					Set FoutString = "##class(BL.MB.UGLYPicking.Receptie).AddToBuffer("_ReceptieGroepID_","_..bfrVolgNr_","_ProductID_","_Dossier_","_LocatieTransit_","_FrameID_","_GebruikerInitialen_","_ProdIsInKOM_")"					
 					Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.GeneralErrorException).%New("Fout bij uitvoeren van "_FoutString_$C(13,10)_"Fout: "_$LG(Status,2)))	
 				}				
 			}	
@@ -104,16 +107,12 @@
 
 <Method name="ToeleveringIngescand">
 <Implementation><![CDATA[
-	
 	Set ReceptieGroepID = "VisiDot"
-	
 	If (..bfrVolgNr '= ""){	
 		Do WLIP^vhDBG(127,"UglyPickingReceptieVolgNr : "_..bfrVolgNr)
 		Set EventData = ##class(BL.MB.UGLYPicking.Events.ToeFinishedEventData).%New("",ReceptieGroepID,..bfrVolgNr)
 		Set Event = ##class(BL.MB.UGLYPicking.Events.ToeFinishedEvent).%New(EventData)
 		Do ##class(TECH.PubSub.OrchestrationContext).GetEventRaiser().RaiseEventAsync(Event)
-	}Else{
-		Do WLIP^vhDBG(127,"UglyPickingReceptieVolgNr niet ingevuld")
 	}
 ]]></Implementation>
 </Method>