Index: vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/RondAfKaderdeurDag/Test.cls.xml
===================================================================
diff -u -r60553 -r60593
--- vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/RondAfKaderdeurDag/Test.cls.xml	(.../Test.cls.xml)	(revision 60553)
+++ vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/RondAfKaderdeurDag/Test.cls.xml	(.../Test.cls.xml)	(revision 60593)
@@ -29,8 +29,8 @@
 	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaToeleveringIdEnRecent",DnaCode1.Toelevering).DanReturn(DnaCodeIteratorTweeStuks)
 	
 	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()
+	Do UGLYPickingWrapperStub.IndienMethodCall("BuildBufferViaDnaCode",$$$ElkeWaarde,$$$ElkeWaarde,$$$ElkeWaarde,$$$ElkeWaarde).DanDoeNiks()
+	Do UGLYPickingWrapperStub.IndienMethodCall("CloseAndHandleBuffer",$$$ElkeWaarde,$$$ElkeWaarde).DanDoeNiks()
 	
 	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,UGLYPickingWrapperStub)
 	
@@ -68,8 +68,8 @@
 	
 	
 	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()
+	Do UGLYPickingWrapperStub.IndienMethodCall("BuildBufferViaDnaCode",$$$ElkeWaarde,$$$ElkeWaarde,$$$ElkeWaarde,$$$ElkeWaarde).DanDoeNiks()
+	Do UGLYPickingWrapperStub.IndienMethodCall("CloseAndHandleBuffer",$$$ElkeWaarde,$$$ElkeWaarde).DanDoeNiks()
 	
 	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,UGLYPickingWrapperStub)
 	
@@ -177,8 +177,8 @@
 	
 	#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()
+	Do UGLYPickingWrapperStub.IndienMethodCall("BuildBufferViaDnaCode",$$$ElkeWaarde,$$$ElkeWaarde,$$$ElkeWaarde,$$$ElkeWaarde).DanReturn(VolgNr)
+	Do UGLYPickingWrapperStub.IndienMethodCall("CloseAndHandleBuffer",$$$ElkeWaarde,$$$ElkeWaarde).DanDoeNiks()
 	
 	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,UGLYPickingWrapperStub)
 	
Index: WSimpl/Halux/AAP/DnaCodeService.cls.xml
===================================================================
diff -u -r60553 -r60593
--- WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 60553)
+++ WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 60593)
@@ -328,7 +328,7 @@
 <FormalSpec>DnaCodeIterator:TECH.Iterator,Status:DOM.Halux.AAP.enu.DnaCodeStatus,Toelevering:%String="",Pallet:%String="",Initialen:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	#dim DnaCode As DOM.Halux.AAP.DnaCode
+	#dim DnaCode As DOM.Halux.AAP.DnaCode = ""
 	#dim VolgNr As %Integer	
 
 	While DnaCodeIterator.HasNext() {
@@ -339,14 +339,26 @@
 				Do ..DnaCodeRepository.Bewaar(DnaCode)
 			}
 		}
-	}	
-	If Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).InBuffer() {
-		Set VolgNr = ..UGLYPickingWrapper.BuildBufferViaDnaCode(Toelevering, Pallet, Initialen)
-		Do ..UGLYPickingWrapper.CloseAndHandleBuffer(VolgNr)
 	}
+	If $isObject(DnaCode) {	
+		If Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).InBuffer() {
+			#dim RGID = ..BepaalRGIDviaDnaCode(DnaCode)
+			Set VolgNr = ..UGLYPickingWrapper.BuildBufferViaDnaCode(Toelevering, Pallet, Initialen, RGID)
+			Do ..UGLYPickingWrapper.CloseAndHandleBuffer(VolgNr, RGID)
+		}
+	}
 ]]></Implementation>
 </Method>
 
+<Method name="BepaalRGIDviaDnaCode">
+<FormalSpec>DnaCode:DOM.Halux.AAP.DnaCode</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	If DnaCode.DnaCode
+	Quit ""
+]]></Implementation>
+</Method>
+
 <Method name="HernoemPallet">
 <FormalSpec>HernoemPalletRequest:WS.Halux.AAP.HernoemPalletRequest</FormalSpec>
 <ReturnType>WS.Halux.AAP.HernoemPalletResponse</ReturnType>