Index: vhUnitTest/BL/MB/UGLYPicking/Receptie/BuildBufferViaDnaCode/Test.cls.xml
===================================================================
diff -u -r55841 -r55842
--- vhUnitTest/BL/MB/UGLYPicking/Receptie/BuildBufferViaDnaCode/Test.cls.xml	(.../Test.cls.xml)	(revision 55841)
+++ vhUnitTest/BL/MB/UGLYPicking/Receptie/BuildBufferViaDnaCode/Test.cls.xml	(.../Test.cls.xml)	(revision 55842)
@@ -3,82 +3,112 @@
 <Class name="vhUnitTest.BL.MB.UGLYPicking.Receptie.BuildBufferViaDnaCode.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Property name="DnaCode">
+<Property name="DnaCode1">
 <Type>DOM.Halux.AAP.DnaCode</Type>
 <Private>1</Private>
 </Property>
 
+<Property name="DnaCode2">
+<Type>DOM.Halux.AAP.DnaCode</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="OnBeforeOneTest">
 <FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
 	Do ##super()
-	Set ..DnaCode = ##class(DOM.Halux.AAP.DnaCode).%New()
+	Set ..DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
+	Set ..DnaCode2 = ##class(DOM.Halux.AAP.DnaCode).%New()
 ]]></Implementation>
 </Method>
 
 <Method name="OnAfterOneTest">
 <FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
 	Kill ^UPRCP("B","~tmp")
-	Do ##class(DOM.Halux.AAP.DnaCodeRepository).%New().VerwijderViaObject(..DnaCode)
+	If ##class(DOM.Halux.AAP.DnaCodeRepository).%New().BestaatViaID(..DnaCode1.GeefID()) {
+		Do ##class(DOM.Halux.AAP.DnaCodeRepository).%New().VerwijderViaObject(..DnaCode1)
+	}
+	If ##class(DOM.Halux.AAP.DnaCodeRepository).%New().BestaatViaID(..DnaCode2.GeefID()) {
+		Do ##class(DOM.Halux.AAP.DnaCodeRepository).%New().VerwijderViaObject(..DnaCode2)
+	}
 	Do ##super(aTestName)
 ]]></Implementation>
 </Method>
 
-<Method name="Test: 1 DnaCode naar Buffer">
+<Method name="Test: Toelevering met 1 DnaCode voor 1 product naar Buffer">
 <Implementation><![CDATA[
-	Do ..MaakStandaardDnaCode()
+	Set ..DnaCode1 = ..MaakStandaardDnaCode()
+	Do ##class(DOM.Halux.AAP.DnaCodeRepository).%New().Bewaar(..DnaCode1)
 		
-	//Set ^TO("IP",1304468,271044,300) = "103"
-	//Set ^KTO(6332,271044,0)	= 	107
-	//Set ^KTO(6332,271044,1)	= 	"\19.02.19\KOMM. SEBO KINTEQUE\\\6332\140886\11171\\\\\\\\\\EUR\65085,61200\\\2\\\\\"
-	//Set ^KTO(6332,271044,3)	= 	""
-	//Set ^KTO(6332,271044,4)	= 	7
-	//Set ^KTO(6332,271044,103)	= 	"\1304468\1\\\26.6\#\\79.800000\79.800000\\L\3\\300\79.800000\KTRPL\\\\E\EUR\\\19/10\\140886\103\\\\\\\\\\\\\\\\\\\\\\\\\\\016278083\000419257\9.963.666.8"
-	
 	#dim VolgNummer As %String = ""
-	Do ##class(BL.MB.UGLYPicking.Receptie).BuildBufferViaDnaCode(..DnaCode.Toelevering,..DnaCode.InitialenScanner,.VolgNummer)
+	Do ##class(BL.MB.UGLYPicking.Receptie).BuildBufferViaDnaCode(..DnaCode1.Toelevering,..DnaCode1.InitialenScanner,.VolgNummer)
 	
 	Do $$$AssertEquals(VolgNummer,"1")
-	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer),"\",3),..DnaCode.InitialenScanner)
-	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,1),"\",1),..DnaCode.ProductNummer)
-	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,1),"\",2),..DnaCode.LadeCode)
-	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,1),"\",3),..DnaCode.PalletCode)
-	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,1),"\",4),..DnaCode.Locatie)
+	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),..DnaCode.InitialenScanner)
+	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,1),"\",7),..DnaCode1.InitialenScanner)
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Toelevering met 2 DnaCode voor 1 product naar Buffer -&gt; aantal=2">
+<Implementation><![CDATA[
+	Set ..DnaCode1 = ..MaakStandaardDnaCode()
+	Set ..DnaCode2.DnaCode = "LAAAAAA0"
+	Set ..DnaCode2 = ..MaakStandaardDnaCode()
+	Set ..DnaCode2.DnaCode = "LAAAAAB7"
+	Do ##class(DOM.Halux.AAP.DnaCodeRepository).%New().Bewaar(..DnaCode1)
+	Do ##class(DOM.Halux.AAP.DnaCodeRepository).%New().Bewaar(..DnaCode2)
+		
+	#dim VolgNummer As %String = ""
+	Do ##class(BL.MB.UGLYPicking.Receptie).BuildBufferViaDnaCode(..DnaCode1.Toelevering,..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),2)
+	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,1),"\",7),..DnaCode1.InitialenScanner)
+]]></Implementation>
+</Method>
+
 <Method name="Test: Niets toegevoegd aan buffer: weer verwijderen">
 <Implementation><![CDATA[
-	Do ..MaakStandaardDnaCode()
+	Set ..DnaCode1 = ..MaakStandaardDnaCode()
+	Do ##class(DOM.Halux.AAP.DnaCodeRepository).%New().Bewaar(..DnaCode1)
 	
 	#dim VolgNummer As %String = ""
-	Do ##class(BL.MB.UGLYPicking.Receptie).BuildBufferViaDnaCode($$$DummyString,..DnaCode.InitialenScanner,.VolgNummer)
+	Do ##class(BL.MB.UGLYPicking.Receptie).BuildBufferViaDnaCode($$$DummyString,..DnaCode1.InitialenScanner,.VolgNummer)
 	
 	Do $$$AssertFalse($Data(^UPRCP("B","~tmp",VolgNummer)))
 ]]></Implementation>
 </Method>
 
 <Method name="MaakStandaardDnaCode">
 <Implementation><![CDATA[
-	Set ..DnaCode.AxProductieOrderNummer = ""
-	Set ..DnaCode.DnaCode = "LAAAAAA0"
-	Set ..DnaCode.InitialenScanner = "TVE"
-	Set ..DnaCode.IsGlsDirect = $$$False
-	Set ..DnaCode.KlantNummer = "1000"
-	Set ..DnaCode.LadeCode = "L.ABCD.6"
-	Set ..DnaCode.Lijn = "L1"
-	Set ..DnaCode.Locatie = "04020101"
-	Set ..DnaCode.PalletCode = "TBX12345"
-	Set ..DnaCode.ParentDnaCode = ""
-	Set ..DnaCode.ProductNummer = "1304468"
-	Set ..DnaCode.ScanTijdstip = $H
-	Set ..DnaCode.SequentieNummer = ""
-	Set ..DnaCode.Status = "Gescand"
-	Set ..DnaCode.Toelevering = "271044"
-	Do ##class(DOM.Halux.AAP.DnaCodeRepository).%New().Bewaar(..DnaCode)
+	Set DnaCode = ##class(DOM.Halux.AAP.DnaCode).%New()
+	Set DnaCode.AxProductieOrderNummer = ""
+	Set DnaCode.DnaCode = "LAAAAAA0"
+	Set DnaCode.InitialenScanner = "TVE"
+	Set DnaCode.IsGlsDirect = $$$False
+	Set DnaCode.KlantNummer = "1000"
+	Set DnaCode.LadeCode = "L.ABCD.6"
+	Set DnaCode.Lijn = "L1"
+	Set DnaCode.Locatie = "04020101"
+	Set DnaCode.PalletCode = "TBX12345"
+	Set DnaCode.ParentDnaCode = ""
+	Set DnaCode.ProductNummer = "1304468"
+	Set DnaCode.ScanTijdstip = $H
+	Set DnaCode.SequentieNummer = ""
+	Set DnaCode.Status = "Gescand"
+	Set DnaCode.Toelevering = "271044"
+	Quit DnaCode
 ]]></Implementation>
 </Method>
 </Class>
Index: BL/MB/UGLYPicking/Receptie.cls.xml
===================================================================
diff -u -r55841 -r55842
--- BL/MB/UGLYPicking/Receptie.cls.xml	(.../Receptie.cls.xml)	(revision 55841)
+++ BL/MB/UGLYPicking/Receptie.cls.xml	(.../Receptie.cls.xml)	(revision 55842)
@@ -2070,7 +2070,6 @@
 	#dim DnaCode As DOM.Halux.AAP.DnaCode
 	While DnaCodeIterator.HasNext() {
 		Set DnaCode = DnaCodeIterator.Next()
-		w !,"adding..."_RGID_","_VolgNr_","_DnaCode.ProductNummer_","_DnaCode.LadeCode_","_DnaCode.Locatie_","_DnaCode.PalletCode_","_Initialen
 		Set Status = ..AddToBuffer(RGID,VolgNr,DnaCode.ProductNummer,DnaCode.LadeCode,DnaCode.Locatie,DnaCode.PalletCode,Initialen,,,,,)
 	}  
 	;Buffer verwijderen indien geen lijnen aangemaakt (leeg)