Index: vhUnitTest/APPS/algemeen/entiteitcomponent/TestEntiteitComponentDataService.cls.xml
===================================================================
diff -u -r40132 -r56730
--- vhUnitTest/APPS/algemeen/entiteitcomponent/TestEntiteitComponentDataService.cls.xml	(.../TestEntiteitComponentDataService.cls.xml)	(revision 40132)
+++ vhUnitTest/APPS/algemeen/entiteitcomponent/TestEntiteitComponentDataService.cls.xml	(.../TestEntiteitComponentDataService.cls.xml)	(revision 56730)
@@ -40,6 +40,10 @@
 	Set ^KTO(6332,296195,4)=2
 	Set ^KTO(6332,296195,101)="\629192\30\\\47.68\#\\47.68\47.68\\L\1\\100\47.68\KTRPL\\\\E\EUR\\\11/06\\118153\101\\\\\\\\"
 	Set ^KTO(6332,296195,102)="\629192\30\\\47.68\#\\47.68\47.68\\L\1\\200\47.68\KTRPL\\\\E\EUR\\\11/06\\118153\102\\\\\\\\"
+	Set DnaCode = ##class(DOM.Halux.AAP.DnaCode).%New()
+	Set DnaCode.Toelevering = 296195
+	Set DnaCode.Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).Nieuw()
+	Do ##class(DOM.Halux.AAP.DnaCodeRepository).%New().Bewaar(DnaCode)
 	
 	Do ##class(DOM.AKP.event.ToeleveringEventRaiser).RaiseToeleveringGemaaktEvent(296195)
 ]]></Implementation>
Index: vhUnitTest/APPS/Halux/common/impl/VoegToeBezwaren/ToeleveringInBatch/Test.cls.xml
===================================================================
diff -u -r40182 -r56730
--- vhUnitTest/APPS/Halux/common/impl/VoegToeBezwaren/ToeleveringInBatch/Test.cls.xml	(.../Test.cls.xml)	(revision 40182)
+++ vhUnitTest/APPS/Halux/common/impl/VoegToeBezwaren/ToeleveringInBatch/Test.cls.xml	(.../Test.cls.xml)	(revision 56730)
@@ -44,6 +44,7 @@
 
 <Method name="TestToeleveringReedsInAndereBatch">
 <Implementation><![CDATA[
+	Do ..MaakToelevering()
 	Do ..MaakBatch()
 	set BatchService = ##class(APPS.Halux.common.impl.BatchService).%New()
 	#dim Batch As APPS.Halux.common.Batch = BatchService.MaakNieuweLegeBatch(##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentDate(),##class(APPS.Halux.common.enu.Categorie).Tandembox())
@@ -82,6 +83,11 @@
 	Set ^KTO(6332,..#ToeleveringID,101)="\700\250\\\44.33\#\\11082.50\11082.50\\L\1\\100\11082.50\KTRPL\\\\E\EUR\\\11/08\\\101\\\\\\\\"
 	Set ^KTO(6332,..#ToeleveringID,102)="\595226\1\\\64.71\#\\64.71\64.71\\L\2\\200\64.71\KTRPL\\\\E\EUR\\\11/08\\\102\\\\\\\\"
 	
+	Set DnaCode = ##class(DOM.Halux.AAP.DnaCode).%New()
+	Set DnaCode.Toelevering = ..#ToeleveringID
+	Set DnaCode.Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).Nieuw()
+	Do ##class(DOM.Halux.AAP.DnaCodeRepository).%New().Bewaar(DnaCode)
+
 	Set ^TO("IU",..#ToeleveringID,100) = 101
 	Set ^TO("IU",..#ToeleveringID,200) = 102
 	
Index: vhTest/Fake/DOM/Halux/AAP/DnaCodeRepository.cls.xml
===================================================================
diff -u -r56433 -r56730
--- vhTest/Fake/DOM/Halux/AAP/DnaCodeRepository.cls.xml	(.../DnaCodeRepository.cls.xml)	(revision 56433)
+++ vhTest/Fake/DOM/Halux/AAP/DnaCodeRepository.cls.xml	(.../DnaCodeRepository.cls.xml)	(revision 56730)
@@ -41,8 +41,7 @@
 
 <Method name="VerwijderDnaCodeVoorToeleveringId">
 <FormalSpec>ToeleveringId:%String,DnaCode:%String</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwijderNieuweCodesVoorToeleveringId">
Index: vhUnitTest/APPS/Halux/BatchUtils.cls.xml
===================================================================
diff -u -r29059 -r56730
--- vhUnitTest/APPS/Halux/BatchUtils.cls.xml	(.../BatchUtils.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/Halux/BatchUtils.cls.xml	(.../BatchUtils.cls.xml)	(revision 56730)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="vhUnitTest.APPS.Halux.BatchUtils">
-<Super>%RegisteredObject</Super>
+<Super>vhUnitTest.TestCase</Super>
 
 <Method name="VerwijderBatchesMetToeleveringen">
 <ClassMethod>1</ClassMethod>
Index: vhUnitTest/APPS/Halux/Planning/TestExplicietePlanningEnZoekToelevering.cls.xml
===================================================================
diff -u -r46312 -r56730
--- vhUnitTest/APPS/Halux/Planning/TestExplicietePlanningEnZoekToelevering.cls.xml	(.../TestExplicietePlanningEnZoekToelevering.cls.xml)	(revision 46312)
+++ vhUnitTest/APPS/Halux/Planning/TestExplicietePlanningEnZoekToelevering.cls.xml	(.../TestExplicietePlanningEnZoekToelevering.cls.xml)	(revision 56730)
@@ -39,6 +39,10 @@
 	Set ^KTO(6332,298209,4)=2
 	Set ^KTO(6332,298209,101)="\614077\1\\\21.14\#\\21.14\21.14\\L\1\\100\21.14\KTRPL\\\\E\EUR\\\11/12\\123441\101\\\\\\\\"
 	do ##class(vhUnitTest.DataHelper).MaakToeleveringCompleet(6332,298209)
+	Set DnaCode = ##class(DOM.Halux.AAP.DnaCode).%New()
+	Set DnaCode.Toelevering = 298209
+	Set DnaCode.Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).Nieuw()
+	Do ##class(DOM.Halux.AAP.DnaCodeRepository).%New().Bewaar(DnaCode)
 	
 	Set ^HADPR("F","298209;100","K") = "33\62038,59594\\\\\\\\\\"
 	Set ^HADPR("F","298209;100","F") = "33\62094,58737\A\\\\\\\\\"
Index: APPS/Halux/AAP/DnaCodeService.cls.xml
===================================================================
diff -u -r56723 -r56730
--- APPS/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 56723)
+++ APPS/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 56730)
@@ -97,7 +97,7 @@
 			If DnaCode.Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).Nieuw() {
 				Set DnaCode.Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).InBatch()
 				Set DnaCode.Lijn = Batch.GeefLijn()
-				Set DnaCode.IsWegwerpPallet = Batch.GeefIsWegwerpPallet()
+				//Set DnaCode.IsWegwerpPallet = Batch.GeefIsWegwerpPallet()
 				Do ..DnaCodeRepository.Bewaar(DnaCode)
 			}
 		}
Index: APPS/Halux/common/impl/BatchImpl.cls.xml
===================================================================
diff -u -r56702 -r56730
--- APPS/Halux/common/impl/BatchImpl.cls.xml	(.../BatchImpl.cls.xml)	(revision 56702)
+++ APPS/Halux/common/impl/BatchImpl.cls.xml	(.../BatchImpl.cls.xml)	(revision 56730)
@@ -261,7 +261,7 @@
 	Set ..ProductieGroep = ##class(APPS.Halux.Planning.impl.BatchService.Utils).%New().GeefProductieGroepen(Toelevering).GetAt(1)
 	Do ..ZetStatus(##class(APPS.Halux.common.enu.BatchStatus).Manueel())
 	
-	//Do ##class(APPS.Halux.AAP.DnaCodeService).%New().DnaCodeBijwerkenMetBatchGegevens($this)
+	Do ##class(APPS.Halux.AAP.DnaCodeService).%New().DnaCodeBijwerkenMetBatchGegevens($this)
 	
 	If (..GeefGeplandOp() = "") Do ..ZetGeplandOpVroegsteGeplandVanToelevering()