Index: WS/Halux/AAP/DnaCodeAfmeldenRequest.cls.xml
===================================================================
diff -u -r61030 -r61564
--- WS/Halux/AAP/DnaCodeAfmeldenRequest.cls.xml	(.../DnaCodeAfmeldenRequest.cls.xml)	(revision 61030)
+++ WS/Halux/AAP/DnaCodeAfmeldenRequest.cls.xml	(.../DnaCodeAfmeldenRequest.cls.xml)	(revision 61564)
@@ -35,7 +35,7 @@
 <Type>%String</Type>
 </Property>
 
-<Property name="GuiVhossVolgnummer">
+<Property name="BatchId">
 <Type>%String</Type>
 </Property>
 
@@ -68,6 +68,9 @@
 <Value name="8">
 <Value>GuiVhossVolgnummer</Value>
 </Value>
+<Value name="9">
+<Value>BatchId</Value>
+</Value>
 </Data>
 </Storage>
 </Class>
Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.Halux.AAP.DnaCodeService.txt
===================================================================
diff -u -r61435 -r61564
--- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.Halux.AAP.DnaCodeService.txt	(.../WS.Halux.AAP.DnaCodeService.txt)	(revision 61435)
+++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.Halux.AAP.DnaCodeService.txt	(.../WS.Halux.AAP.DnaCodeService.txt)	(revision 61564)
@@ -95,7 +95,7 @@
                     <s:element minOccurs="0" name="Toelevering" type="s:string"/>
                     <s:element name="PalletCode" type="s:string"/>
                     <s:element minOccurs="0" name="Locatie" type="s:string"/>
-                    <s:element minOccurs="0" name="GuiVhossVolgnummer" type="s:string"/>
+                    <s:element minOccurs="0" name="BatchId" type="s:string"/>
                 </s:sequence>
             </s:complexType>
             <s:element name="DnaCodeAfmeldenResponse">
@@ -112,7 +112,7 @@
                             <s:element minOccurs="0" name="AantalInToelevering" type="s:long"/>
                             <s:element minOccurs="0" name="AantalReedsGescand" type="s:long"/>
                             <s:element maxOccurs="unbounded" minOccurs="0" name="DnaCodes" nillable="true" type="s0:DnaCode"/>
-                            <s:element minOccurs="0" name="InterneVhossKastId" type="s:string"/>
+                            <s:element minOccurs="0" name="BatchId" type="s:string"/>
                         </s:sequence>
                     </s:extension>
                 </s:complexContent>
Index: vhTest/Fake/WSimpl/Halux/AAP/DnaCodeService/DnaCodeInVhossKastBepaler.cls.xml
===================================================================
diff -u -r61510 -r61564
--- vhTest/Fake/WSimpl/Halux/AAP/DnaCodeService/DnaCodeInVhossKastBepaler.cls.xml	(.../DnaCodeInVhossKastBepaler.cls.xml)	(revision 61510)
+++ vhTest/Fake/WSimpl/Halux/AAP/DnaCodeService/DnaCodeInVhossKastBepaler.cls.xml	(.../DnaCodeInVhossKastBepaler.cls.xml)	(revision 61564)
@@ -8,7 +8,7 @@
 <Super>WSimpl.Halux.AAP.DnaCodeService.DnaCodeInVhossKastBepaler</Super>
 
 <Method name="MagDnaCodeInVhossKast">
-<FormalSpec>DnaCode:DOM.Halux.AAP.DnaCode,Pallet:%String,GuiVhossVolgnummer:%String</FormalSpec>
+<FormalSpec>DnaCode:DOM.Halux.AAP.DnaCode,Pallet:%String,BatchId:%String</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
Index: vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeAfmelden/Test.cls.xml
===================================================================
diff -u -r61510 -r61564
--- vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeAfmelden/Test.cls.xml	(.../Test.cls.xml)	(revision 61510)
+++ vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeAfmelden/Test.cls.xml	(.../Test.cls.xml)	(revision 61564)
@@ -145,7 +145,7 @@
 	Set Request.DnaCode = "DnaCode"
 	Set Request.Toelevering = "356789"
 	Set Request.PalletCode = "O100000042"
-	Set Request.GuiVhossVolgnummer = "1"
+	Set Request.BatchId = "100000"
 	
 	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode1.Toelevering = "222222"
@@ -155,7 +155,7 @@
 	Do DnaCodeRepositoryMock.VerwachtMethodCall("Bewaar",DnaCode1).DanDoeNiks()
 	
 	Set DnaCodeInVhossKastBepalerStub = ##class(vhTest.Mock.WSimpl.Halux.AAP.DnaCodeService.DnaCodeInVhossKastBepaler).%New()
-	Do DnaCodeInVhossKastBepalerStub.IndienMethodCall("MagDnaCodeInVhossKast",DnaCode1,Request.PalletCode,Request.GuiVhossVolgnummer).DanReturn($$$True)
+	Do DnaCodeInVhossKastBepalerStub.IndienMethodCall("MagDnaCodeInVhossKast", DnaCode1, Request.PalletCode, Request.BatchId).DanReturn($$$True)
 	
 	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,DnaCodeInVhossKastBepalerStub)
 	
Index: WSimpl/Halux/AAP/DnaCodeService.cls.xml
===================================================================
diff -u -r61563 -r61564
--- WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 61563)
+++ WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 61564)
@@ -318,6 +318,12 @@
 		} Else {
 			Set DnaCode = DnaCodeIterator.Next()
 			If ..IsValid(DnaCodeAfmeldenRequest, .Response, DnaCode) {
+				If ..IsGeldigeVhossCode(DnaCodeAfmeldenRequest.PalletCode) {
+					If $$$Not(..DnaCodeInVhossKastBepaler.MagDnaCodeInVhossKast(DnaCode, DnaCodeAfmeldenRequest.PalletCode, DnaCodeAfmeldenRequest.BatchId)) {
+						Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("De lade moet in een andere Vhosskast"))
+					}
+				}
+				
 				If DnaCodeAfmeldenRequest.Aantal = -1 {
 					Set DnaCode.InitialenScanner = ""
 					Set DnaCode.ScanTijdstip = ""
@@ -338,17 +344,8 @@
 				Do ..DnaCodeRepository.Bewaar(DnaCode)
 				
 				If ..IsGeldigeVhossCode(DnaCodeAfmeldenRequest.PalletCode) {
-					If ..DnaCodeInVhossKastBepaler.MagDnaCodeInVhossKast(DnaCode, DnaCodeAfmeldenRequest.PalletCode, DnaCodeAfmeldenRequest.GuiVhossVolgnummer) {
-						Set Response = ..AantalGescandeVhossSequentieItemsBepaler.BepaalAantalGescandeVhossSequentieItems(DnaCode,)
-						Do ##class(Tools.Wlip).%New(127).ObjToXML(Response)
-						Set Response.Header.Status = "200"
-					} Else {
-						Set DnaCode.InitialenScanner = ""
-						Set DnaCode.ScanTijdstip = ""
-						Set DnaCode.PalletCode = ""
-						Set DnaCode.Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).InBatch()
-						Do ..DnaCodeRepository.Bewaar(DnaCode)
-					}
+					Set Response = ..AantalGescandeVhossSequentieItemsBepaler.BepaalAantalGescandeVhossSequentieItems(DnaCode)
+					Set Response.Header.Status = "200"
 				} Else {
 					Set ToeleveringId = DnaCode.Toelevering
 					Set DnaCodeIterator = ..DnaCodeRepository.ZoekViaToeleveringIdEnRecent(ToeleveringId)
Index: WS/Halux/AAP/DnaCodeAfmeldenResponse.cls.xml
===================================================================
diff -u -r61030 -r61564
--- WS/Halux/AAP/DnaCodeAfmeldenResponse.cls.xml	(.../DnaCodeAfmeldenResponse.cls.xml)	(revision 61030)
+++ WS/Halux/AAP/DnaCodeAfmeldenResponse.cls.xml	(.../DnaCodeAfmeldenResponse.cls.xml)	(revision 61564)
@@ -17,7 +17,7 @@
 <Parameter name="XMLPROJECTION" value="ELEMENT"/>
 </Property>
 
-<Property name="InterneVhossKastId">
+<Property name="BatchId">
 <Type>%String</Type>
 </Property>
 </Class>
Index: vhTest/Mock/WSimpl/Halux/AAP/DnaCodeService/DnaCodeInVhossKastBepaler.cls.xml
===================================================================
diff -u -r61510 -r61564
--- vhTest/Mock/WSimpl/Halux/AAP/DnaCodeService/DnaCodeInVhossKastBepaler.cls.xml	(.../DnaCodeInVhossKastBepaler.cls.xml)	(revision 61510)
+++ vhTest/Mock/WSimpl/Halux/AAP/DnaCodeService/DnaCodeInVhossKastBepaler.cls.xml	(.../DnaCodeInVhossKastBepaler.cls.xml)	(revision 61564)
@@ -16,9 +16,9 @@
 </Method>
 
 <Method name="MagDnaCodeInVhossKast">
-<FormalSpec>DnaCode:DOM.Halux.AAP.DnaCode,Pallet:%String,GuiVhossVolgnummer:%String</FormalSpec>
+<FormalSpec>DnaCode:DOM.Halux.AAP.DnaCode,Pallet:%String,BatchId:%String</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("MagDnaCodeInVhossKast",DnaCode,Pallet,GuiVhossVolgnummer)
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("MagDnaCodeInVhossKast",DnaCode,Pallet,BatchId)
 ]]></Implementation>
 </Method>
 </Class>