Index: APPS/Halux/PPS/Activiteit/impl/TBX/KlantEtiketIoCContainer.cls.xml
===================================================================
diff -u
--- APPS/Halux/PPS/Activiteit/impl/TBX/KlantEtiketIoCContainer.cls.xml	(revision 0)
+++ APPS/Halux/PPS/Activiteit/impl/TBX/KlantEtiketIoCContainer.cls.xml	(revision 59483)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.Halux.PPS.Activiteit.impl.TBX.KlantEtiketIoCContainer">
+<Super>TECH.IoC.Container</Super>
+
+<Method name="Initialization">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[	#execute set ^TECH.Config.IoC.Container("APPS.Halux.PPS.Activiteit.impl.TBX.KlantEtiketIoCContainer","DnaCodeService")="APPS.Halux.AAP.DnaCodeService"
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/Halux/Docs/EtiketBuilder.cls.xml
===================================================================
diff -u -r59252 -r59483
--- APPS/Halux/Docs/EtiketBuilder.cls.xml	(.../EtiketBuilder.cls.xml)	(revision 59252)
+++ APPS/Halux/Docs/EtiketBuilder.cls.xml	(.../EtiketBuilder.cls.xml)	(revision 59483)
@@ -58,7 +58,7 @@
 	Set ..MaatwerkProductEtiketBuilder = $$$Inject(MaatwerkProductEtiketBuilder, ##class(APPS.Halux.Docs.impl.LadeKlantEtiketBuilder).%New())
 	Set ..VHossHelper = ##class(BL.PPS.TBX.VHossHelper).%New()
 	Set ..VHossService = ##class(APPS.Halux.common.impl.VHossService).%New()
-	Set ..DnaCodeService = ##class(APPS.Halux.AAP.DnaCodeService).%New()
+	Set ..DnaCodeService =  ##class(APPS.Halux.PPS.Activiteit.impl.TBX.KlantEtiketIoCContainer).Instance().Resolve("DnaCodeService")
 	
 	Quit $$$OK
 ]]></Implementation>
Index: APPS/Halux/AAP/DnaCodeService.cls.xml
===================================================================
diff -u -r59465 -r59483
--- APPS/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 59465)
+++ APPS/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 59483)
@@ -188,7 +188,7 @@
 <FormalSpec>ToeleveringID:%String,ProductID:%String,SequentieNummer:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	If $$$Not(..ProjectSettingsApi.IsActiefDnaCodeOpEtiket()) || (##class(TECH.Context.RuntimeContext).Instance().GeefApplicatie() = "IntegratieTest") {
+	If $$$Not(..ProjectSettingsApi.IsActiefDnaCodeOpEtiket()) {
 		Quit ""
 	}
 	#dim Result As %String = ""
Index: APPS/Halux/Planning/impl/BatchStarter.cls.xml
===================================================================
diff -u -r59094 -r59483
--- APPS/Halux/Planning/impl/BatchStarter.cls.xml	(.../BatchStarter.cls.xml)	(revision 59094)
+++ APPS/Halux/Planning/impl/BatchStarter.cls.xml	(.../BatchStarter.cls.xml)	(revision 59483)
@@ -39,7 +39,8 @@
 	Set ..BatchSequentieService = $$$Inject(BatchSequentieService,##class(APPS.ApplicatieContext).Instance().GeefProductieAPI().GeefBatchSequentieService())
 	Set ..BatchSequentieVerwijderaar = $$$Inject(BatchSequentieVerwijderaar,##class(APPS.Halux.Planning.impl.BatchSequentieVerwijderaar).%New()) 
 	Set ..Logger = $$$Inject(Logger, ##class(vhLib.Logger).%New())
-	Set ..DnaCodeService = $$$Inject(DnaCodeService,##class(APPS.Halux.AAP.DnaCodeService).%New())
+	Set ..DnaCodeService =  $$$Inject(DnaCodeService,##class(APPS.Halux.PPS.Activiteit.impl.TBX.KlantEtiketIoCContainer).Instance().Resolve("DnaCodeService"))
+
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -64,6 +65,7 @@
 		Do ..Logger.Info("StartBatch", "Starten van batch ("_Batch.GeefID()_") is begonnen.")
 		Do Batch.ZetStatus(##class(APPS.Halux.common.enu.BatchStatus).BezigMetStarten())
 		Do ..BatchBewaarder.BewaarBatch(Batch)
+		Do ##class(Tools.Wlip).%New(127).String(..DnaCodeService.%ClassName(1))
 		Do ..DnaCodeService.BewaarDnaCodes(..DnaCodeService.MaakDnaCodesVoorBatch(Batch))
 		Do ..BatchSequentieService.GenereerSequentie(Batch)
 		Do Batch.ZetStatus(##class(APPS.Halux.common.enu.BatchStatus).Gestart())
Index: vhTest/Integratie/Productie/Planning/ActieveBatches/Tandembox/Aansturing/TestBase.cls.xml
===================================================================
diff -u -r58993 -r59483
--- vhTest/Integratie/Productie/Planning/ActieveBatches/Tandembox/Aansturing/TestBase.cls.xml	(.../TestBase.cls.xml)	(revision 58993)
+++ vhTest/Integratie/Productie/Planning/ActieveBatches/Tandembox/Aansturing/TestBase.cls.xml	(.../TestBase.cls.xml)	(revision 59483)
@@ -16,13 +16,15 @@
 	
  	Do ##super(aTestCase)
  	Do ..InitZaagOpdrachtIdCounter()
+ 	Do ##class(APPS.Halux.PPS.Activiteit.impl.TBX.KlantEtiketIoCContainer).Instance().Register("DnaCodeService",##class(vhTest.Fake.APPS.Halux.AAP.DnaCodeService).%New())
 ]]></Implementation>
 </Method>
 
 <Method name="OnAfterOneTest">
 <FormalSpec>aTestCase:%String</FormalSpec>
 <Implementation><![CDATA[
 	Do ..ResetZaagOpdrachtIdCounter()
+	Do ##class(APPS.Halux.PPS.Activiteit.impl.TBX.KlantEtiketIoCContainer).Instance().Reset()
 	Do ##super(aTestCase)
 ]]></Implementation>
 </Method>
Index: vhUnitTest/APPS/Halux/Docs/TestEtiketBuilder.cls.xml
===================================================================
diff -u -r57608 -r59483
--- vhUnitTest/APPS/Halux/Docs/TestEtiketBuilder.cls.xml	(.../TestEtiketBuilder.cls.xml)	(revision 57608)
+++ vhUnitTest/APPS/Halux/Docs/TestEtiketBuilder.cls.xml	(.../TestEtiketBuilder.cls.xml)	(revision 59483)
@@ -92,9 +92,19 @@
 	
 	Set ..LadeKlantEtiketBuilderMock  = ##class(vhTest.Mock.APPS.Halux.Docs.impl.LadeKlantEtiketBuilder).%New(,..ProductApi)
 	Do ..LadeKlantEtiketBuilderMock.IndienMethodCall("FormateerProductieWeek",$$$ElkeWaarde).DanReturn("ProductieWeek")
+	
+ 	Do ##class(APPS.Halux.PPS.Activiteit.impl.TBX.KlantEtiketIoCContainer).Instance().Register("DnaCodeService",##class(vhTest.Fake.APPS.Halux.AAP.DnaCodeService).%New())
 ]]></Implementation>
 </Method>
 
+<Method name="OnAfterOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##class(APPS.Halux.PPS.Activiteit.impl.TBX.KlantEtiketIoCContainer).Instance().Reset()
+	Do ##super(aTestName)
+]]></Implementation>
+</Method>
+
 <Method name="Test: Maak MaatwerkProduct Via Order">
 <Implementation><![CDATA[
 	#dim StandaardOrder As DOM.VKP.Order = ##class(vhTest.Utils.DOM.VKP.Order).StandaardOrder()