Index: vhUnitTest/BL/MB/UGLYPicking/Receptie/BuildBufferViaDnaCode/Test.cls.xml
===================================================================
diff -u -r60317 -r60318
--- vhUnitTest/BL/MB/UGLYPicking/Receptie/BuildBufferViaDnaCode/Test.cls.xml	(.../Test.cls.xml)	(revision 60317)
+++ vhUnitTest/BL/MB/UGLYPicking/Receptie/BuildBufferViaDnaCode/Test.cls.xml	(.../Test.cls.xml)	(revision 60318)
@@ -169,7 +169,6 @@
 	
 	#dim VolgNummer As %String = ""
 	Do ##class(BL.MB.UGLYPicking.Receptie).BuildBufferViaDnaCode(, ..DnaCode1.PalletCode, ..DnaCode1.InitialenScanner,.VolgNummer)
-	Do ##class(Tools.Wlip).%New(127).String(VolgNummer)
 	Do $$$AssertEquals(VolgNummer,"1")
 	Do $$$AssertContains($G(^UPRCP("B","~tmp",VolgNummer,1)),"K.ABCD.6\00KABCD6\10k12T01")
 ]]></Implementation>
Index: BL/MB/UGLYPicking/Receptie.cls.xml
===================================================================
diff -u -r60302 -r60318
--- BL/MB/UGLYPicking/Receptie.cls.xml	(.../Receptie.cls.xml)	(revision 60302)
+++ BL/MB/UGLYPicking/Receptie.cls.xml	(.../Receptie.cls.xml)	(revision 60318)
@@ -2082,6 +2082,8 @@
 			} else {
 				Set Status = ..AddToBuffer(RGID,VolgNr,DnaCode.ProductNummer,DnaCode.LadeCode,DnaCode.Locatie,DnaCode.PalletCode,Initialen,,,,,)
 			}
+			Set DnaCode.Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).InBuffer()
+			Do ##class(DOM.Halux.AAP.DnaCodeRepository).%New().Bewaar(DnaCode)
 		}
 	}  
 	;Buffer verwijderen indien geen lijnen aangemaakt (leeg)
Index: vhTest/Fake/DOM/Halux/AAP/DnaCodeRepository.cls.xml
===================================================================
diff -u -r60298 -r60318
--- vhTest/Fake/DOM/Halux/AAP/DnaCodeRepository.cls.xml	(.../DnaCodeRepository.cls.xml)	(revision 60298)
+++ vhTest/Fake/DOM/Halux/AAP/DnaCodeRepository.cls.xml	(.../DnaCodeRepository.cls.xml)	(revision 60318)
@@ -46,6 +46,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ZoekViaPalletCodeEnNotStatus">
+<FormalSpec>PalletCode:%String,Status:DOM.Halux.AAP.enu.DnaCodeStatus</FormalSpec>
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
 <Method name="ZoekViaPalletCodeEnRecent">
 <FormalSpec>PalletCode:%String</FormalSpec>
 <ReturnType>TECH.Iterator</ReturnType>
Index: vhTest/Mock/DOM/Halux/AAP/DnaCodeRepository.cls.xml
===================================================================
diff -u -r60298 -r60318
--- vhTest/Mock/DOM/Halux/AAP/DnaCodeRepository.cls.xml	(.../DnaCodeRepository.cls.xml)	(revision 60298)
+++ vhTest/Mock/DOM/Halux/AAP/DnaCodeRepository.cls.xml	(.../DnaCodeRepository.cls.xml)	(revision 60318)
@@ -113,17 +113,17 @@
 ]]></Implementation>
 </Method>
 
-<Method name="ZoekViaPalletCodeEnRecent">
-<FormalSpec>PalletCode:%String</FormalSpec>
+<Method name="ZoekViaPalletCodeEnNotStatus">
+<FormalSpec>PalletCode:%String,Status:DOM.Halux.AAP.enu.DnaCodeStatus</FormalSpec>
 <ReturnType>TECH.Iterator</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("ZoekViaPalletCodeEnRecent",PalletCode)
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("ZoekViaPalletCodeEnNotStatus",PalletCode,Status)
 ]]></Implementation>
 </Method>
 
-<Method name="ZoekViaPalletCodeEnStatus">
-<FormalSpec>PalletCode:%String,Status:DOM.Halux.AAP.enu.DnaCodeStatus</FormalSpec>
+<Method name="ZoekViaPalletCodeEnRecent">
+<FormalSpec>PalletCode:%String</FormalSpec>
 <ReturnType>TECH.Iterator</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("ZoekViaPalletCodeEnStatus",PalletCode,Status)
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("ZoekViaPalletCodeEnRecent",PalletCode)
 ]]></Implementation>
 </Method>
 
Index: DOM/Halux/AAP/DnaCodeRepository.cls.xml
===================================================================
diff -u -r60298 -r60318
--- DOM/Halux/AAP/DnaCodeRepository.cls.xml	(.../DnaCodeRepository.cls.xml)	(revision 60298)
+++ DOM/Halux/AAP/DnaCodeRepository.cls.xml	(.../DnaCodeRepository.cls.xml)	(revision 60318)
@@ -22,10 +22,10 @@
 ]]></Implementation>
 </Method>
 
-<Method name="ZoekViaPalletCodeEnStatus">
+<Method name="ZoekViaPalletCodeEnNotStatus">
 <FormalSpec>PalletCode:%String,Status:DOM.Halux.AAP.enu.DnaCodeStatus</FormalSpec>
 <ReturnType>TECH.Iterator</ReturnType>
-<Implementation><![CDATA[	Quit ..ZoekViaFilter("PalletCode = ? and Status = ?", $LB(PalletCode, Status))
+<Implementation><![CDATA[	Quit ..ZoekViaFilter("PalletCode = ? and not Status = ?", $LB(PalletCode, Status))
 ]]></Implementation>
 </Method>
 
Index: WSimpl/Halux/AAP/DnaCodeService.cls.xml
===================================================================
diff -u -r60256 -r60318
--- WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 60256)
+++ WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 60318)
@@ -293,13 +293,13 @@
 	Set Response = ##class(WS.Halux.AAP.PalletBijwerkenResponse).%New()
 	Try {
 		#dim DnaCodeIterator As TECH.Iterator
-		Set DnaCodeIterator = ..DnaCodeRepository.ZoekViaPalletCode(PalletBijwerkenRequest.Pallet)
+		Set DnaCodeIterator = ..DnaCodeRepository.ZoekViaPalletCodeEnNotStatus(PalletBijwerkenRequest.Pallet,##class(DOM.Halux.AAP.enu.DnaCodeStatus).InBuffer())
 		While DnaCodeIterator.HasNext() {
 			Set DnaCode = DnaCodeIterator.Next()
 			Set DnaCode.IsDirecteLevering = PalletBijwerkenRequest.IsDirecteLevering
 			Do ..DnaCodeRepository.Bewaar(DnaCode)
 		}
-		Set DnaCodeIterator = ..DnaCodeRepository.ZoekViaPalletCode(PalletBijwerkenRequest.Pallet)
+		Set DnaCodeIterator = ..DnaCodeRepository.ZoekViaPalletCodeEnNotStatus(PalletBijwerkenRequest.Pallet,##class(DOM.Halux.AAP.enu.DnaCodeStatus).InBuffer())
 		If DnaCodeIterator.HasNext() {
 			Set Response.Header.Status = "200"
 			Do ..DnaCodesKlaarmakenVoorBuffer(DnaCodeIterator, PalletBijwerkenRequest.Status, , PalletBijwerkenRequest.Pallet, PalletBijwerkenRequest.Header.Initialen)
@@ -309,6 +309,7 @@
 		}
 	} Catch {
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+		
 		Set Response.Header.Status = Exception.GeefExceptionCode()
 		Set Response.Header.Omschrijving = Exception.GeefOmschrijving()
 		Do ##class(vhLib.Logger).%New().Warning("AAP",Exception.GeefOmschrijving())
@@ -326,26 +327,16 @@
 
 	While DnaCodeIterator.HasNext() {
 		Set DnaCode = DnaCodeIterator.Next()
-		
 		If Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).OnHold() {
 			If DnaCode.Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).Gescand() {
 				Set DnaCode.Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).OnHold()
 				Do ..DnaCodeRepository.Bewaar(DnaCode)
 			}
 		}
-		
-		If Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).InBuffer() {
-			Do ##class(BL.MB.UGLYPicking.Receptie).BuildBufferViaDnaCode(Toelevering, Pallet, Initialen,.VolgNr)
-			
-			If ((DnaCode.Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).Gescand()) || (DnaCode.Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).OnHold())) {
-				Set DnaCode.Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).InBuffer()
-				Set DnaCode.Locatie = ##class(APPS.MAG.enu.MagazijnTransitLocatie).Halux2Transit()
-				Do ..DnaCodeRepository.Bewaar(DnaCode)
-			}
-			
-			//Do ##class(BL.MB.UGLYPicking.Receptie).CloseAndHandleBuffer("~tmp",VolgNr)
-		}
-		
+	}	
+	If Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).InBuffer() {
+		Do ##class(BL.MB.UGLYPicking.Receptie).BuildBufferViaDnaCode(Toelevering, Pallet, Initialen,.VolgNr)
+		Do ##class(BL.MB.UGLYPicking.Receptie).CloseAndHandleBuffer("~tmp",VolgNr)
 	}
 ]]></Implementation>
 </Method>
Index: vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/PalletBijwerken/Test.cls.xml
===================================================================
diff -u -r60024 -r60318
--- vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/PalletBijwerken/Test.cls.xml	(.../Test.cls.xml)	(revision 60024)
+++ vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/PalletBijwerken/Test.cls.xml	(.../Test.cls.xml)	(revision 60318)
@@ -19,7 +19,7 @@
 	
 	#dim DnaCodeIteratorTweeStuks As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1, DnaCode2)
 	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
-	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaPalletCode",Request.Pallet).DanReturn(DnaCodeIteratorTweeStuks)
+	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaPalletCodeEnNotStatus",Request.Pallet,##class(DOM.Halux.AAP.enu.DnaCodeStatus).InBuffer()).DanReturn(DnaCodeIteratorTweeStuks)
 	Do DnaCodeRepositoryMock.VerwachtMethodCall("Bewaar",DnaCode1).ExactAantalKeer(2)
 	Do DnaCodeRepositoryMock.VerwachtMethodCall("Bewaar",DnaCode2).ExactAantalKeer(1)
 	
@@ -39,7 +39,7 @@
 	Set Request.Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).OnHold()
 	
 	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
-	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaPalletCode",Request.Pallet).DanReturn(..EmptyIterator())
+	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaPalletCodeEnNotStatus",Request.Pallet,##class(DOM.Halux.AAP.enu.DnaCodeStatus).InBuffer()).DanReturn(..EmptyIterator())
 	Do DnaCodeRepositoryMock.VerwachtMethodCall("Bewaar",$$$ElkeWaarde).ExactAantalKeer(0)
 	
 	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)