Index: vhTest/Mock/APPS/Halux/AAP/DnaCodeService.cls.xml
===================================================================
diff -u -r74263 -r74747
--- vhTest/Mock/APPS/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 74263)
+++ vhTest/Mock/APPS/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 74747)
@@ -77,6 +77,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="IsIngekortePalletCodeVanABPallet">
+<FormalSpec>PalletCode:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("IsIngekortePalletCodeVanABPallet",PalletCode)
+]]></Implementation>
+</Method>
+
 <Method name="MaakDnaCodesVoorBatch">
 <FormalSpec>Batch:APPS.Halux.common.impl.BatchImpl</FormalSpec>
 <ReturnType>%ListOfDataTypes</ReturnType>
Index: vhTest/Mock/DOM/Halux/AAP/DnaCodeRepository.cls.xml
===================================================================
diff -u -r74733 -r74747
--- vhTest/Mock/DOM/Halux/AAP/DnaCodeRepository.cls.xml	(.../DnaCodeRepository.cls.xml)	(revision 74733)
+++ vhTest/Mock/DOM/Halux/AAP/DnaCodeRepository.cls.xml	(.../DnaCodeRepository.cls.xml)	(revision 74747)
@@ -42,13 +42,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="IsIngekortePalletCodeVanABPallet">
-<FormalSpec>PalletCode:%String</FormalSpec>
-<ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("IsIngekortePalletCodeVanABPallet",PalletCode)
-]]></Implementation>
-</Method>
-
 <Method name="Maak">
 <ReturnType>TECH.Persistent</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("Maak")
Index: vhUnitTest/APPS/Halux/AAP/DnaCodeService/IsIngekortePalletCodeVanABPallet/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/Halux/AAP/DnaCodeService/IsIngekortePalletCodeVanABPallet/Test.cls.xml	(revision 0)
+++ vhUnitTest/APPS/Halux/AAP/DnaCodeService/IsIngekortePalletCodeVanABPallet/Test.cls.xml	(revision 74747)
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.Halux.AAP.DnaCodeService.IsIngekortePalletCodeVanABPallet.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Property name="DnaCodeLijst">
+<Type>%ListOfObjects</Type>
+</Property>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestCase:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestCase)
+	
+	Set ..DnaCodeLijst = ##class(%ListOfObjects).%New()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Indien geen palletcode niet hoort bij AB pallet dan return false">
+<Implementation><![CDATA[
+	#dim PalletCode As %String = "TBP12345"
+	Do ..VoegDnaCodeToeAanLijst(PalletCode)
+	
+	#dim DnaCodeIterator As TECH.ItemIterator = ##class(TECH.ListIterator).%New(..DnaCodeLijst)
+	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
+	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekAlleRecenteViaPalletCode", PalletCode).DanReturn(DnaCodeIterator)
+	
+	Set DnaCodeService = ##class(APPS.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)
+	#dim Resultaat = DnaCodeService.IsIngekortePalletCodeVanABPallet(PalletCode)
+	
+	Do $$$AssertFalse(Resultaat)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Indien palletcode die hoort bij AB pallet dan return true">
+<Implementation><![CDATA[
+	#dim IngekortePalletCode As %String = "TBP12345"
+	#dim PalletCodeA As %String = IngekortePalletCode _ "A"
+	Do ..VoegDnaCodeToeAanLijst(PalletCodeA)
+	
+	#dim DnaCodeIterator As TECH.ItemIterator = ##class(TECH.ListIterator).%New(..DnaCodeLijst)
+	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
+	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekAlleRecenteViaPalletCode", IngekortePalletCode).DanReturn(DnaCodeIterator)
+	
+	Set DnaCodeService = ##class(APPS.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)
+	#dim Resultaat = DnaCodeService.IsIngekortePalletCodeVanABPallet(IngekortePalletCode)
+	
+	Do $$$AssertTrue(Resultaat)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Indien geen DnaCodes gevonden dan return false">
+<Implementation><![CDATA[
+	#dim PalletCode As %String = "TBP12345"
+	
+	#dim DnaCodeIterator As TECH.ItemIterator = ##class(TECH.ListIterator).%New(..DnaCodeLijst)
+	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
+	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekAlleRecenteViaPalletCode", PalletCode).DanReturn(DnaCodeIterator)
+	
+	Set DnaCodeService = ##class(APPS.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)
+	#dim Resultaat = DnaCodeService.IsIngekortePalletCodeVanABPallet(PalletCode)
+	
+	Do $$$AssertFalse(Resultaat)
+]]></Implementation>
+</Method>
+
+<Method name="VoegDnaCodeToeAanLijst">
+<FormalSpec>PalletCode:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set DummyDnaCode = ##class(DOM.Halux.AAP.DnaCode).%New()
+	Set DummyDnaCode.PalletCode = PalletCode
+	
+	Do ..DnaCodeLijst.Insert(DummyDnaCode)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Fake/DOM/Halux/AAP/DnaCodeRepository.cls.xml
===================================================================
diff -u -r74733 -r74747
--- vhTest/Fake/DOM/Halux/AAP/DnaCodeRepository.cls.xml	(.../DnaCodeRepository.cls.xml)	(revision 74733)
+++ vhTest/Fake/DOM/Halux/AAP/DnaCodeRepository.cls.xml	(.../DnaCodeRepository.cls.xml)	(revision 74747)
@@ -19,13 +19,6 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
-<Method name="IsIngekortePalletCodeVanABPallet">
-<FormalSpec>PalletCode:%String</FormalSpec>
-<ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit ""
-]]></Implementation>
-</Method>
-
 <Method name="ZoekViaToeleveringEnSequentienummer">
 <FormalSpec>BatchId:%String,Sequentienummer:%String</FormalSpec>
 <ReturnType>TECH.Iterator</ReturnType>
Index: BL/MB/UGLYPicking/ReceptieProductie.cls.xml
===================================================================
diff -u -r74733 -r74747
--- BL/MB/UGLYPicking/ReceptieProductie.cls.xml	(.../ReceptieProductie.cls.xml)	(revision 74733)
+++ BL/MB/UGLYPicking/ReceptieProductie.cls.xml	(.../ReceptieProductie.cls.xml)	(revision 74747)
@@ -1493,10 +1493,10 @@
 	 . ;(dit gebeurt door de laatste parameter op 1 in te stellen). Wanneer dit is gebeurd, dan zal
 	 . ;het toch een 'nieuwe' pallet worden, in tegenstelling tot wat de variabele eerst bevatte (anders
 	 . ;waren we nooit in deze 'else' lus beland)
-	 . Set DnaCodeRepository = ##class(DOM.Halux.AAP.DnaCodeRepository).%New()
-	 . If DnaCodeRepository.IsIngekortePalletCodeVanABPallet(PalletID) Do
+	 . Set DnaCodeService = ##class(APPS.Halux.AAP.DnaCodeService).%New()
+	 . If DnaCodeService.IsIngekortePalletCodeVanABPallet(PalletID) Do
 	 . . Set lbLocation = ##class(BL.MB.UGLYPicking.General).GetLocationViaLocID(PalletID)
-	 . Kill DnaCodeRepository
+	 . Kill DnaCodeService
 	 . Set Result=##class(BL.MB.UGLYPicking.General).CompleteLocationViaPalletID(.lbLocation,PalletID,.IsNewPallet,1)
 	 . Do:(IsNewPallet) ..AddToEndOfLog("verwijderen (consolidatie): ")
 	 If Result="" Do
Index: DOM/Halux/AAP/DnaCodeRepository.cls.xml
===================================================================
diff -u -r74733 -r74747
--- DOM/Halux/AAP/DnaCodeRepository.cls.xml	(.../DnaCodeRepository.cls.xml)	(revision 74733)
+++ DOM/Halux/AAP/DnaCodeRepository.cls.xml	(.../DnaCodeRepository.cls.xml)	(revision 74747)
@@ -240,18 +240,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="IsIngekortePalletCodeVanABPallet">
-<FormalSpec>PalletCode:%String</FormalSpec>
-<ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[
-	#Dim PalletCodeIterator As TECH.Iterator = ..ZoekViaPalletCodeEnRecent(PalletCode)
-	Quit:$$$Not(PalletCodeIterator.HasNext()) $$$False
-	
-	#Dim VolledigePalletCode = PalletCodeIterator.Next()
-	Quit ..IsABPalletCode(VolledigePalletCode)
-]]></Implementation>
-</Method>
-
 <Method name="IsABPalletCode">
 <FormalSpec>PalletCode:%String</FormalSpec>
 <Private>1</Private>
Index: APPS/Halux/AAP/DnaCodeService.cls.xml
===================================================================
diff -u -r74261 -r74747
--- APPS/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 74261)
+++ APPS/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 74747)
@@ -360,6 +360,18 @@
 ]]></Implementation>
 </Method>
 
+<Method name="IsIngekortePalletCodeVanABPallet">
+<FormalSpec>PalletCode:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#Dim DnaCodeIterator As TECH.Iterator = ..DnaCodeRepository.ZoekAlleRecenteViaPalletCode(PalletCode)
+	Quit:$$$Not(DnaCodeIterator.HasNext()) $$$False
+	
+	#Dim DnaCode As DOM.Halux.AAP.DnaCode = DnaCodeIterator.Next()
+	Quit ..IsABPalletCode(DnaCode.PalletCode)
+]]></Implementation>
+</Method>
+
 <Method name="IsABPalletCode">
 <FormalSpec>PalletCode:%String</FormalSpec>
 <Private>1</Private>
Index: vhTest/Fake/APPS/Halux/AAP/DnaCodeService.cls.xml
===================================================================
diff -u -r74263 -r74747
--- vhTest/Fake/APPS/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 74263)
+++ vhTest/Fake/APPS/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 74747)
@@ -40,6 +40,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="IsIngekortePalletCodeVanABPallet">
+<FormalSpec>PalletCode:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
 <Method name="GeefDnaCodeViaToeleveringIdEnSequentieNummerEnProductNummerEnRecent">
 <FormalSpec>ToeleveringId:%String,SequentieNummer:%String,ProductNummer:%String</FormalSpec>
 <ReturnType>%String</ReturnType>