Index: vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeAfmelden/Test.cls.xml
===================================================================
diff -u -r61696 -r74600
--- vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeAfmelden/Test.cls.xml	(.../Test.cls.xml)	(revision 61696)
+++ vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeAfmelden/Test.cls.xml	(.../Test.cls.xml)	(revision 74600)
@@ -10,26 +10,37 @@
 	
 	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 DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)
+	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 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()
 ]]></Implementation>
 </Method>
 
@@ -49,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>
@@ -61,26 +71,37 @@
 	
 	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(..EmptyIterator())
 	Do DnaCodeRepositoryMock.VerwachtMethodCall("Bewaar",DnaCode1).ExactAantalKeer(1)
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)
+	Set ToeleveringServiceMock = ##class(vhTest.Mock.DOM.AKP.ToeleveringService).%New()
+	Do ToeleveringServiceMock.VerwachtMethodCall("HeeftToeleveringMinstensEenSpaceStep", DnaCode2.Toelevering).DanDoeNiks()
 	
+	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>
 </Method>
 
@@ -109,7 +130,7 @@
 	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>
 </Method>
@@ -134,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>
@@ -149,26 +169,96 @@
 	
 	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)
 	Do DnaCodeRepositoryMock.VerwachtMethodCall("Bewaar",DnaCode1).DanDoeNiks()
 	
 	Set DnaCodeInVhossKastBepalerStub = ##class(vhTest.Mock.WSimpl.Halux.AAP.DnaCodeService.DnaCodeInVhossKastBepaler).%New()
-	Do DnaCodeInVhossKastBepalerStub.IndienMethodCall("MagDnaCodeInVhossKast", DnaCode1, Request.PalletCode, Request.BatchId).DanReturn($$$True)
+	Do DnaCodeInVhossKastBepalerStub.IndienMethodCall("MagDnaCodeInVhossKast", DnaCode1, Request.PalletCode, Request.BatchId).DanReturn(1)
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,DnaCodeInVhossKastBepalerStub)
+	Set ToeleveringServiceMock = ##class(vhTest.Mock.DOM.AKP.ToeleveringService).%New()
+	Do ToeleveringServiceMock.VerwachtMethodCall("HeeftToeleveringMinstensEenSpaceStep",DnaCode1.Toelevering).DanDoeNiks()
 	
+	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>
 </Method>
 
+<Method name="Test: Lade mag niet in Vhosskast: foutmelding in antwoord">
+<Implementation><![CDATA[
+	Set Request = ##class(WS.Halux.AAP.DnaCodeAfmeldenRequest).%New()
+	Set Request.DnaCode = "DnaCode"
+	Set Request.Toelevering = "356789"
+	Set Request.PalletCode = "O100000042"
+	Set Request.BatchId = "100000"
+	
+	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
+	Set DnaCode1.Toelevering = "222222"
+	#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)
+	Do DnaCodeRepositoryMock.VerwachtMethodCall("Bewaar",DnaCode1).Nooit()
+	
+	Set DnaCodeInVhossKastBepalerStub = ##class(vhTest.Mock.WSimpl.Halux.AAP.DnaCodeService.DnaCodeInVhossKastBepaler).%New()
+	Do DnaCodeInVhossKastBepalerStub.IndienMethodCall("MagDnaCodeInVhossKast", DnaCode1, Request.PalletCode, Request.BatchId).DanReturn(0)
+	
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,DnaCodeInVhossKastBepalerStub)
+	
+	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
+	
+	Do $$$AssertEquals(Antwoord.Header.Status,"-1006")
+	Do $$$AssertEquals(Antwoord.Header.Omschrijving,"De lade moet in een andere Vhosskast")
+	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),0)
+	Do $$$AssertEquals(Antwoord.AantalInToelevering,"0")
+	Do DnaCodeRepositoryMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Lade moet in andere kant van Vhosskast: foutmelding in antwoord">
+<Implementation><![CDATA[
+	Set Request = ##class(WS.Halux.AAP.DnaCodeAfmeldenRequest).%New()
+	Set Request.DnaCode = "DnaCode"
+	Set Request.Toelevering = "356789"
+	Set Request.PalletCode = "O100000042"
+	Set Request.BatchId = "100000"
+	
+	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
+	Set DnaCode1.Toelevering = "222222"
+	#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)
+	Do DnaCodeRepositoryMock.VerwachtMethodCall("Bewaar",DnaCode1).Nooit()
+	
+	Set DnaCodeInVhossKastBepalerStub = ##class(vhTest.Mock.WSimpl.Halux.AAP.DnaCodeService.DnaCodeInVhossKastBepaler).%New()
+	Do DnaCodeInVhossKastBepalerStub.IndienMethodCall("MagDnaCodeInVhossKast", DnaCode1, Request.PalletCode, Request.BatchId).DanReturn(2)
+	
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,DnaCodeInVhossKastBepalerStub)
+	
+	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
+	
+	Do $$$AssertEquals(Antwoord.Header.Status,"-1006")
+	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 DnaCodeRepositoryMock.Verifieer()
+]]></Implementation>
+</Method>
+
 <Method name="Test: Meegeleverde toelevering verschillend van DnaCode-Toelevering maar Kaderdeur -&gt; ok">
 <Implementation><![CDATA[
 	Set Request = ##class(WS.Halux.AAP.DnaCodeAfmeldenRequest).%New()
@@ -177,24 +267,35 @@
 	
 	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()
 	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaDnaCodeEnRecent",Request.DnaCode).DanReturn(DnaCodeIteratorEenStuk)
 	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaToeleveringIdEnRecent",DnaCode1.Toelevering).DanReturn(DnaCodeIteratorTweeStuks)
 	Do DnaCodeRepositoryMock.VerwachtMethodCall("Bewaar",DnaCode1).ExactAantalKeer(1)
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)
+	Set ToeleveringServiceMock = ##class(vhTest.Mock.DOM.AKP.ToeleveringService).%New()
+	Do ToeleveringServiceMock.VerwachtMethodCall("HeeftToeleveringMinstensEenSpaceStep", DnaCode2.Toelevering).DanDoeNiks()
 	
+	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>
 </Method>
 
@@ -216,10 +317,9 @@
 	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,##class(TECH.enu.ExceptionCode).InvalidInput())
-	Do $$$AssertEquals(Antwoord.Header.Omschrijving,"PalletCode reeds ingevuld voor '"_Request.DnaCode_"' (TBX12345)")
+	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>
@@ -245,10 +345,9 @@
 	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,##class(TECH.enu.ExceptionCode).InvalidInput())
-	Do $$$AssertEquals(Antwoord.Header.Omschrijving,"Reeds afgesloten. Gebruik 'Hernoem Pallet')")
+	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>
@@ -265,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)
@@ -283,42 +385,186 @@
 	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaToeleveringIdEnRecent",DnaCode1.Toelevering).DanReturn(DnaCodeIteratorTweeStuks)
 	Do DnaCodeRepositoryMock.VerwachtMethodCall("Bewaar",..Matches.Object(AfgemeldeDnaCode)).ExactAantalKeer(1)
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)
+	Set ToeleveringServiceMock = ##class(vhTest.Mock.DOM.AKP.ToeleveringService).%New()
+	Do ToeleveringServiceMock.VerwachtMethodCall("HeeftToeleveringMinstensEenSpaceStep",AfgemeldeDnaCode.Toelevering).DanDoeNiks()
 	
+	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>
 </Method>
 
-<Method name="Test: Als locatie werd meegegeven, moet ze gepersisteerd worden)">
+<Method name="Test: Als locatie werd meegegeven, moet ze gepersisteerd worden">
 <Implementation><![CDATA[
 	Set Request = ##class(WS.Halux.AAP.DnaCodeAfmeldenRequest).%New()
 	Set Request.DnaCode = "DnaCode"
 	Set Request.Locatie = $$$DummyString
 	
 	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)
 	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaToeleveringIdEnRecent",DnaCode1.Toelevering).DanReturn(DnaCodeIteratorEenStuk)
 	Do DnaCodeRepositoryMock.VerwachtMethodCall("Bewaar",DnaCode1).ExactAantalKeer(1)
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)
+	Set ToeleveringServiceMock = ##class(vhTest.Mock.DOM.AKP.ToeleveringService).%New()
+	Do ToeleveringServiceMock.VerwachtMethodCall("HeeftToeleveringMinstensEenSpaceStep",DnaCode1.Toelevering).DanDoeNiks()
 	
+	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(),1)
 	Do $$$AssertEquals(Antwoord.DnaCodes.GetAt(1).Locatie,$$$DummyString)
 	Do DnaCodeRepositoryMock.Verifieer()
+	Do ToeleveringServiceMock.Verifieer()
 ]]></Implementation>
 </Method>
+
+<Method name="Test: DnaCode met ingevulde ParentDnaCode -&gt; bijhorende DnaCodes bijwerken">
+<Implementation><![CDATA[
+	Set Request = ##class(WS.Halux.AAP.DnaCodeAfmeldenRequest).%New()
+	Set Request.DnaCode = "DnaCode"
+	Set Request.Locatie = $$$DummyString
+	
+	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
+	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()
+	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaDnaCodeEnRecent",Request.DnaCode).DanReturn(DnaCodeIteratorEenStuk)
+	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaToeleveringIdEnRecent",DnaCode1.Toelevering).DanReturn(DnaCodeIteratorEenStuk)
+	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaParentDnaCode",DnaCode1.ParentDnaCode).DanReturn(DnaCodeIteratorDrieStuks)
+	Do DnaCodeRepositoryMock.VerwachtMethodCall("Bewaar",DnaCode1).ExactAantalKeer(1)
+	Do DnaCodeRepositoryMock.VerwachtMethodCall("Bewaar",DnaCode2).ExactAantalKeer(1)
+	Do DnaCodeRepositoryMock.VerwachtMethodCall("Bewaar",DnaCode3).ExactAantalKeer(1)
+	
+	Set ToeleveringServiceMock = ##class(vhTest.Mock.DOM.AKP.ToeleveringService).%New()
+	Do ToeleveringServiceMock.VerwachtMethodCall("HeeftToeleveringMinstensEenSpaceStep", DnaCode3.Toelevering).DanDoeNiks()
+	
+	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(),1)
+	Do $$$AssertEquals(Antwoord.DnaCodes.GetAt(1).Locatie,$$$DummyString)
+	Do DnaCodeRepositoryMock.Verifieer()
+	Do ToeleveringServiceMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Als toelevering een spacestep bevat, moet de response true bevatten in property &apos;IsSST&apos; ">
+<Implementation><![CDATA[
+	Set Request = ##class(WS.Halux.AAP.DnaCodeAfmeldenRequest).%New()
+	Set Request.DnaCode = "DnaCode"
+	
+	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)
+	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaToeleveringIdEnRecent",DnaCode1.Toelevering).DanReturn(DnaCodeIteratorEenStuk)
+	Do DnaCodeRepositoryMock.VerwachtMethodCall("Bewaar",DnaCode1).ExactAantalKeer(1)
+	
+	Set ToeleveringServiceMock = ##class(vhTest.Mock.DOM.AKP.ToeleveringService).%New()
+	Do ToeleveringServiceMock.VerwachtMethodCall("HeeftToeleveringMinstensEenSpaceStep", DnaCode1.Toelevering).DanReturn($$$True)
+	
+	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(), 1)
+	Do $$$AssertEquals(Antwoord.IsSST,$$$True)
+	
+	Do DnaCodeRepositoryMock.Verifieer()
+	Do ToeleveringServiceMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Als toelevering geen spacestep bevat, moet de response false bevatten in property &apos;IsSST&apos; ">
+<Implementation><![CDATA[
+	Set Request = ##class(WS.Halux.AAP.DnaCodeAfmeldenRequest).%New()
+	Set Request.DnaCode = "DnaCode"
+	
+	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)
+	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaToeleveringIdEnRecent",DnaCode1.Toelevering).DanReturn(DnaCodeIteratorEenStuk)
+	Do DnaCodeRepositoryMock.VerwachtMethodCall("Bewaar",DnaCode1).ExactAantalKeer(1)
+	
+	Set ToeleveringServiceMock = ##class(vhTest.Mock.DOM.AKP.ToeleveringService).%New()
+	Do ToeleveringServiceMock.VerwachtMethodCall("HeeftToeleveringMinstensEenSpaceStep", DnaCode1.Toelevering).DanReturn($$$False)
+	
+	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(), 1)
+	Do $$$AssertEquals(Antwoord.IsSST,$$$False)
+	
+	Do DnaCodeRepositoryMock.Verifieer()
+	Do ToeleveringServiceMock.Verifieer()
+]]></Implementation>
+</Method>
 </Class>