Index: vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeAfmelden/Test.cls.xml
===================================================================
diff -u -r63858 -r74600
--- vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeAfmelden/Test.cls.xml	(.../Test.cls.xml)	(revision 63858)
+++ vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeAfmelden/Test.cls.xml	(.../Test.cls.xml)	(revision 74600)
@@ -10,27 +10,34 @@
 	
 	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode1.Toelevering = "222222"
+	Set DnaCode1.Lijn = 1
 	Set DnaCode2 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode2.Toelevering = "222222"
 	Set DnaCode2.InitialenScanner = "XXX"
+	Set DnaCode2.Lijn = 1
 	#dim DnaCodeIteratorEenStuk As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1)
 	#dim DnaCodeIteratorTweeStuks As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1, DnaCode2)
 	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
 	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaDnaCodeEnRecent",Request.DnaCode).DanReturn(DnaCodeIteratorEenStuk)
 	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaToeleveringIdEnRecent",DnaCode1.Toelevering).DanReturn(DnaCodeIteratorTweeStuks)
 	Do DnaCodeRepositoryMock.VerwachtMethodCall("Bewaar",DnaCode1).ExactAantalKeer(1)
 	
+	Set ProductTypeApiMock = ##class(vhTest.Mock.DOM.PM.impl.ProductTypeAPIimpl).%New()
+	Do ProductTypeApiMock.IndienMethodCall("IsLegraboxProduct", $$$ElkeWaarde).DanReturn($$$True)
+	
 	Set ToeleveringServiceMock = ##class(vhTest.Mock.DOM.AKP.ToeleveringService).%New()
 	Do ToeleveringServiceMock.VerwachtMethodCall("HeeftToeleveringMinstensEenSpaceStep",DnaCode1.Toelevering).DanDoeNiks()
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock)
+	Set DocumentGeneratorMock = ##class(vhTest.Mock.APPS.Halux.Afmelden.impl.DocumentLadeGerecepteerdNaarObjective).%New()
+	Do DocumentGeneratorMock.IndienMethodCall("GenereerDocumentVoorObjective",DnaCode1.DnaCode).DanDoeNiks()
 	
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock,,ProductTypeApiMock)
+	
 	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
 	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),2)
 	Do $$$AssertEquals(Antwoord.AantalInToelevering,"2")
-	Do $$$AssertEquals(Antwoord.AantalReedsGescand,"1")
 	Do $$$AssertEquals(Antwoord.DnaCodes.GetAt(1).Locatie,##class(APPS.MAG.enu.MagazijnTransitLocatie).Halux2Transit())
 	Do DnaCodeRepositoryMock.Verifieer()
 	Do ToeleveringServiceMock.Verifieer()
@@ -53,7 +60,6 @@
 	Do $$$AssertEquals(Antwoord.Header.Status,##class(TECH.enu.ExceptionCode).DataNotFound())
 	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),0)
 	Do $$$AssertEquals(Antwoord.AantalInToelevering,"0")
-	Do $$$AssertEquals(Antwoord.AantalReedsGescand,"0")
 	Do DnaCodeRepositoryMock.Verifieer()
 ]]></Implementation>
 </Method>
@@ -65,9 +71,11 @@
 	
 	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode1.Toelevering = "222222"
+	Set DnaCode1.Lijn = 1
 	Set DnaCode2 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode2.Toelevering = "222222"
 	Set DnaCode2.InitialenScanner = "XXX"
+	Set DnaCode2.Lijn = 1
 	#dim DnaCodeIteratorEenStuk As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1)
 	#dim DnaCodeIteratorTweeStuks As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1, DnaCode2)
 	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
@@ -78,15 +86,20 @@
 	Set ToeleveringServiceMock = ##class(vhTest.Mock.DOM.AKP.ToeleveringService).%New()
 	Do ToeleveringServiceMock.VerwachtMethodCall("HeeftToeleveringMinstensEenSpaceStep", DnaCode2.Toelevering).DanDoeNiks()
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock)
+	Set ProductTypeApiMock = ##class(vhTest.Mock.DOM.PM.impl.ProductTypeAPIimpl).%New()
+	Do ProductTypeApiMock.IndienMethodCall("IsLegraboxProduct", $$$ElkeWaarde).DanReturn($$$True)
 	
+	Set DocumentGeneratorMock = ##class(vhTest.Mock.APPS.Halux.Afmelden.impl.DocumentLadeGerecepteerdNaarObjective).%New()
+	Do DocumentGeneratorMock.IndienMethodCall("GenereerDocumentVoorObjective", DnaCode1.DnaCode).DanDoeNiks()
+	
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock,,ProductTypeApiMock)
+	
 	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"-1021")
 	Do $$$AssertEquals(Antwoord.Header.Omschrijving,"Geen data gevonden voor toelevering '222222'")
 	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),0)
 	Do $$$AssertEquals(Antwoord.AantalInToelevering,"0")
-	Do $$$AssertEquals(Antwoord.AantalReedsGescand,"0")
 	Do DnaCodeRepositoryMock.Verifieer()
 	Do ToeleveringServiceMock.Verifieer()
 ]]></Implementation>
@@ -117,7 +130,6 @@
 	Do $$$AssertEquals(Antwoord.Header.Omschrijving,"Foutmelding")
 	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),0)
 	Do $$$AssertEquals(Antwoord.AantalInToelevering,"0")
-	Do $$$AssertEquals(Antwoord.AantalReedsGescand,"0")
 	Do $$$AssertEquals(Antwoord.IsSST,$$$False)
 	Do DnaCodeRepositoryMock.Verifieer()
 ]]></Implementation>
@@ -143,7 +155,6 @@
 	Do $$$AssertEquals(Antwoord.Header.Status,##class(TECH.enu.ExceptionCode).InvalidInput())
 	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),0)
 	Do $$$AssertEquals(Antwoord.AantalInToelevering,"0")
-	Do $$$AssertEquals(Antwoord.AantalReedsGescand,"0")
 	Do DnaCodeRepositoryMock.Verifieer()
 ]]></Implementation>
 </Method>
@@ -158,6 +169,7 @@
 	
 	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode1.Toelevering = "222222"
+	Set DnaCode1.Lijn = 1
 	#dim DnaCodeIteratorEenStuk As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1)
 	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
 	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaDnaCodeEnRecent",Request.DnaCode).DanReturn(DnaCodeIteratorEenStuk)
@@ -169,14 +181,19 @@
 	Set ToeleveringServiceMock = ##class(vhTest.Mock.DOM.AKP.ToeleveringService).%New()
 	Do ToeleveringServiceMock.VerwachtMethodCall("HeeftToeleveringMinstensEenSpaceStep",DnaCode1.Toelevering).DanDoeNiks()
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,, DnaCodeInVhossKastBepalerStub,,, ToeleveringServiceMock)
+	Set DocumentGeneratorMock = ##class(vhTest.Mock.APPS.Halux.Afmelden.impl.DocumentLadeGerecepteerdNaarObjective).%New()
+	Do DocumentGeneratorMock.IndienMethodCall("GenereerDocumentVoorObjective", DnaCode1.DnaCode).DanDoeNiks()
 	
+	Set ProductTypeApiMock = ##class(vhTest.Mock.DOM.PM.impl.ProductTypeAPIimpl).%New()
+	Do ProductTypeApiMock.IndienMethodCall("IsLegraboxProduct", $$$ElkeWaarde).DanReturn($$$True)
+	
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,, DnaCodeInVhossKastBepalerStub,,, ToeleveringServiceMock, DocumentGeneratorMock,,ProductTypeApiMock)
+	
 	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
 	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),0)
 	Do $$$AssertEquals(Antwoord.AantalInToelevering,"0")
-	Do $$$AssertEquals(Antwoord.AantalReedsGescand,"0")
 	Do DnaCodeRepositoryMock.Verifieer()
 	Do ToeleveringServiceMock.Verifieer()
 ]]></Implementation>
@@ -208,7 +225,6 @@
 	Do $$$AssertEquals(Antwoord.Header.Omschrijving,"De lade moet in een andere Vhosskast")
 	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),0)
 	Do $$$AssertEquals(Antwoord.AantalInToelevering,"0")
-	Do $$$AssertEquals(Antwoord.AantalReedsGescand,"0")
 	Do DnaCodeRepositoryMock.Verifieer()
 ]]></Implementation>
 </Method>
@@ -239,7 +255,6 @@
 	Do $$$AssertEquals(Antwoord.Header.Omschrijving,"De lade moet aan de andere kant van de Vhosskast")
 	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),0)
 	Do $$$AssertEquals(Antwoord.AantalInToelevering,"0")
-	Do $$$AssertEquals(Antwoord.AantalReedsGescand,"0")
 	Do DnaCodeRepositoryMock.Verifieer()
 ]]></Implementation>
 </Method>
@@ -252,8 +267,10 @@
 	
 	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode1.Toelevering = "222222"
+	Set DnaCode1.Lijn = 1
 	Set DnaCode2 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode2.Toelevering = "222222"
+	Set DnaCode2.Lijn = 1
 	#dim DnaCodeIteratorEenStuk As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1)
 	#dim DnaCodeIteratorTweeStuks As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1, DnaCode2)
 	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
@@ -264,14 +281,19 @@
 	Set ToeleveringServiceMock = ##class(vhTest.Mock.DOM.AKP.ToeleveringService).%New()
 	Do ToeleveringServiceMock.VerwachtMethodCall("HeeftToeleveringMinstensEenSpaceStep", DnaCode2.Toelevering).DanDoeNiks()
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock)
+	Set DocumentGeneratorMock = ##class(vhTest.Mock.APPS.Halux.Afmelden.impl.DocumentLadeGerecepteerdNaarObjective).%New()
+	Do DocumentGeneratorMock.IndienMethodCall("GenereerDocumentVoorObjective",DnaCode1.DnaCode).DanDoeNiks()
 	
+	Set ProductTypeApiMock = ##class(vhTest.Mock.DOM.PM.impl.ProductTypeAPIimpl).%New()
+	Do ProductTypeApiMock.IndienMethodCall("IsLegraboxProduct", $$$ElkeWaarde).DanReturn($$$True)
+	
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock,,ProductTypeApiMock)
+	
 	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
 	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),2)
 	Do $$$AssertEquals(Antwoord.AantalInToelevering,"2")
-	Do $$$AssertEquals(Antwoord.AantalReedsGescand,"0")
 	Do DnaCodeRepositoryMock.Verifieer()
 	Do ToeleveringServiceMock.Verifieer()
 ]]></Implementation>
@@ -298,7 +320,6 @@
 	Do $$$AssertEquals(Antwoord.Header.Omschrijving,"Palletcode reeds ingevuld voor '"_Request.DnaCode_"' (TBX12345)")
 	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),0)
 	Do $$$AssertEquals(Antwoord.AantalInToelevering,"0")
-	Do $$$AssertEquals(Antwoord.AantalReedsGescand,"0")
 	Do DnaCodeRepositoryMock.Verifieer()
 ]]></Implementation>
 </Method>
@@ -327,7 +348,6 @@
 	Do $$$AssertEquals(Antwoord.Header.Omschrijving,"Reeds afgesloten. Gebruik 'Hernoem Pallet'")
 	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),0)
 	Do $$$AssertEquals(Antwoord.AantalInToelevering,"0")
-	Do $$$AssertEquals(Antwoord.AantalReedsGescand,"0")
 	Do DnaCodeRepositoryMock.Verifieer()
 ]]></Implementation>
 </Method>
@@ -344,16 +364,19 @@
 	Set DnaCode1.DnaCode = "DnaCode"
 	Set DnaCode1.PalletCode = "TBX12345"
 	Set DnaCode1.InitialenScanner = "XXX"
+	Set DnaCode1.Lijn = 1
 	
 	Set DnaCode2 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode2.Toelevering = "222222"
 	Set DnaCode2.InitialenScanner = "XXX"
+	Set DnaCode1.Lijn = 1
 	
 	Set AfgemeldeDnaCode = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set AfgemeldeDnaCode.Toelevering = "222222"
 	Set AfgemeldeDnaCode.DnaCode = "DnaCode"
 	Set AfgemeldeDnaCode.InitialenScanner = ""
 	Set AfgemeldeDnaCode.Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).Ongedaan()
+	Set AfgemeldeDnaCode.Lijn = 1
 	
 	#dim DnaCodeIteratorEenStuk As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1)
 	#dim DnaCodeIteratorTweeStuks As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1, DnaCode2)
@@ -365,14 +388,19 @@
 	Set ToeleveringServiceMock = ##class(vhTest.Mock.DOM.AKP.ToeleveringService).%New()
 	Do ToeleveringServiceMock.VerwachtMethodCall("HeeftToeleveringMinstensEenSpaceStep",AfgemeldeDnaCode.Toelevering).DanDoeNiks()
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock)
+	Set DocumentGeneratorMock = ##class(vhTest.Mock.APPS.Halux.Afmelden.impl.DocumentLadeGerecepteerdNaarObjective).%New()
+	Do DocumentGeneratorMock.IndienMethodCall("GenereerDocumentVoorObjective",DnaCode1.DnaCode).DanDoeNiks()
 	
+	Set ProductTypeApiMock = ##class(vhTest.Mock.DOM.PM.impl.ProductTypeAPIimpl).%New()
+	Do ProductTypeApiMock.IndienMethodCall("IsLegraboxProduct", $$$ElkeWaarde).DanReturn($$$True)
+	
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock,,ProductTypeApiMock)
+	
 	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
 	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),2)
 	Do $$$AssertEquals(Antwoord.AantalInToelevering,"2")
-	Do $$$AssertEquals(Antwoord.AantalReedsGescand,"1")
 	Do DnaCodeRepositoryMock.Verifieer()
 	Do ToeleveringServiceMock.Verifieer()
 ]]></Implementation>
@@ -386,6 +414,7 @@
 	
 	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode1.Toelevering = "222222"
+	Set DnaCode1.Lijn = 1
 	#dim DnaCodeIteratorEenStuk As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1)
 	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
 	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaDnaCodeEnRecent",Request.DnaCode).DanReturn(DnaCodeIteratorEenStuk)
@@ -395,8 +424,14 @@
 	Set ToeleveringServiceMock = ##class(vhTest.Mock.DOM.AKP.ToeleveringService).%New()
 	Do ToeleveringServiceMock.VerwachtMethodCall("HeeftToeleveringMinstensEenSpaceStep",DnaCode1.Toelevering).DanDoeNiks()
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock)
+	Set DocumentGeneratorMock = ##class(vhTest.Mock.APPS.Halux.Afmelden.impl.DocumentLadeGerecepteerdNaarObjective).%New()
+	Do DocumentGeneratorMock.IndienMethodCall("GenereerDocumentVoorObjective",DnaCode1.DnaCode).DanDoeNiks()
 	
+	Set ProductTypeApiMock = ##class(vhTest.Mock.DOM.PM.impl.ProductTypeAPIimpl).%New()
+	Do ProductTypeApiMock.IndienMethodCall("IsLegraboxProduct", $$$ElkeWaarde).DanReturn($$$True)
+	
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock,,ProductTypeApiMock)
+	
 	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
@@ -417,14 +452,17 @@
 	Set DnaCode1.Toelevering = "222222"
 	Set DnaCode1.DnaCode = "LAAAAA1"
 	Set DnaCode1.ParentDnaCode = "LBBBBB1"
+	Set DnaCode1.Lijn = 1
 	Set DnaCode2 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode2.Toelevering = "222222"
 	Set DnaCode2.DnaCode = "LBBBBB1"
 	Set DnaCode2.ParentDnaCode = "LBBBBB1"
+	Set DnaCode2.Lijn = 1
 	Set DnaCode3 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode3.Toelevering = "222222"
 	Set DnaCode3.DnaCode = "LCCCCC1"
 	Set DnaCode3.ParentDnaCode = "LBBBBB1"
+	Set DnaCode3.Lijn = 1
 	#dim DnaCodeIteratorEenStuk As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1)
 	#dim DnaCodeIteratorDrieStuks As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1,DnaCode2,DnaCode3)
 	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
@@ -438,8 +476,14 @@
 	Set ToeleveringServiceMock = ##class(vhTest.Mock.DOM.AKP.ToeleveringService).%New()
 	Do ToeleveringServiceMock.VerwachtMethodCall("HeeftToeleveringMinstensEenSpaceStep", DnaCode3.Toelevering).DanDoeNiks()
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock)
+	Set DocumentGeneratorMock = ##class(vhTest.Mock.APPS.Halux.Afmelden.impl.DocumentLadeGerecepteerdNaarObjective).%New()
+	Do DocumentGeneratorMock.IndienMethodCall("GenereerDocumentVoorObjective",DnaCode1.DnaCode).DanDoeNiks()
 	
+	Set ProductTypeApiMock = ##class(vhTest.Mock.DOM.PM.impl.ProductTypeAPIimpl).%New()
+	Do ProductTypeApiMock.IndienMethodCall("IsLegraboxProduct", $$$ElkeWaarde).DanReturn($$$True)
+	
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock,,ProductTypeApiMock)
+	
 	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
@@ -457,6 +501,7 @@
 	
 	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode1.Toelevering = "222222"
+	Set DnaCode1.Lijn = 1	
 	#dim DnaCodeIteratorEenStuk As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1)
 	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
 	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaDnaCodeEnRecent",Request.DnaCode).DanReturn(DnaCodeIteratorEenStuk)
@@ -466,8 +511,14 @@
 	Set ToeleveringServiceMock = ##class(vhTest.Mock.DOM.AKP.ToeleveringService).%New()
 	Do ToeleveringServiceMock.VerwachtMethodCall("HeeftToeleveringMinstensEenSpaceStep", DnaCode1.Toelevering).DanReturn($$$True)
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock)
+	Set DocumentGeneratorMock = ##class(vhTest.Mock.APPS.Halux.Afmelden.impl.DocumentLadeGerecepteerdNaarObjective).%New()
+	Do DocumentGeneratorMock.IndienMethodCall("GenereerDocumentVoorObjective",DnaCode1.DnaCode).DanDoeNiks()
 	
+	Set ProductTypeApiMock = ##class(vhTest.Mock.DOM.PM.impl.ProductTypeAPIimpl).%New()
+	Do ProductTypeApiMock.IndienMethodCall("IsLegraboxProduct", $$$ElkeWaarde).DanReturn($$$True)
+	
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock,,ProductTypeApiMock)
+	
 	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
@@ -486,6 +537,7 @@
 	
 	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode1.Toelevering = "222222"
+	Set DnaCode1.Lijn = 1
 	#dim DnaCodeIteratorEenStuk As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1)
 	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
 	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaDnaCodeEnRecent",Request.DnaCode).DanReturn(DnaCodeIteratorEenStuk)
@@ -495,8 +547,14 @@
 	Set ToeleveringServiceMock = ##class(vhTest.Mock.DOM.AKP.ToeleveringService).%New()
 	Do ToeleveringServiceMock.VerwachtMethodCall("HeeftToeleveringMinstensEenSpaceStep", DnaCode1.Toelevering).DanReturn($$$False)
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock)
+	Set DocumentGeneratorMock = ##class(vhTest.Mock.APPS.Halux.Afmelden.impl.DocumentLadeGerecepteerdNaarObjective).%New()
+	Do DocumentGeneratorMock.IndienMethodCall("GenereerDocumentVoorObjective",DnaCode1.DnaCode).DanDoeNiks()
 	
+	Set ProductTypeApiMock = ##class(vhTest.Mock.DOM.PM.impl.ProductTypeAPIimpl).%New()
+	Do ProductTypeApiMock.IndienMethodCall("IsLegraboxProduct", $$$ElkeWaarde).DanReturn($$$True)
+	
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock,,ProductTypeApiMock)
+	
 	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")