Index: vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/ValideerPalletcode/Test.cls.xml
===================================================================
diff -u -r56405 -r72484
--- vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/ValideerPalletcode/Test.cls.xml	(.../Test.cls.xml)	(revision 56405)
+++ vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/ValideerPalletcode/Test.cls.xml	(.../Test.cls.xml)	(revision 72484)
@@ -19,6 +19,22 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Geldige PalletCode met A -&gt; ok ">
+<Implementation><![CDATA[
+	Set Request = ##class(WS.Halux.AAP.ValideerPalletCodeRequest).%New()
+	Set Request.PalletCode = "TBX12345A"
+	
+	Set PalletCodeValidator = ##class(vhTest.Mock.WSimpl.Halux.AAP.DnaCodeService.PalletCodeValidator).%New()
+	Do PalletCodeValidator.IndienMethodCall("ValideerPalletCode",Request.PalletCode).DanReturn($$$True)
+	
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(,PalletCodeValidator)
+	
+	#dim Antwoord As WS.Halux.AAP.ValideerPalletCodeResponse = DnaCodeService.ValideerPalletCode(Request)
+	
+	Do $$$AssertEquals(Antwoord.Header.Status,"200")
+]]></Implementation>
+</Method>
+
 <Method name="Test: Ongeldige PalletCode -&gt; niet ok">
 <Implementation><![CDATA[
 	Set Request = ##class(WS.Halux.AAP.ValideerPalletCodeRequest).%New()
Index: WS/Halux/AAP/GeefVolgendeTbpCodeRequest.cls.xml
===================================================================
diff -u -r58592 -r72484
--- WS/Halux/AAP/GeefVolgendeTbpCodeRequest.cls.xml	(.../GeefVolgendeTbpCodeRequest.cls.xml)	(revision 58592)
+++ WS/Halux/AAP/GeefVolgendeTbpCodeRequest.cls.xml	(.../GeefVolgendeTbpCodeRequest.cls.xml)	(revision 72484)
@@ -13,16 +13,21 @@
 <Required>1</Required>
 </Property>
 
+<Property name="DnaCode">
+<Type>DOM.Halux.AAP.DnaCode</Type>
+</Property>
+
 <Storage name="Default">
 <Type>%Library.CacheSerialState</Type>
 <State>GeefVolgendeTbpCodeRequestState</State>
 <StreamLocation>^WS.Halux.AAP.GeefVolgendAB12S</StreamLocation>
 <Data name="GeefVolgendeTbpCodeRequestState">
-<Structure>listnode</Structure>
-<Subscript/>
 <Value name="1">
 <Value>Header</Value>
 </Value>
+<Value name="2">
+<Value>DnaCode</Value>
+</Value>
 </Data>
 </Storage>
 </Class>
Index: WSimpl/Halux/AAP/DnaCodeService/PalletCodeValidator.cls.xml
===================================================================
diff -u -r60605 -r72484
--- WSimpl/Halux/AAP/DnaCodeService/PalletCodeValidator.cls.xml	(.../PalletCodeValidator.cls.xml)	(revision 60605)
+++ WSimpl/Halux/AAP/DnaCodeService/PalletCodeValidator.cls.xml	(.../PalletCodeValidator.cls.xml)	(revision 72484)
@@ -15,7 +15,7 @@
 	Set:(PalletCode ?1"DIV"5N) Result=$$$True
 	Set:(PalletCode ?1"KAD"5N) Result=$$$True
 	Set:(PalletCode ?1"SFS"5N) Result=$$$True
-	Set:(PalletCode ?1"TBP"5N) Result=$$$True
+	Set:(PalletCode ?1"TBP"5N.1(1"A",1"B")) Result=$$$True
 	Set:(PalletCode ?1"VHOSS"3N) Result=$$$True
 	Set:(PalletCode ?1"O"9N) Result=$$$True
 	Set:(PalletCode ?1"10"1"K"2N1"T"2N) Result=$$$True
Index: WSimpl/Halux/AAP/DnaCodeService.cls.xml
===================================================================
diff -u -r72412 -r72484
--- WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 72412)
+++ WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 72484)
@@ -722,7 +722,7 @@
 	Try {
 		Set Response = ##class(WS.Halux.AAP.GeefVolgendeTbpCodeResponse).%New()
 		#dim PalletIDBepaler As APPS.Halux.PPS.PalletIDBepaler = ##class(APPS.ApplicatieContext).Instance().GeefProductieAPI().GeefPalletIDBepaler()
-		Set Response.VolgendeTbpCode = PalletIDBepaler.GeefNieuwPalletID(##class(BL.PPS.TBX.enu.PalletEtiketType).Probox())
+		Set Response.VolgendeTbpCode = PalletIDBepaler.GeefNieuwPalletID(##class(BL.PPS.TBX.enu.PalletEtiketType).Probox(), GeefVolgendeTbpCodeRequest.DnaCode)
 		Set Response.Header.Status = "200"
 	} Catch {
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
@@ -733,24 +733,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefVolgendeLpnCode">
-<FormalSpec>GeefVolgendeLpnCodeRequest:WS.Halux.AAP.GeefVolgendeLpnCodeRequest</FormalSpec>
-<ReturnType>WS.Halux.AAP.GeefVolgendeTbpCodeResponse</ReturnType>
-<Implementation><![CDATA[
-	Try {
-		Set Response = ##class(WS.Halux.AAP.GeefVolgendeLpnCodeResponse).%New()
-		#dim PalletIDBepaler As APPS.Halux.PPS.PalletIDBepaler = ##class(APPS.ApplicatieContext).Instance().GeefProductieAPI().GeefPalletIDBepaler()
-		Set Response.VolgendeLpnCode = PalletIDBepaler.GeefNieuwLpnCode()
-		Set Response.Header.Status = "200"
-	} Catch {
-		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
-		Set Response.Header.Status = Exception.GeefExceptionCode()
-		Set Response.Header.Omschrijving = Exception.GeefOmschrijving()
-	}
-	Quit Response
-]]></Implementation>
-</Method>
-
 <Method name="RondAfKaderdeurDag">
 <FormalSpec>RondAfKaderdeurDagRequest:WS.Halux.AAP.RondAfKaderdeurDagRequest</FormalSpec>
 <ReturnType>WS.Halux.AAP.RondAfKaderdeurDagResponse</ReturnType>