Index: APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/ProductOptiesGenerator.cls.xml
===================================================================
diff -u -r71776 -r71892
--- APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/ProductOptiesGenerator.cls.xml	(.../ProductOptiesGenerator.cls.xml)	(revision 71776)
+++ APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/ProductOptiesGenerator.cls.xml	(.../ProductOptiesGenerator.cls.xml)	(revision 71892)
@@ -8,8 +8,8 @@
 <Private>1</Private>
 </Property>
 
-<Property name="DnaCodeRepository">
-<Type>DOM.Halux.AAP.DnaCodeRepository</Type>
+<Property name="DnaCodeService">
+<Type>APPS.Halux.AAP.DnaCodeService</Type>
 <Private>1</Private>
 </Property>
 
@@ -19,14 +19,14 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>ProductApi:DOM.PM.ProductAPI="",DnaCodeRepository:DOM.Halux.AAP.DnaCodeRepository=""</FormalSpec>
+<FormalSpec>ProductApi:DOM.PM.ProductAPI="",DnaCodeService:APPS.Halux.AAP.DnaCodeService=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..ProductApi = $$$Inject(ProductApi, ##class(DOM.PM.impl.ProductAPI).%New())
-	Set ..DnaCodeRepository = $$$Inject(DnaCodeRepository, ##class(DOM.Halux.AAP.DnaCodeRepository).%New())
+	Set ..DnaCodeService = $$$Inject(DnaCodeService, ##class(APPS.Halux.PPS.Activiteit.impl.TBX.KlantEtiketIoCContainer).Instance().Resolve("DnaCodeService"))
 	Set ..FscConverterNaarObjective = ##class(APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.Converter.FscNaarObjective).%New()
 	
 	Quit $$$OK
@@ -64,23 +64,9 @@
 <Implementation><![CDATA[
 	Set LijstOpties = ##class(%ListOfObjects).%New()
 	
-	#dim DnaCodeIterator As TECH.Iterator =  ..DnaCodeRepository.ZoekViaToeleveringIdEnSequentieNummerEnProductNummerEnRecent(ToeleveringId, SequentieNummerBinnenBatch, ProductId)
-	#dim DnaCodeLijst As %ListOfDataTypes = ##class(TECH.ListUtils).IteratorToList(DnaCodeIterator)
-	#dim DnaCode As %String = ""
-	#dim DnaCodeIngekort As %String = ""
+	#dim DnaCode As %String = ..DnaCodeService.GeefDnaCodeViaToeleveringIdEnSequentieNummerEnProductNummerEnRecent(ToeleveringId, SequentieNummerBinnenBatch, ProductId)
+	#dim DnaCodeIngekort As %String = $Extract(DnaCode, $Length(DnaCode) - 2, $Length(DnaCode))
 	
-	If (DnaCodeLijst.Size = 1) {
-		#dim DnaCodeObject As DOM.Halux.AAP.DnaCode = DnaCodeLijst.GetAt(1)
-		Set DnaCode = DnaCodeObject.DnaCode
-		Set DnaCodeIngekort = $Extract(DnaCode, $Length(DnaCode) - 2, $Length(DnaCode))
-	} ElseIf (DnaCodeLijst.Size = 0) {
-		Set Exception = ##class(TECH.Exceptions.DataNotFoundException).%New("Geen Dnacode gevonden voor toelevering '" _ ToeleveringId _ "', product '" _ ProductId _ "' en sequentienummer '" _ SequentieNummerBinnenBatch _ "'.")
-		do ##class(TECH.ExceptionHandler).Throw(Exception)
-	} ElseIf (DnaCodeLijst.Size > 1) {
-		Set Exception = ##class(TECH.Exceptions.DataCorruptException).%New("Meerdere dnacodes gevonden voor toelevering '" _ ToeleveringId _ "', product '" _ ProductId _ "' en sequentienummer '" _ SequentieNummerBinnenBatch _ "'.")
-		do ##class(TECH.ExceptionHandler).Throw(Exception)
-	}
-	
 	Do LijstOpties.Insert(..GeefOptieVoorLade(SequentieNummerLade, "-" _ "DNA-code", DnaCode))
 	Do LijstOpties.Insert(..GeefOptieVoorLade(SequentieNummerLade, "-" _ "PIN", DnaCode))
 	Do LijstOpties.Insert(..GeefOptieVoorLade(SequentieNummerLade, "-" _ "SHORTPIN", DnaCodeIngekort))
Index: vhUnitTest/APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/ProductOptiesGenerator/GenereerOptiesVoorLade/Test.cls.xml
===================================================================
diff -u -r71788 -r71892
--- vhUnitTest/APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/ProductOptiesGenerator/GenereerOptiesVoorLade/Test.cls.xml	(.../Test.cls.xml)	(revision 71788)
+++ vhUnitTest/APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/ProductOptiesGenerator/GenereerOptiesVoorLade/Test.cls.xml	(.../Test.cls.xml)	(revision 71892)
@@ -81,12 +81,9 @@
 	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
 	Do ProductApiMock.VerwachtMethodCall("GeefProduct", ..#DummyProductId).DanReturn(ProductMock)
 	
-	Set DnaCode = ##class(DOM.Halux.AAP.DnaCode).%New()
-	Set DnaCode.DnaCode = ..#DummyDnaCode
-	#dim DnaCodeIterator As TECH.ItemIterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode)
-	#dim DnaCodeRepositoryMock As vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository = ..GeefDnaCodeRepositoryMock(..#DummyToeleveringId, ..#SequentieNummer, ..#DummyProductId, DnaCodeIterator)
+	#dim DnaCodeServiceMock As vhTest.Mock.APPS.Halux.AAP.DnaCodeService = ..GeefDnaCodeServiceMock(..#DummyToeleveringId, ..#SequentieNummer, ..#DummyProductId, ..#DummyDnaCode)
 	
-	Set Generator = ##class(APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.OptieGenerator.ProductOptiesGenerator).%New(ProductApiMock, DnaCodeRepositoryMock)
+	Set Generator = ##class(APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.OptieGenerator.ProductOptiesGenerator).%New(ProductApiMock, DnaCodeServiceMock)
 	#dim Resultaat As %ListOfObjects = Generator.GenereerOptiesVoorLade(ToeleveringMock, ..UitvoeringInfo)
 	
 	Do $$$AssertEquals(Resultaat.Size, 10)
@@ -104,7 +101,7 @@
 	Do ToeleveringMock.Verifieer()
 	Do ProductMock.Verifieer()
 	Do ProductApiMock.Verifieer()
-	Do DnaCodeRepositoryMock.Verifieer()
+	Do DnaCodeServiceMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -121,12 +118,9 @@
 	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
 	Do ProductApiMock.VerwachtMethodCall("GeefProduct", ..#DummyProductId).DanReturn(ProductMock)
 	
-	Set DnaCode = ##class(DOM.Halux.AAP.DnaCode).%New()
-	Set DnaCode.DnaCode = ..#DummyDnaCode
-	#dim DnaCodeIterator As TECH.ItemIterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode)
-	#dim DnaCodeRepositoryMock As vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository = ..GeefDnaCodeRepositoryMock(..#DummyToeleveringId, ..#SequentieNummer, ..#DummyProductId, DnaCodeIterator)
+	#dim DnaCodeServiceMock As vhTest.Mock.APPS.Halux.AAP.DnaCodeService = ..GeefDnaCodeServiceMock(..#DummyToeleveringId, ..#SequentieNummer, ..#DummyProductId, ..#DummyDnaCode)
 	
-	Set Generator = ##class(APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.OptieGenerator.ProductOptiesGenerator).%New(ProductApiMock, DnaCodeRepositoryMock)
+	Set Generator = ##class(APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.OptieGenerator.ProductOptiesGenerator).%New(ProductApiMock, DnaCodeServiceMock)
 	#dim Resultaat As %ListOfObjects = Generator.GenereerOptiesVoorLade(ToeleveringMock, ..UitvoeringInfo)
 	
 	Do $$$AssertEquals(Resultaat.Size, 10)
@@ -135,68 +129,10 @@
 	Do ToeleveringMock.Verifieer()
 	Do ProductMock.Verifieer()
 	Do ProductApiMock.Verifieer()
-	Do DnaCodeRepositoryMock.Verifieer()
+	Do DnaCodeServiceMock.Verifieer()
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Meerdere dnacodes gevonden geeft een error">
-<Implementation><![CDATA[
-	
-	#dim ToeleveringMock As vhTest.Mock.DOM.AKP.Toelevering = ..GeefToeleveringMock(..#DummyToeleveringId)
-	
-	Set ProductMock = ##class(vhTest.Mock.DOM.PM.MaatwerkProduct).%New()
-	Do ProductMock.VerwachtMethodCall("GeefID").DanReturn(..#DummyProductId)
-	
-	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
-	Do ProductApiMock.VerwachtMethodCall("GeefProduct", ..#DummyProductId).DanReturn(ProductMock)
-	
-	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
-	Set DnaCode1.DnaCode = ..#DummyDnaCode
-	Set DnaCode2 = ##class(DOM.Halux.AAP.DnaCode).%New()
-	Set DnaCode2.DnaCode = ..#DummyDnaCode
-	#dim DnaCodeIterator As TECH.ItemIterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1, DnaCode2)
-	#dim DnaCodeRepositoryMock As vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository = ..GeefDnaCodeRepositoryMock(..#DummyToeleveringId, ..#SequentieNummer, ..#DummyProductId, DnaCodeIterator)
-	
-	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Meerdere dnacodes gevonden voor toelevering '222222', product '111111' en sequentienummer '2'.")
-	do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.DataCorruptException",Substrings))
-	
-	Set Generator = ##class(APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.OptieGenerator.ProductOptiesGenerator).%New(ProductApiMock, DnaCodeRepositoryMock)
-	#dim Resultaat As %ListOfObjects = Generator.GenereerOptiesVoorLade(ToeleveringMock, ..UitvoeringInfo)
-	
-	Do ToeleveringMock.Verifieer()
-	Do ProductMock.Verifieer()
-	Do ProductApiMock.Verifieer()
-	Do DnaCodeRepositoryMock.Verifieer()
-]]></Implementation>
-</Method>
-
-<Method name="Test: Geen dnacodes gevonden geeft een error">
-<Implementation><![CDATA[
-	
-	#dim ToeleveringMock As vhTest.Mock.DOM.AKP.Toelevering = ..GeefToeleveringMock(..#DummyToeleveringId)
-	
-	Set ProductMock = ##class(vhTest.Mock.DOM.PM.MaatwerkProduct).%New()
-	Do ProductMock.VerwachtMethodCall("GeefID").DanReturn(..#DummyProductId)
-	
-	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
-	Do ProductApiMock.VerwachtMethodCall("GeefProduct", ..#DummyProductId).DanReturn(ProductMock)
-	
-	Set DnaCodeIterator = ##class(TECH.ListIterator).%New(##class(%ListOfObjects).%New())	
-	#dim DnaCodeRepositoryMock As vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository = ..GeefDnaCodeRepositoryMock(..#DummyToeleveringId, ..#SequentieNummer, ..#DummyProductId, DnaCodeIterator)
-	
-	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Geen Dnacode gevonden voor toelevering '222222', product '111111' en sequentienummer '2'.")
-	do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.DataNotFoundException",Substrings))
-	
-	Set Generator = ##class(APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.OptieGenerator.ProductOptiesGenerator).%New(ProductApiMock, DnaCodeRepositoryMock)
-	#dim Resultaat As %ListOfObjects = Generator.GenereerOptiesVoorLade(ToeleveringMock, ..UitvoeringInfo)
-	
-	Do ToeleveringMock.Verifieer()
-	Do ProductMock.Verifieer()
-	Do ProductApiMock.Verifieer()
-	Do DnaCodeRepositoryMock.Verifieer()
-]]></Implementation>
-</Method>
-
 <Method name="GeefToeleveringlijnMock">
 <FormalSpec>ProductId:%String,AxInventTransId:%String,AxConfigId:%String</FormalSpec>
 <Private>1</Private>
@@ -244,15 +180,15 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefDnaCodeRepositoryMock">
-<FormalSpec>ToeleveringId:%String,SequentieNummer:%Integer,ProductId:%String,DnaCodeIterator:TECH.Iterator</FormalSpec>
+<Method name="GeefDnaCodeServiceMock">
+<FormalSpec>ToeleveringId:%String,SequentieNummer:%Integer,ProductId:%String,DnaCode:%String</FormalSpec>
 <Private>1</Private>
-<ReturnType>vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository</ReturnType>
+<ReturnType>vhTest.Mock.APPS.Halux.AAP.DnaCodeService</ReturnType>
 <Implementation><![CDATA[
-	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
-	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaToeleveringIdEnSequentieNummerEnProductNummerEnRecent", ToeleveringId, SequentieNummer, ProductId).DanReturn(DnaCodeIterator)
+	Set DnaCodeServiceMock = ##class(vhTest.Mock.APPS.Halux.AAP.DnaCodeService).%New()
+	Do DnaCodeServiceMock.VerwachtMethodCall("GeefDnaCodeViaToeleveringIdEnSequentieNummerEnProductNummerEnRecent", ToeleveringId, SequentieNummer, ProductId).DanReturn(DnaCode)
 	
-	Quit DnaCodeRepositoryMock
+	Quit DnaCodeServiceMock
 ]]></Implementation>
 </Method>
 </Class>