Index: vhTest/Fake/WSimpl/Halux/AAP/DnaCodeService/UGLYPickingWrapper.cls.xml
===================================================================
diff -u -r60549 -r60551
--- vhTest/Fake/WSimpl/Halux/AAP/DnaCodeService/UGLYPickingWrapper.cls.xml	(.../UGLYPickingWrapper.cls.xml)	(revision 60549)
+++ vhTest/Fake/WSimpl/Halux/AAP/DnaCodeService/UGLYPickingWrapper.cls.xml	(.../UGLYPickingWrapper.cls.xml)	(revision 60551)
@@ -8,15 +8,14 @@
 <Super>WSimpl.Halux.AAP.DnaCodeService.UGLYPickingWrapper</Super>
 
 <Method name="BuildBufferViaDnaCode">
-<FormalSpec><![CDATA[Toelevering:%String,Pallet:%String,Initialen:%String,&VolgNr:%Integer]]></FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<FormalSpec>Toelevering:%String,Pallet:%String,Initialen:%String</FormalSpec>
+<ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="CloseAndHandleBuffer">
 <FormalSpec>VolgNr:%Integer</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 </Class>
 
Index: vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/RondKaderdeurDagAf/Test.cls.xml
===================================================================
diff -u -r60546 -r60551
--- vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/RondKaderdeurDagAf/Test.cls.xml	(.../Test.cls.xml)	(revision 60546)
+++ vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/RondKaderdeurDagAf/Test.cls.xml	(.../Test.cls.xml)	(revision 60551)
@@ -28,8 +28,12 @@
 	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaDatum",DnaCode1.ScanTijdstip).DanReturn(DnaCodeIteratorTweeStuks)
 	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaToeleveringIdEnRecent",DnaCode1.Toelevering).DanReturn(DnaCodeIteratorTweeStuks)
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)
+	Set UGLYPickingWrapperStub = ##class(vhTest.Mock.WSimpl.Halux.AAP.DnaCodeService.UGLYPickingWrapper).%New()
+	Do UGLYPickingWrapperStub.IndienMethodCall("BuildBufferViaDnaCode",$$$ElkeWaarde,$$$ElkeWaarde,$$$ElkeWaarde).DanDoeNiks()
+	Do UGLYPickingWrapperStub.IndienMethodCall("CloseAndHandleBuffer",$$$ElkeWaarde).DanDoeNiks()
 	
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,UGLYPickingWrapperStub)
+	
 	#dim Antwoord As WS.Halux.AAP.RondKaderdeurDagAfResponse = DnaCodeService.RondKaderdeurDagAf(Request)
 	
 	Do $$$AssertEquals(Antwoord.ToeleveringMetAantallen.Count(),0)
@@ -62,8 +66,13 @@
 	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaDatum",DnaCode1.ScanTijdstip).DanReturn(DnaCodeIteratorTweeStuks)
 	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaToeleveringIdEnRecent",DnaCode1.Toelevering).DanReturn(DnaCodeIteratorTweeStuks)
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)
 	
+	Set UGLYPickingWrapperStub = ##class(vhTest.Mock.WSimpl.Halux.AAP.DnaCodeService.UGLYPickingWrapper).%New()
+	Do UGLYPickingWrapperStub.IndienMethodCall("BuildBufferViaDnaCode",$$$ElkeWaarde,$$$ElkeWaarde,$$$ElkeWaarde).DanDoeNiks()
+	Do UGLYPickingWrapperStub.IndienMethodCall("CloseAndHandleBuffer",$$$ElkeWaarde).DanDoeNiks()
+	
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,UGLYPickingWrapperStub)
+	
 	#dim Antwoord As WS.Halux.AAP.RondKaderdeurDagAfResponse = DnaCodeService.RondKaderdeurDagAf(Request)
 	
 	If $$$AssertEquals(Antwoord.ToeleveringMetAantallen.Count(),1) {
@@ -114,8 +123,13 @@
 	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaDatum",DnaCode1.ScanTijdstip).DanReturn(DnaCodeIteratorVierStuks)
 	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaToeleveringIdEnRecent",DnaCode1.Toelevering).DanReturn(AndereDnaCodeIteratorVierStuks)
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)
 	
+	Set UGLYPickingWrapperStub = ##class(vhTest.Mock.WSimpl.Halux.AAP.DnaCodeService.UGLYPickingWrapper).%New()
+	Do UGLYPickingWrapperStub.IndienMethodCall("BuildBufferViaDnaCode",$$$ElkeWaarde,$$$ElkeWaarde,$$$ElkeWaarde).DanDoeNiks()
+	Do UGLYPickingWrapperStub.IndienMethodCall("CloseAndHandleBuffer",$$$ElkeWaarde).DanDoeNiks()
+	
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,UGLYPickingWrapperStub)
+	
 	#dim Antwoord As WS.Halux.AAP.RondKaderdeurDagAfResponse = DnaCodeService.RondKaderdeurDagAf(Request)
 	
 	If $$$AssertEquals(Antwoord.ToeleveringMetAantallen.Count(),1) {
@@ -161,8 +175,13 @@
 	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaToeleveringIdEnRecent",DnaCode1.Toelevering).DanReturn(DnaCodeIteratorTweeStuks)
 	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaToeleveringIdEnRecent",DnaCode3.Toelevering).DanReturn(DnaCodeIteratorTweedeToelevering)
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)
+	#dim VolgNr As %Integer = 1
+	Set UGLYPickingWrapperStub = ##class(vhTest.Mock.WSimpl.Halux.AAP.DnaCodeService.UGLYPickingWrapper).%New()
+	Do UGLYPickingWrapperStub.IndienMethodCall("BuildBufferViaDnaCode",$$$ElkeWaarde,$$$ElkeWaarde,$$$ElkeWaarde).DanReturn(VolgNr)
+	Do UGLYPickingWrapperStub.IndienMethodCall("CloseAndHandleBuffer",$$$ElkeWaarde).DanDoeNiks()
 	
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,UGLYPickingWrapperStub)
+	
 	#dim Antwoord As WS.Halux.AAP.RondKaderdeurDagAfResponse = DnaCodeService.RondKaderdeurDagAf(Request)
 	
 	If $$$AssertEquals(Antwoord.ToeleveringMetAantallen.Count(),2) {
@@ -176,13 +195,6 @@
 	Do DnaCodeRepositoryMock.Verifieer()
 ]]></Implementation>
 </Method>
-
-<UDLText name="T">
-<Content><![CDATA[
-// de resultset bevat lijnen dubbel: als er een toelevering is met 4 lijnen waarvan al 2 werden ingescand, komt voor elke nog niet ingescande lijn de gegevens van die toelevering in het resultaat. 1 keer per toelevering is voldoende
-
-]]></Content>
-</UDLText>
 </Class>
 
 
Index: WSimpl/Halux/AAP/DnaCodeService/UGLYPickingWrapper.cls.xml
===================================================================
diff -u -r60549 -r60551
--- WSimpl/Halux/AAP/DnaCodeService/UGLYPickingWrapper.cls.xml	(.../UGLYPickingWrapper.cls.xml)	(revision 60549)
+++ WSimpl/Halux/AAP/DnaCodeService/UGLYPickingWrapper.cls.xml	(.../UGLYPickingWrapper.cls.xml)	(revision 60551)
@@ -4,8 +4,12 @@
 <Super>TECH.Mockable</Super>
 
 <Method name="BuildBufferViaDnaCode">
-<FormalSpec><![CDATA[Toelevering:%String,Pallet:%String,Initialen:%String,&VolgNr:%Integer]]></FormalSpec>
-<Implementation><![CDATA[	Do ##class(BL.MB.UGLYPicking.Receptie).BuildBufferViaDnaCode(Toelevering, Pallet, Initialen,.VolgNr)
+<FormalSpec>Toelevering:%String,Pallet:%String,Initialen:%String</FormalSpec>
+<ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[
+	#dim VolgNr As %String		
+	Do ##class(BL.MB.UGLYPicking.Receptie).BuildBufferViaDnaCode(Toelevering, Pallet, Initialen,.VolgNr)
+	Quit VolgNr
 ]]></Implementation>
 </Method>
 
Index: WSimpl/Halux/AAP/DnaCodeService.cls.xml
===================================================================
diff -u -r60550 -r60551
--- WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 60550)
+++ WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 60551)
@@ -44,7 +44,7 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>DnaCodeRepository:DOM.Halux.AAP.DnaCodeRepository="",PalletCodeValidator:WSimpl.Halux.AAP.DnaCodeService.PalletCodeValidator="",InventarisService:APPS.MAG.Inventaris.impl.InventarisService,DocsV1:BL.PPS.TBX.DocsV1="",ProboxEtiketAfdrukkenHelper:WSimpl.Halux.AAP.DnaCodeService.ProboxEtiketAfdrukkenHelper,UGLYPickingWrapper:WSimpl.Halux.AAP.DnaCodeService.UGLYPickingWrapper</FormalSpec>
+<FormalSpec>DnaCodeRepository:DOM.Halux.AAP.DnaCodeRepository="",PalletCodeValidator:WSimpl.Halux.AAP.DnaCodeService.PalletCodeValidator="",InventarisService:APPS.MAG.Inventaris.impl.InventarisService,DocsV1:BL.PPS.TBX.DocsV1="",ProboxEtiketAfdrukkenHelper:WSimpl.Halux.AAP.DnaCodeService.ProboxEtiketAfdrukkenHelper="",UGLYPickingWrapper:WSimpl.Halux.AAP.DnaCodeService.UGLYPickingWrapper=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -329,7 +329,7 @@
 <Private>1</Private>
 <Implementation><![CDATA[
 	#dim DnaCode As DOM.Halux.AAP.DnaCode
-	#dim VolgNr As %String		
+	#dim VolgNr As %Integer	
 
 	While DnaCodeIterator.HasNext() {
 		Set DnaCode = DnaCodeIterator.Next()
@@ -341,8 +341,8 @@
 		}
 	}	
 	If Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).InBuffer() {
-		Do ..UGLYPickingWrapper.BuildBufferViaDnaCode(Toelevering, Pallet, Initialen,.VolgNr)
-		Do ..UGLYPickingWrapper.CloseAndHandleBuffer("~tmp",VolgNr)
+		Set VolgNr = ..UGLYPickingWrapper.BuildBufferViaDnaCode(Toelevering, Pallet, Initialen)
+		Do ..UGLYPickingWrapper.CloseAndHandleBuffer(VolgNr)
 	}
 ]]></Implementation>
 </Method>
@@ -553,6 +553,7 @@
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
 		Set Response.Header.Status = Exception.GeefExceptionCode()
 		Set Response.Header.Omschrijving = Exception.GeefOmschrijving()
+		Do ##class(Tools.Wlip).%New(127).String(Exception.ToString())
 	}
 	Quit Response
 ]]></Implementation>
Index: vhTest/Mock/WSimpl/Halux/AAP/DnaCodeService/UGLYPickingWrapper.cls.xml
===================================================================
diff -u -r60549 -r60551
--- vhTest/Mock/WSimpl/Halux/AAP/DnaCodeService/UGLYPickingWrapper.cls.xml	(.../UGLYPickingWrapper.cls.xml)	(revision 60549)
+++ vhTest/Mock/WSimpl/Halux/AAP/DnaCodeService/UGLYPickingWrapper.cls.xml	(.../UGLYPickingWrapper.cls.xml)	(revision 60551)
@@ -9,8 +9,9 @@
 <Inheritance>right</Inheritance>
 
 <Method name="BuildBufferViaDnaCode">
-<FormalSpec><![CDATA[Toelevering:%String,Pallet:%String,Initialen:%String,&VolgNr:%Integer]]></FormalSpec>
-<Implementation><![CDATA[	do ..VerwerkMethodCall("BuildBufferViaDnaCode",Toelevering,Pallet,Initialen,.VolgNr)
+<FormalSpec>Toelevering:%String,Pallet:%String,Initialen:%String</FormalSpec>
+<ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("BuildBufferViaDnaCode",Toelevering,Pallet,Initialen)
 ]]></Implementation>
 </Method>