Index: WSimpl/Halux/AAP/DnaCodeService.cls.xml
===================================================================
diff -u -r62695 -r62824
--- WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 62695)
+++ WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 62824)
@@ -331,9 +331,13 @@
 			Set DnaCode = DnaCodeIterator.Next()
 			If ..IsValid(DnaCodeAfmeldenRequest, .Response, DnaCode) {
 				If ..IsGeldigeVhossCode(DnaCodeAfmeldenRequest.PalletCode) {
-					If $$$Not(..DnaCodeInVhossKastBepaler.MagDnaCodeInVhossKast(DnaCode, DnaCodeAfmeldenRequest.PalletCode, DnaCodeAfmeldenRequest.BatchId)) {
+					#dim MagDnaCodeInVhossKast As %Integer = ..DnaCodeInVhossKastBepaler.MagDnaCodeInVhossKast(DnaCode, DnaCodeAfmeldenRequest.PalletCode, DnaCodeAfmeldenRequest.BatchId)
+					If MagDnaCodeInVhossKast = 0 {
 						Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("De lade moet in een andere Vhosskast"))
 					}
+					If MagDnaCodeInVhossKast = 2 {
+						Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("De lade moet aan de andere kant van de Vhosskast"))
+					}
 				}
 				
 				If DnaCodeAfmeldenRequest.Aantal = -1 {
Index: vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeInVhossKastBepaler/MagDnaCodeInVhossKast/Test.cls.xml
===================================================================
diff -u -r62658 -r62824
--- vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeInVhossKastBepaler/MagDnaCodeInVhossKast/Test.cls.xml	(.../Test.cls.xml)	(revision 62658)
+++ vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeInVhossKastBepaler/MagDnaCodeInVhossKast/Test.cls.xml	(.../Test.cls.xml)	(revision 62824)
@@ -13,9 +13,9 @@
 	
 	Set Bepaler = ##class(WSimpl.Halux.AAP.DnaCodeService.DnaCodeInVhossKastBepaler).%New()
 	
-	#dim Antwoord = Bepaler.MagDnaCodeInVhossKast(DnaCode,Pallet,111111)
+	#dim Antwoord As %Integer= Bepaler.MagDnaCodeInVhossKast(DnaCode,Pallet,111111)
 	
-	Do $$$AssertFalse(Antwoord)
+	Do $$$AssertEquals(Antwoord,0)
 ]]></Implementation>
 </Method>
 
@@ -33,9 +33,9 @@
 	
 	Set Bepaler = ##class(WSimpl.Halux.AAP.DnaCodeService.DnaCodeInVhossKastBepaler).%New(SequentieServiceStub)
 	
-	#dim Antwoord = Bepaler.MagDnaCodeInVhossKast(DnaCode,Pallet,GuiInternVhossNummer)
+	#dim Antwoord As %Integer= Bepaler.MagDnaCodeInVhossKast(DnaCode,Pallet,GuiInternVhossNummer)
 	
-	Do $$$AssertFalse(Antwoord)
+	Do $$$AssertEquals(Antwoord,0)
 ]]></Implementation>
 </Method>
 
@@ -151,9 +151,9 @@
 	
 	Set Bepaler = ##class(WSimpl.Halux.AAP.DnaCodeService.DnaCodeInVhossKastBepaler).%New(SequentieServiceStub, DnaCodeRepositoryStub)
 	
-	#dim Antwoord As %Boolean = Bepaler.MagDnaCodeInVhossKast(AfTeScannenDnaCode,PalletCode,BatchId)
+	#dim Antwoord As %Integer = Bepaler.MagDnaCodeInVhossKast(AfTeScannenDnaCode,PalletCode,BatchId)
 	
-	Do $$$AssertTrue(Antwoord)
+	Do $$$AssertEquals(Antwoord,1)
 ]]></Implementation>
 </Method>
 
@@ -206,9 +206,9 @@
 	
 	Set Bepaler = ##class(WSimpl.Halux.AAP.DnaCodeService.DnaCodeInVhossKastBepaler).%New(SequentieServiceStub, DnaCodeRepositoryStub)
 	
-	#dim Antwoord As %Boolean = Bepaler.MagDnaCodeInVhossKast(AfTeScannenDnaCode,PalletCode,BatchId)
+	#dim Antwoord As %Integer = Bepaler.MagDnaCodeInVhossKast(AfTeScannenDnaCode,PalletCode,BatchId)
 	
-	Do $$$AssertTrue(Antwoord)
+	Do $$$AssertEquals(Antwoord,1)
 ]]></Implementation>
 </Method>
 
@@ -261,9 +261,9 @@
 	
 	Set Bepaler = ##class(WSimpl.Halux.AAP.DnaCodeService.DnaCodeInVhossKastBepaler).%New(SequentieServiceStub, DnaCodeRepositoryStub)
 	
-	#dim Antwoord As %Boolean = Bepaler.MagDnaCodeInVhossKast(AfTeScannenDnaCode,PalletCode,BatchId)
+	#dim Antwoord As %Integer = Bepaler.MagDnaCodeInVhossKast(AfTeScannenDnaCode,PalletCode,BatchId)
 	
-	Do $$$AssertFalse(Antwoord)
+	Do $$$AssertEquals(Antwoord,0)
 ]]></Implementation>
 </Method>
 
@@ -316,9 +316,9 @@
 	
 	Set Bepaler = ##class(WSimpl.Halux.AAP.DnaCodeService.DnaCodeInVhossKastBepaler).%New(SequentieServiceStub, DnaCodeRepositoryStub)
 	
-	#dim Antwoord As %Boolean = Bepaler.MagDnaCodeInVhossKast(AfTeScannenDnaCode,PalletCode,BatchId)
+	#dim Antwoord As %Integer = Bepaler.MagDnaCodeInVhossKast(AfTeScannenDnaCode,PalletCode,BatchId)
 	
-	Do $$$AssertFalse(Antwoord)
+	Do $$$AssertEquals(Antwoord,0)
 ]]></Implementation>
 </Method>
 
@@ -371,16 +371,17 @@
 	
 	Set Bepaler = ##class(WSimpl.Halux.AAP.DnaCodeService.DnaCodeInVhossKastBepaler).%New(SequentieServiceStub, DnaCodeRepositoryStub)
 	
-	#dim Antwoord As %Boolean = Bepaler.MagDnaCodeInVhossKast(AfTeScannenDnaCode,PalletCode,BatchId)
+	#dim Antwoord As %Integer = Bepaler.MagDnaCodeInVhossKast(AfTeScannenDnaCode,PalletCode,BatchId)
 	
-	Do $$$AssertTrue(Antwoord)
+	Do $$$AssertEquals(Antwoord,1)
 ]]></Implementation>
 </Method>
 
 <Method name="Test: LBX, meegegeven palletcode is al in gebruik binnen batch, maar op zelfde interne vhoss en andere zijkant -&gt; niet ok">
 <Implementation><![CDATA[
 	#dim BatchId As %String = "100000"
-	#dim PalletCode As %String = "O100000010"
+	#dim PalletCodeVoorkant As %String = "O110000010"
+	#dim PalletCodeAchterkant As %String = "O120000010"
 	
 	Set AfTeScannenDnaCode = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set AfTeScannenDnaCode.DnaCode = "LAAAAA0"
@@ -391,7 +392,7 @@
 	Set DnaCodeAlAanwezig1.DnaCode = "LAAAAA1"
 	Set DnaCodeAlAanwezig1.BatchId = "100000"
 	Set DnaCodeAlAanwezig1.SequentieNummer = "1"
-	Set DnaCodeAlAanwezig1.PalletCode = "O100000010"
+	Set DnaCodeAlAanwezig1.PalletCode = PalletCodeVoorkant
 	
 	Set DnaCodeAlAanwezig2 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCodeAlAanwezig2.DnaCode = "LAAAAA2"
@@ -426,9 +427,9 @@
 	
 	Set Bepaler = ##class(WSimpl.Halux.AAP.DnaCodeService.DnaCodeInVhossKastBepaler).%New(SequentieServiceStub, DnaCodeRepositoryStub)
 	
-	#dim Antwoord As %Boolean = Bepaler.MagDnaCodeInVhossKast(AfTeScannenDnaCode,PalletCode,BatchId)
+	#dim Antwoord As %Integer = Bepaler.MagDnaCodeInVhossKast(AfTeScannenDnaCode,PalletCodeAchterkant,BatchId)
 	
-	Do $$$AssertFalse(Antwoord)
+	Do $$$AssertEquals(Antwoord,2)
 ]]></Implementation>
 </Method>
 </Class>
Index: WSimpl/Halux/AAP/DnaCodeService/DnaCodeInVhossKastBepaler.cls.xml
===================================================================
diff -u -r62658 -r62824
--- WSimpl/Halux/AAP/DnaCodeService/DnaCodeInVhossKastBepaler.cls.xml	(.../DnaCodeInVhossKastBepaler.cls.xml)	(revision 62658)
+++ WSimpl/Halux/AAP/DnaCodeService/DnaCodeInVhossKastBepaler.cls.xml	(.../DnaCodeInVhossKastBepaler.cls.xml)	(revision 62824)
@@ -96,9 +96,9 @@
 <Method name="VerwerkDnaCode">
 <FormalSpec>DnaCode:DOM.Halux.AAP.DnaCode,TBXSequentie:%CacheString="",ProductieSequentie:APPS.Halux.common.VHOSSProductieSequentieItem="",Pallet:%String,BatchId:%String</FormalSpec>
 <Private>1</Private>
-<ReturnType>%Boolean</ReturnType>
+<ReturnType>%Integer</ReturnType>
 <Implementation><![CDATA[
-	#dim Resultaat As %Boolean = $$$True
+	#dim Resultaat As %Integer = 1
 	#dim VhossEnZijvlak As %List
 	#dim tempVhossEnZijvlak As %List
 	#dim tempTbxSequentie As %CacheString = ""
@@ -110,7 +110,7 @@
 	
 	#dim tempDnaCode As DOM.Halux.AAP.DnaCode
 	#dim DnaCodeIterator As TECH.Iterator = ..DnaCodeRepository.ZoekViaBatchId(DnaCode.BatchId)
-	While DnaCodeIterator.HasNext() && Resultaat {
+	While DnaCodeIterator.HasNext() && (Resultaat = 1) {
 		Set tempDnaCode = DnaCodeIterator.Next()
 		//als palletcode is ingevuld: checken of vhoss/zijkant van DnaCode gelijk zijn aan input. Indien zo dan MOET inputpalletcode gelijk zijn aan tempdnacode.palletcode
 		If $$$HasLength(tempDnaCode.PalletCode) {
@@ -126,16 +126,19 @@
 			
 			If ##class(TECH.StringUtils).StartsWith(tempDnaCode.PalletCode,"O1") {
 				If (Pallet = tempDnaCode.PalletCode) && ($$$Not(tempInternVhossId = InternVhossId) || $$$Not(tempZijVlak = ZijVlak)) {
-					Set Resultaat = $$$False
+					Set Resultaat = 0
 				}
 				If $$$Not(Pallet = tempDnaCode.PalletCode) && ((tempInternVhossId = InternVhossId) && (tempZijVlak = ZijVlak)) {
-					Set Resultaat = $$$False	
+					Set Resultaat = 1
 				}
 				
-				If Resultaat {
+				If Resultaat=1 {
 					If (tempInternVhossId = InternVhossId) && (tempZijVlak = ZijVlak) {
 						Set Resultaat = (tempDnaCode.PalletCode = Pallet)
 					}
+					If (tempInternVhossId = InternVhossId) && $$$Not(tempZijVlak = ZijVlak) {
+						Set Resultaat = 2
+					}
 				}
 			}
 		}
Index: vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeAfmelden/Test.cls.xml
===================================================================
diff -u -r62631 -r62824
--- vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeAfmelden/Test.cls.xml	(.../Test.cls.xml)	(revision 62631)
+++ vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeAfmelden/Test.cls.xml	(.../Test.cls.xml)	(revision 62824)
@@ -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.BatchId).DanReturn($$$True)
+	Do DnaCodeInVhossKastBepalerStub.IndienMethodCall("MagDnaCodeInVhossKast", DnaCode1, Request.PalletCode, Request.BatchId).DanReturn(1)
 	
 	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,DnaCodeInVhossKastBepalerStub)
 	
@@ -169,6 +169,68 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Lade mag niet in Vhosskast: foutmelding in antwoord">
+<Implementation><![CDATA[
+	Set Request = ##class(WS.Halux.AAP.DnaCodeAfmeldenRequest).%New()
+	Set Request.DnaCode = "DnaCode"
+	Set Request.Toelevering = "356789"
+	Set Request.PalletCode = "O100000042"
+	Set Request.BatchId = "100000"
+	
+	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
+	Set DnaCode1.Toelevering = "222222"
+	#dim DnaCodeIteratorEenStuk As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1)
+	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
+	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaDnaCodeEnRecent",Request.DnaCode).DanReturn(DnaCodeIteratorEenStuk)
+	Do DnaCodeRepositoryMock.VerwachtMethodCall("Bewaar",DnaCode1).Nooit()
+	
+	Set DnaCodeInVhossKastBepalerStub = ##class(vhTest.Mock.WSimpl.Halux.AAP.DnaCodeService.DnaCodeInVhossKastBepaler).%New()
+	Do DnaCodeInVhossKastBepalerStub.IndienMethodCall("MagDnaCodeInVhossKast", DnaCode1, Request.PalletCode, Request.BatchId).DanReturn(0)
+	
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,DnaCodeInVhossKastBepalerStub)
+	
+	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
+	
+	Do $$$AssertEquals(Antwoord.Header.Status,"-1006")
+	Do $$$AssertEquals(Antwoord.Header.Omschrijving,"De lade moet in een andere Vhosskast")
+	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),0)
+	Do $$$AssertEquals(Antwoord.AantalInToelevering,"0")
+	Do $$$AssertEquals(Antwoord.AantalReedsGescand,"0")
+	Do DnaCodeRepositoryMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Lade moet in andere kant van Vhosskast: foutmelding in antwoord">
+<Implementation><![CDATA[
+	Set Request = ##class(WS.Halux.AAP.DnaCodeAfmeldenRequest).%New()
+	Set Request.DnaCode = "DnaCode"
+	Set Request.Toelevering = "356789"
+	Set Request.PalletCode = "O100000042"
+	Set Request.BatchId = "100000"
+	
+	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
+	Set DnaCode1.Toelevering = "222222"
+	#dim DnaCodeIteratorEenStuk As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1)
+	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
+	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaDnaCodeEnRecent",Request.DnaCode).DanReturn(DnaCodeIteratorEenStuk)
+	Do DnaCodeRepositoryMock.VerwachtMethodCall("Bewaar",DnaCode1).Nooit()
+	
+	Set DnaCodeInVhossKastBepalerStub = ##class(vhTest.Mock.WSimpl.Halux.AAP.DnaCodeService.DnaCodeInVhossKastBepaler).%New()
+	Do DnaCodeInVhossKastBepalerStub.IndienMethodCall("MagDnaCodeInVhossKast", DnaCode1, Request.PalletCode, Request.BatchId).DanReturn(2)
+	
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,DnaCodeInVhossKastBepalerStub)
+	
+	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
+	
+	Do $$$AssertEquals(Antwoord.Header.Status,"-1006")
+	Do $$$AssertEquals(Antwoord.Header.Omschrijving,"De lade moet aan de andere kant van de Vhosskast")
+	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),0)
+	Do $$$AssertEquals(Antwoord.AantalInToelevering,"0")
+	Do $$$AssertEquals(Antwoord.AantalReedsGescand,"0")
+	Do DnaCodeRepositoryMock.Verifieer()
+]]></Implementation>
+</Method>
+
 <Method name="Test: Meegeleverde toelevering verschillend van DnaCode-Toelevering maar Kaderdeur -&gt; ok">
 <Implementation><![CDATA[
 	Set Request = ##class(WS.Halux.AAP.DnaCodeAfmeldenRequest).%New()