Index: vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/HernoemPallet/Test.cls.xml
===================================================================
diff -u -r58103 -r58130
--- vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/HernoemPallet/Test.cls.xml	(.../Test.cls.xml)	(revision 58103)
+++ vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/HernoemPallet/Test.cls.xml	(.../Test.cls.xml)	(revision 58130)
@@ -3,24 +3,36 @@
 <Class name="vhUnitTest.WSimpl.Halux.AAP.DnaCodeService.HernoemPallet.Test">
 <Super>vhUnitTest.TestCase</Super>
 
+<Property name="Request">
+<Type>WS.Halux.AAP.HernoemPalletRequest</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super()
+	Set ..Request = ##class(WS.Halux.AAP.HernoemPalletRequest).%New()
+]]></Implementation>
+</Method>
+
 <Method name="Test: OudeCode is geldige palletcode met data (NieuweCode leeg) -&gt; lijst DnaCodes">
 <Implementation><![CDATA[
-	Set Request = ##class(WS.Halux.AAP.HernoemPalletRequest).%New()
-	Set Request.OudeCode = "TBX12345"
-	Set Request.NieuweCode = ""
+	Set ..Request.OudeCode = "TBX12345"
+	Set ..Request.NieuweCode = ""
 	
 	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode2 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	#dim DnaCodeIterator As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1, DnaCode2)
 	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
-	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaPalletCode",Request.OudeCode).DanReturn(DnaCodeIterator)
+	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaPalletCode",..Request.OudeCode).DanReturn(DnaCodeIterator)
 	
 	Set PalletCodeValidator = ##class(vhTest.Mock.WSimpl.Halux.AAP.DnaCodeService.PalletCodeValidator).%New()
-	Do PalletCodeValidator.IndienMethodCall("ValideerPalletCode",Request.OudeCode).DanReturn($$$True)
+	Do PalletCodeValidator.IndienMethodCall("ValideerPalletCode",..Request.OudeCode).DanReturn($$$True)
 
 	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock, PalletCodeValidator)
 	
-	#dim Antwoord As WS.Halux.AAP.HernoemPalletResponse = DnaCodeService.HernoemPallet(Request)
+	#dim Antwoord As WS.Halux.AAP.HernoemPalletResponse = DnaCodeService.HernoemPallet(..Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
 	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),2)
@@ -30,19 +42,18 @@
 
 <Method name="Test: OudeCode is geldige palletcode zonder data (NieuweCode leeg) -&gt; foutmelding geven">
 <Implementation><![CDATA[
-	Set Request = ##class(WS.Halux.AAP.HernoemPalletRequest).%New()
-	Set Request.OudeCode = "TBX12345"
-	Set Request.NieuweCode = ""
+	Set ..Request.OudeCode = "TBX12345"
+	Set ..Request.NieuweCode = ""
 	
 	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
-	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaPalletCode",Request.OudeCode).DanReturn(..EmptyIterator())
+	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaPalletCode",..Request.OudeCode).DanReturn(..EmptyIterator())
 	
 	Set PalletCodeValidator = ##class(vhTest.Mock.WSimpl.Halux.AAP.DnaCodeService.PalletCodeValidator).%New()
-	Do PalletCodeValidator.IndienMethodCall("ValideerPalletCode",Request.OudeCode).DanReturn($$$True)
+	Do PalletCodeValidator.IndienMethodCall("ValideerPalletCode",..Request.OudeCode).DanReturn($$$True)
 
 	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock, PalletCodeValidator)
 	
-	#dim Antwoord As WS.Halux.AAP.HernoemPalletResponse = DnaCodeService.HernoemPallet(Request)
+	#dim Antwoord As WS.Halux.AAP.HernoemPalletResponse = DnaCodeService.HernoemPallet(..Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,##class(TECH.enu.ExceptionCode).DataNotFound())
 	Do $$$AssertEquals(Antwoord.Header.Omschrijving,"Geen data gevonden voor pallet 'TBX12345'")
@@ -53,19 +64,18 @@
 
 <Method name="Test: OudeCode is geldige DnaCode (NieuweCode leeg) -&gt; lijst DnaCodes die op zelfde pallet zitten">
 <Implementation><![CDATA[
-	Set Request = ##class(WS.Halux.AAP.HernoemPalletRequest).%New()
-	Set Request.OudeCode = "LABCDE1"
+	Set ..Request.OudeCode = "LABCDE1"
 	
 	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode1.PalletCode = "TBX12345"
 	#dim DnaCodeIterator As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1)
 	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
-	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaDnaCode",Request.OudeCode).DanReturn(DnaCodeIterator)
+	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaDnaCode",..Request.OudeCode).DanReturn(DnaCodeIterator)
 	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaPalletCode",DnaCode1.PalletCode).DanReturn(DnaCodeIterator)
 	
 	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)
 	
-	#dim Antwoord As WS.Halux.AAP.ZoekViaToeleveringResponse = DnaCodeService.HernoemPallet(Request)
+	#dim Antwoord As WS.Halux.AAP.ZoekViaToeleveringResponse = DnaCodeService.HernoemPallet(..Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
 	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),1)
@@ -75,18 +85,17 @@
 
 <Method name="Test: OudeCode is geldige DnaCode die niet op pallet staat (NieuweCode leeg) -&gt; foutmelding geven">
 <Implementation><![CDATA[
-	Set Request = ##class(WS.Halux.AAP.HernoemPalletRequest).%New()
-	Set Request.OudeCode = "LABCDE1"
+	Set ..Request.OudeCode = "LABCDE1"
 	
 	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	#dim DnaCodeIterator As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1)
 	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
-	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaDnaCode",Request.OudeCode).DanReturn(DnaCodeIterator)
+	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaDnaCode",..Request.OudeCode).DanReturn(DnaCodeIterator)
 	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaPalletCode",DnaCode1.PalletCode).ExactAantalKeer(0).DanReturn(DnaCodeIterator)
 	
 	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)
 	
-	#dim Antwoord As WS.Halux.AAP.ZoekViaToeleveringResponse = DnaCodeService.HernoemPallet(Request)
+	#dim Antwoord As WS.Halux.AAP.ZoekViaToeleveringResponse = DnaCodeService.HernoemPallet(..Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"1005:InvalidUserInput")
 	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),0)
@@ -96,20 +105,19 @@
 
 <Method name="Test: OudeCode is zinloos (NieuweCode leeg) -&gt; foutmelding geven">
 <Implementation><![CDATA[
-	Set Request = ##class(WS.Halux.AAP.HernoemPalletRequest).%New()
-	Set Request.OudeCode = $$$DummyString
-	Set Request.NieuweCode = ""
+	Set ..Request.OudeCode = $$$DummyString
+	Set ..Request.NieuweCode = ""
 	
 	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
-	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaPalletCode",Request.OudeCode).ExactAantalKeer(0).DanDoeNiks()
+	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaPalletCode",..Request.OudeCode).ExactAantalKeer(0).DanDoeNiks()
 	
 	Set PalletCodeValidator = ##class(vhTest.Mock.WSimpl.Halux.AAP.DnaCodeService.PalletCodeValidator).%New()
-	Do PalletCodeValidator.IndienMethodCall("ValideerPalletCode",Request.OudeCode).DanReturn($$$False)
-	Do PalletCodeValidator.IndienMethodCall("ValideerPalletCode",Request.NieuweCode).DanReturn($$$True)
+	Do PalletCodeValidator.IndienMethodCall("ValideerPalletCode",..Request.OudeCode).DanReturn($$$False)
+	Do PalletCodeValidator.IndienMethodCall("ValideerPalletCode",..Request.NieuweCode).DanReturn($$$True)
 
 	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock, PalletCodeValidator)
 	
-	#dim Antwoord As WS.Halux.AAP.HernoemPalletResponse = DnaCodeService.HernoemPallet(Request)
+	#dim Antwoord As WS.Halux.AAP.HernoemPalletResponse = DnaCodeService.HernoemPallet(..Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"1005:InvalidUserInput")
 	Do $$$AssertEquals(Antwoord.Header.Omschrijving,"Ongeldige code")
@@ -121,49 +129,47 @@
 
 <Method name="Test: OudeCode en NieuweCode ingevuld, maar NieuweCode bevat geen palletcode -&gt; foutmelding geven">
 <Implementation><![CDATA[
-	Set Request = ##class(WS.Halux.AAP.HernoemPalletRequest).%New()
-	Set Request.OudeCode = "TBX12345"
-	Set Request.NieuweCode = $$$DummyString
+	Set ..Request.OudeCode = "TBX12345"
+	Set ..Request.NieuweCode = $$$DummyString
 	
 	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
-	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaPalletCode",Request.OudeCode).ExactAantalKeer(0).DanDoeNiks()
+	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaPalletCode",..Request.OudeCode).ExactAantalKeer(0).DanDoeNiks()
 	
 	Set PalletCodeValidator = ##class(vhTest.Mock.WSimpl.Halux.AAP.DnaCodeService.PalletCodeValidator).%New()
-	Do PalletCodeValidator.IndienMethodCall("ValideerPalletCode",Request.OudeCode).DanReturn($$$True)
-	Do PalletCodeValidator.IndienMethodCall("ValideerPalletCode",Request.NieuweCode).DanReturn($$$False)
+	Do PalletCodeValidator.IndienMethodCall("ValideerPalletCode",..Request.OudeCode).DanReturn($$$True)
+	Do PalletCodeValidator.IndienMethodCall("ValideerPalletCode",..Request.NieuweCode).DanReturn($$$False)
 
 	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock, PalletCodeValidator)
 	
-	#dim Antwoord As WS.Halux.AAP.HernoemPalletResponse = DnaCodeService.HernoemPallet(Request)
+	#dim Antwoord As WS.Halux.AAP.HernoemPalletResponse = DnaCodeService.HernoemPallet(..Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"1005:InvalidUserInput")
 	Do $$$AssertEquals(Antwoord.Header.Omschrijving,"Ongeldige code")
-	Do $$$AssertEquals(Antwoord.Header.OmschrijvingVoorLogging,"Ongeldige code: '"_Request.OudeCode_"' of '"_Request.NieuweCode_"'")
+	Do $$$AssertEquals(Antwoord.Header.OmschrijvingVoorLogging,"Ongeldige code: '"_..Request.OudeCode_"' of '"_..Request.NieuweCode_"'")
 	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),0)
 	Do DnaCodeRepositoryMock.Verifieer()
 ]]></Implementation>
 </Method>
 
 <Method name="Test: OudeCode en NieuweCode is geldige palletcode -&gt; hernoemen">
 <Implementation><![CDATA[
-	Set Request = ##class(WS.Halux.AAP.HernoemPalletRequest).%New()
-	Set Request.OudeCode = "TBX12345"
-	Set Request.NieuweCode = "TBX54321"
+	Set ..Request.OudeCode = "TBX12345"
+	Set ..Request.NieuweCode = "TBX54321"
 	
 	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode2 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	#dim DnaCodeIterator As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1, DnaCode2)
 	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
-	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaPalletCode",Request.OudeCode).DanReturn(DnaCodeIterator)
+	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaPalletCode",..Request.OudeCode).DanReturn(DnaCodeIterator)
 	Do DnaCodeRepositoryMock.VerwachtMethodCall("Bewaar",$$$ElkeWaarde).ExactAantalKeer(2).DanDoeNiks()
 	
 	Set PalletCodeValidatorMock = ##class(vhTest.Mock.WSimpl.Halux.AAP.DnaCodeService.PalletCodeValidator).%New()
-	Do PalletCodeValidatorMock.VerwachtMethodCall("ValideerPalletCode",Request.OudeCode).DanReturn($$$True)
-	Do PalletCodeValidatorMock.VerwachtMethodCall("ValideerPalletCode",Request.NieuweCode).DanReturn($$$True)
+	Do PalletCodeValidatorMock.VerwachtMethodCall("ValideerPalletCode",..Request.OudeCode).DanReturn($$$True)
+	Do PalletCodeValidatorMock.VerwachtMethodCall("ValideerPalletCode",..Request.NieuweCode).DanReturn($$$True)
 
 	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock, PalletCodeValidatorMock)
 	
-	#dim Antwoord As WS.Halux.AAP.HernoemPalletResponse = DnaCodeService.HernoemPallet(Request)
+	#dim Antwoord As WS.Halux.AAP.HernoemPalletResponse = DnaCodeService.HernoemPallet(..Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
 	Do $$$AssertEquals(Antwoord.Header.Omschrijving,"Pallet is succesvol gewijzigd")
@@ -172,6 +178,39 @@
 	Do PalletCodeValidatorMock.Verifieer()
 ]]></Implementation>
 </Method>
+
+<Method name="Test: OudeCode en NieuweCode is geldige DnaCode -&gt; hernoemen">
+<Implementation><![CDATA[
+	Set ..Request.OudeCode = "LABCDE1"
+	Set ..Request.NieuweCode = "LABCDF2"
+	
+	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
+	Set DnaCode1.PalletCode = "TBX12345"
+	Set DnaCode2 = ##class(DOM.Halux.AAP.DnaCode).%New()
+	Set DnaCode2.PalletCode = "TBX54321"
+	#dim DnaCodeIterator1 As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1)
+	#dim DnaCodeIterator2 As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode2)
+	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
+	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaDnaCode",..Request.OudeCode).DanReturn(DnaCodeIterator1)
+	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaDnaCode",..Request.NieuweCode).DanReturn(DnaCodeIterator2)
+	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaPalletCode",DnaCode1.PalletCode).DanReturn(DnaCodeIterator1)
+	Do DnaCodeRepositoryMock.VerwachtMethodCall("Bewaar",$$$ElkeWaarde).ExactAantalKeer(1).DanDoeNiks()
+	
+	Set PalletCodeValidatorMock = ##class(vhTest.Mock.WSimpl.Halux.AAP.DnaCodeService.PalletCodeValidator).%New()
+	Do PalletCodeValidatorMock.VerwachtMethodCall("ValideerPalletCode",DnaCode1.PalletCode).DanReturn($$$True)
+	Do PalletCodeValidatorMock.VerwachtMethodCall("ValideerPalletCode",DnaCode2.PalletCode).DanReturn($$$True)
+
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock, PalletCodeValidatorMock)
+	
+	#dim Antwoord As WS.Halux.AAP.HernoemPalletResponse = DnaCodeService.HernoemPallet(..Request)
+	
+	Do $$$AssertEquals(Antwoord.Header.Status,"200")
+	Do $$$AssertEquals(Antwoord.Header.Omschrijving,"Pallet is succesvol gewijzigd")
+	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),0)
+	Do DnaCodeRepositoryMock.Verifieer()
+	Do PalletCodeValidatorMock.Verifieer()
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: WSimpl/Halux/AAP/DnaCodeService.cls.xml
===================================================================
diff -u -r58103 -r58130
--- WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 58103)
+++ WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 58130)
@@ -307,11 +307,7 @@
 		If NieuwePalletCode = "" {
 			
 			If $Length(OudePalletCode)=7 {
-				Set DnaCodeIterator = ..DnaCodeRepository.ZoekViaDnaCode(OudePalletCode)
-				If DnaCodeIterator.HasNext() {
-					Set DnaCode = DnaCodeIterator.Next()
-					Set OudePalletCode = DnaCode.PalletCode
-				}
+				Set OudePalletCode = ..GeefPalletCodeVanDnaCode(OudePalletCode)
 			}
 			
 			If ..PalletCodeValidator.ValideerPalletCode(OudePalletCode) {
@@ -332,6 +328,12 @@
 				Set Response.Header.OmschrijvingVoorLogging = "Ongeldige code: '"_OudePalletCode_"'"
 			}
 		} Else {
+			If $Length(NieuwePalletCode)=7 {
+				Set NieuwePalletCode = ..GeefPalletCodeVanDnaCode(NieuwePalletCode)
+			}
+			If $Length(OudePalletCode)=7 {
+				Set OudePalletCode = ..GeefPalletCodeVanDnaCode(OudePalletCode)
+			}
 			If $$$Not(..PalletCodeValidator.ValideerPalletCode(OudePalletCode)) || $$$Not(..PalletCodeValidator.ValideerPalletCode(NieuwePalletCode)) {
 				Set Response.Header.Status = "1005:InvalidUserInput"
 				Set Response.Header.Omschrijving = "Ongeldige code"
@@ -364,6 +366,22 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefPalletCodeVanDnaCode">
+<FormalSpec>DnaCode:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim DnaCodeIterator As TECH.Iterator
+	#dim Resultaat As %String = ""
+	Set DnaCodeIterator = ..DnaCodeRepository.ZoekViaDnaCode(DnaCode)
+	If DnaCodeIterator.HasNext() {
+		Set DnaCode = DnaCodeIterator.Next()
+		Set Resultaat = DnaCode.PalletCode
+	}
+	Quit Resultaat
+]]></Implementation>
+</Method>
+
 <Method name="IsValid">
 <FormalSpec>DnaCodeAfmeldenRequest:WS.Halux.AAP.DnaCodeAfmeldenRequest,Response:WS.Halux.AAP.DnaCodeAfmeldenResponse,DnaCode:DOM.Halux.AAP.DnaCode</FormalSpec>
 <Private>1</Private>