Index: BL/MB/UGLYPicking/Receptie.cls.xml
===================================================================
diff -u -r56471 -r56494
--- BL/MB/UGLYPicking/Receptie.cls.xml	(.../Receptie.cls.xml)	(revision 56471)
+++ BL/MB/UGLYPicking/Receptie.cls.xml	(.../Receptie.cls.xml)	(revision 56494)
@@ -2066,7 +2066,11 @@
 	New RGID, DnaCode, DnaCodeIterator, Status 
 	#dim RGID As %String = ..#TempBufferRGID
 	Set VolgNr = ..CreateNewBuffer(RGID,Initialen)
-	#dim DnaCodeIterator = ##class(DOM.Halux.AAP.DnaCodeRepository).%New().ZoekViaToeleveringId(ToeleveringId)
+	If $$$HasLength(ToeleveringId) {
+		Set DnaCodeIterator = ##class(DOM.Halux.AAP.DnaCodeRepository).%New().ZoekViaToeleveringId(ToeleveringId)
+	} ElseIf $$$HasLength(PalletId) {
+		Set DnaCodeIterator = ##class(DOM.Halux.AAP.DnaCodeRepository).%New().ZoekViaPalletCode(PalletId)
+	}
 	#dim DnaCode As DOM.Halux.AAP.DnaCode
 	While DnaCodeIterator.HasNext() {
 		Set DnaCode = DnaCodeIterator.Next()
Index: vhUnitTest/BL/MB/UGLYPicking/Receptie/BuildBufferViaDnaCode/Test.cls.xml
===================================================================
diff -u -r56471 -r56494
--- vhUnitTest/BL/MB/UGLYPicking/Receptie/BuildBufferViaDnaCode/Test.cls.xml	(.../Test.cls.xml)	(revision 56471)
+++ vhUnitTest/BL/MB/UGLYPicking/Receptie/BuildBufferViaDnaCode/Test.cls.xml	(.../Test.cls.xml)	(revision 56494)
@@ -37,6 +37,8 @@
 	Kill ^KTO1(271044)
 	Kill ^KTO(6332,271044,103)
 	Kill ^KTO(6332,271044,104)
+	
+	Do ##class(DOM.Halux.AAP.DnaCodeRepository).%New().VerwijderDnaCodeVoorToeleveringId(271044)
 	Do ##super(aTestName)
 ]]></Implementation>
 </Method>
@@ -172,6 +174,25 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Pallet met 1 DnaCode voor 1 product naar Buffer">
+<Implementation><![CDATA[
+	Set ..DnaCode1 = ..MaakStandaardDnaCode()
+	Do ##class(DOM.Halux.AAP.DnaCodeRepository).%New().Bewaar(..DnaCode1)
+	
+	#dim VolgNummer As %String = ""
+	Do ##class(BL.MB.UGLYPicking.Receptie).BuildBufferViaDnaCode(, ..DnaCode1.PalletCode, ..DnaCode1.InitialenScanner,.VolgNummer)
+	
+	Do $$$AssertEquals(VolgNummer,"1")
+	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer),"\",3),..DnaCode1.InitialenScanner)
+	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,1),"\",1),..DnaCode1.ProductNummer)
+	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,1),"\",2),..DnaCode1.LadeCode)
+	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,1),"\",3),..DnaCode1.PalletCode)
+	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,1),"\",4),..DnaCode1.Locatie)
+	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,1),"\",5),1)
+	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,1),"\",7),..DnaCode1.InitialenScanner)
+]]></Implementation>
+</Method>
+
 <Method name="MaakStandaardDnaCode">
 <Implementation><![CDATA[
 	Set DnaCode = ##class(DOM.Halux.AAP.DnaCode).%New()