Index: APPS/VisiDot/impl/VHossService.cls.xml
===================================================================
diff -u -r51518 -r59961
--- APPS/VisiDot/impl/VHossService.cls.xml	(.../VHossService.cls.xml)	(revision 51518)
+++ APPS/VisiDot/impl/VHossService.cls.xml	(.../VHossService.cls.xml)	(revision 59961)
@@ -3,14 +3,31 @@
 <Class name="APPS.VisiDot.impl.VHossService">
 <ClassType/>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>APPS.VisiDot.IVHossService,%RegisteredObject</Super>
+<Super>APPS.VisiDot.IVHossService,TECH.RegisteredObject</Super>
 <Inheritance>right</Inheritance>
 
 <Parameter name="VHossProductID">
 <Type>%String</Type>
 <Default>709565</Default>
 </Parameter>
 
+<Property name="LocationsService">
+<Type>BL.EWMS.Locationsservice</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>LocationsService:BL.EWMS.Locationsservice</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..LocationsService = $$$Inject(LocationsService,##class(BL.EWMS.Locationsservice).%New())
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="IsVHossGeregistreerd">
 <FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,VHossID:%String</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
@@ -48,27 +65,24 @@
 - PalletID van de VHoss uit de Inventory halen van EWMS databank</Description>
 <FormalSpec>VHossID:%String</FormalSpec>
 <Implementation><![CDATA[
-		#dim ID As %String = ""
-		#dim KlantNr As %String = ""
+	#dim ID As %String = ""
+	#dim KlantNr As %String = ""
+	
+	Set ResultSet = ##class(%ResultSet).%New()
+	Do ResultSet.Prepare("SELECT ID, KlantID FROM APPS_VisiDot_data.VHossUitlening WHERE VHossID = ? ")
+	Do ResultSet.Execute(VHossID)	
+	While (ResultSet.Next()){
+		Set ID = ResultSet.Data("ID")
+		Set KlantNr = ResultSet.Data("KlantID")
 		
-		/// Wildcard instellen voor VHossID
-		#dim QueryVHossID As %String = VHossID
-		Set $EXTRACT(QueryVHossID,3)="_"
+		#dim AantalVHossen As %Integer = 1
+		#dim KlantID As DOM.VKP.VanHoeckeKlantID = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantPartijID(KlantNr)
+		Do ..VulAanHistPak(KlantID, VHossID, AantalVHossen)
+		Do ..VerwijderVHossUitInventory(VHossID)
 		
-		Set ResultSet = ##class(%ResultSet).%New()
-		Do ResultSet.Prepare("SELECT ID, KlantID FROM APPS_VisiDot_data.VHossUitlening WHERE VHossID LIKE ? ")
-		Do ResultSet.Execute(QueryVHossID)	
-		If (ResultSet.Next()){
-			Set ID = ResultSet.Data("ID")
-			Set KlantNr = ResultSet.Data("KlantID")
-			
-			#dim AantalVHossen As %Integer = 1
-			#dim KlantID As DOM.VKP.VanHoeckeKlantID = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantPartijID(KlantNr)
-			Do ..VulAanHistPak(KlantID, VHossID, AantalVHossen)
-			Do ..VerwijderVHossUitInventory(VHossID)
-			
-			Do ##class(APPS.VisiDot.data.VHossUitlening).DeleteId(ID)
-		}
+		Do ##class(APPS.VisiDot.data.VHossUitlening).DeleteId(ID)
+	}
+	Do ResultSet.Close()
 ]]></Implementation>
 </Method>
 
@@ -77,7 +91,7 @@
 Te raadplegen via Admin menu Klanten (1.3) (vb keller : 1239)
 Via F11 -> Orders -> Recupereerbare Verpakking
 Afdalen tot VHoss, dan op 'H' duwen voor Historiek]]></Description>
-<FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,FrameID:%String,AantalVHossen:%Integer</FormalSpec>
+<FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,VHossID:%String,AantalVHossen:%Integer</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
 	#dim KlantNr As %String = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantNummerVoorPartijID(KlantID)
@@ -91,15 +105,29 @@
 	If (AantalVHossen < 0) Set HistPakBeweging = ##class(APPS.VisiDot.enu.HistPakBeweging).Uitgaand()
 	
 	Set ^HISTPAK("D",KlantNr,..#VHossProductID) = Saldo_"\"_$h	
-	Set ^HISTPAK("D",KlantNr,..#VHossProductID,"H",$h_","_HistPakBeweging) = Saldo_"\"_AantalVHossen_"\F\"_HistPakBeweging_"\\VHoss "_FrameID_"\"
+	Set ^HISTPAK("D",KlantNr,..#VHossProductID,"H",$h_","_HistPakBeweging) = Saldo_"\"_AantalVHossen_"\F\"_HistPakBeweging_"\\VHoss "_VHossID_"\"
 ]]></Implementation>
 </Method>
 
 <Method name="VerwijderVHossUitInventory">
 <FormalSpec>VHossID:%String</FormalSpec>
 <Implementation><![CDATA[
-	#dim PalletID As %String = ##class(APPS.VisiDot.impl.Tech).GeefPalletIDVanVHossID(VHossID)	
-	Do ##class(EWMS.Inventory).RemoveInventoryViaPalletID(PalletID)
+	#dim PalletID As %String = ##class(APPS.VisiDot.impl.Tech).GeefPalletIDVanVHossID(VHossID)
+	If $$$HasLength(PalletID) {
+		Do ##class(EWMS.Inventory).RemoveInventoryViaPalletID(PalletID)
+		
+		//bijhorende locations opkuisen
+		Set ResultSet = ##class(%ResultSet).%New()
+		Do ResultSet.Prepare("delete from locations where loc_id = ? ")
+		Do ResultSet.Execute(PalletID)
+		Do ResultSet.Close()
+		
+		//bijhorende carriers opkuisen
+		Set ResultSet = ##class(%ResultSet).%New()
+		Do ResultSet.Prepare("delete from carriers where loc_id = ? ")
+		Do ResultSet.Execute(PalletID)
+		Do ResultSet.Close()
+	}
 ]]></Implementation>
 </Method>
 
@@ -110,7 +138,7 @@
 	#dim LaatsteOntlening As %Date = "2000-01-01 00:00:00"
 	Set ResultSet = ##class(%ResultSet).%New()
 	Do ResultSet.Prepare("SELECT Tijdstip FROM APPS_VisiDot_data.VHossUitlening WHERE VHossID = ?")
-	Do ResultSet.Execute(VHossID)	
+	Do ResultSet.Execute(VHossID)
 	If (ResultSet.Next()){
 		Set LaatsteOntlening = ResultSet.Data("Tijdstip")
 	}
@@ -126,27 +154,10 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefGeregistreerdeVHossIDVoorVHossID">
-<FormalSpec>MyVHossID:%String</FormalSpec>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	#dim GeregistreerdeVHossID as %String = ""
-	#dim VHossID1A as %String = MyVHossID
-	#dim VHossID1B as %String = MyVHossID
-	#dim VHossID2A as %String = MyVHossID
-	#dim VHossID2B as %String = MyVHossID
-	Set $E(VHossID1A,2,3)=11 ; Type 1 A kant
-	Set $E(VHossID1B,2,3)=12 ; Type 1 B kant
-	Set $E(VHossID2A,2,3)=21 ; Type 2 A kant
-	Set $E(VHossID2B,2,3)=22 ; Type 2 B kant
-	
-	#dim Query As %String = "SELECT VHossID FROM APPS_VisiDot_data.VHossUitlening where ((VHossID = ?) or (VHossID = ?) or (VHossID = ?) or (VHossID = ?))"
-	#dim ResultSet As TECH.ResultSet = ##class(TECH.Context).Instance().GeefQueryAPI().GeefQueryUitvoerder().VoerUit(Query, $ListBuild(VHossID1A,VHossID1B,VHossID2A,VHossID2B))
-	if (ResultSet.Next()) {
-		Set GeregistreerdeVHossID = ResultSet.Data("VHossID")
-	}	
-	
-	Quit GeregistreerdeVHossID
+<Method name="CheckVhossOpMeerdereLocaties">
+<FormalSpec>VhossStartsWith:%String="O1"</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ..LocationsService.HeeftVhossOpMeerdereLocaties(VhossStartsWith)
 ]]></Implementation>
 </Method>
 </Class>