Index: APPS/MAG/Inventaris/impl/InventarisService.cls.xml
===================================================================
diff -u -r58291 -r73284
--- APPS/MAG/Inventaris/impl/InventarisService.cls.xml	(.../InventarisService.cls.xml)	(revision 58291)
+++ APPS/MAG/Inventaris/impl/InventarisService.cls.xml	(.../InventarisService.cls.xml)	(revision 73284)
@@ -114,7 +114,8 @@
 	
 	#Dim DoelLocatie As %List = $listbuild()
 	#Dim Result As %List = $listbuild()
-	
+	Set BronPalletID = $Extract(BronPalletID, 1, 8)
+	Set DoelPalletID = $Extract(DoelPalletID, 1, 8)
 	If (##class(EWMS.ToReceive).PalletIsInToReceive(BronPalletID)) {
 		Set DoelResultSetLocations = ##class(TECH.ResultSet).%New()
 		Do DoelResultSetLocations.Prepare("SELECT loc_m,loc_g,loc_x,loc_y,loc_z FROM EWMS.Locations WHERE loc_id = ?")
@@ -188,7 +189,12 @@
 <ReturnType>%List</ReturnType>
 <Implementation><![CDATA[
 	#Dim DoelLocatieViaPalletID As %List = ..InventarisRepository.GeefLocatieVanPallet(DoelPalletID)
-	#Dim DoelLocatieViaLocatieID As %List = ##class(EWMS.TransLoc).GetLocation(DoelLocatieID)
+	#Dim DoelLocatieViaLocatieID As %List
+	If (DoelLocatieID = ##class(APPS.MAG.enu.MagazijnTransitLocatie).Halux2Transit()) {
+		Set DoelLocatieViaLocatieID = DoelLocatieViaPalletID
+	} Else {
+		Set DoelLocatieViaLocatieID = ##class(EWMS.TransLoc).GetLocation(DoelLocatieID)
+	}
 	
 	If ($$$Not($Data(DoelLocatieViaPalletID))) {
 		If ($$$Not(##class(EWMS.Locations).IsLocatieLeegViaList(DoelLocatieViaLocatieID))) {
@@ -528,6 +534,10 @@
 <Method name="VerplaatsPallet">
 <FormalSpec>PalletID:%String,DoelLocatieID:%String</FormalSpec>
 <Implementation><![CDATA[
+	If ($Length(PalletID) <= 9) {
+		Set PalletID = $Extract(PalletID, 1, 8)
+	}
+	
 	If (##class(APPS.VisiDot.impl.Tech).IsFrameID(PalletID)){
 		Set PalletID = ##class(APPS.VisiDot.impl.Tech).GeefPalletIDVanVHossID(PalletID)
 	}
@@ -559,6 +569,7 @@
 <Method name="RecepteerPallet">
 <FormalSpec>PalletID:%String,DoelLocatieID:%String</FormalSpec>
 <Implementation><![CDATA[
+	Set PalletID = $Extract(PalletID, 1, 8)
 	#Dim ErrorString As %String = ""
 	
 	If (##class(APPS.VisiDot.impl.Tech).IsFrameID(PalletID)){
@@ -586,6 +597,7 @@
 <FormalSpec>PalletID:%String,ProductID:%String</FormalSpec>
 <ReturnType>APPS.MAG.Inventaris.dto.CycleCountInfo</ReturnType>
 <Implementation><![CDATA[
+	Set PalletID = $Extract(PalletID, 1, 8)
 	#Dim CycleCountInfo As APPS.MAG.Inventaris.dto.CycleCountInfo = ##class(APPS.MAG.Inventaris.dto.CycleCountInfo).%New()
 	#Dim Product As DOM.PM.Product = ##class(DOM.DomeinContext).Instance().GeefProductAPI().GeefProduct(ProductID)	
 	#Dim Aantal As %Integer = ..GeefCycleCountAantal(PalletID, ProductID)
@@ -612,6 +624,7 @@
 <Private>1</Private>
 <ReturnType>%Integer</ReturnType>
 <Implementation><![CDATA[
+	Set PalletID = $Extract(PalletID, 1, 8)
 	#Dim Aantal As %Integer = ""
 	
 	Try {
@@ -690,6 +703,7 @@
 <Method name="BevestigCycleCount">
 <FormalSpec>PalletID:%String,ProductID:%String,Reden:%String,AantalGrootVerpakkingen:%Integer,AantalKleinVerpakkingen:%Integer,AantalStukVerpakkingen:%Integer,PalletInfo:APPS.MAG.UGLYPicking.dto.PalletInfo=##class(APPS.MAG.UGLYPicking.dto.PalletInfo).%New(),AutoCC:%Boolean=0</FormalSpec>
 <Implementation><![CDATA[
+	Set PalletID = $Extract(PalletID, 1, 8)
 	#Dim Product As DOM.PM.Product = ##class(DOM.DomeinContext).Instance().GeefProductAPI().GeefProduct(ProductID)
 	#Dim CycleCountBevestiger As APPS.MAG.Inventaris.impl.CycleCountBevestiger = ##class(APPS.MAG.Inventaris.impl.CycleCountBevestiger).%New(..InventarisRepository)
 	Do CycleCountBevestiger.BevestigCycleCount(PalletID, Product, Reden, AantalGrootVerpakkingen, AantalKleinVerpakkingen, AantalStukVerpakkingen, PalletInfo, AutoCC)
@@ -818,6 +832,7 @@
 <ReturnType>%ListOfObjects</ReturnType>
 <ReturnTypeParams>ELEMENTTYPE="APPS.MAG.Inventaris.dto.LocatieInfo"</ReturnTypeParams>
 <Implementation><![CDATA[
+	Set PalletID = $Extract(PalletID, 1, 8)
 	Set LocatieInfoLijst = ##class(%ListOfObjects).%New()
 	Set ResultSet = ##class(%ResultSet).%New()
 	Do ResultSet.Prepare("SELECT L.loc_m AS Magazijn, L.loc_g AS Gang, L.loc_x As x, L.loc_y AS y, L.state As Status, L.insert_time As InsertTime, StatusVertaling.new_name As StatusTekstueel, TransLoc.Loc_Trans As TransLocID "
@@ -850,6 +865,7 @@
 <FormalSpec>PalletID:%String</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
+	Set PalletID = $Extract(PalletID, 1, 8)
 	#dim IsPalletGeregistreerdOpEenLocatie As %Boolean = 0
 	try {
 		#dim Query As %String = "SELECT loc_m AS Magazijn from EWMS.Locations WHERE loc_id = ? "
@@ -878,6 +894,7 @@
 <FormalSpec>PalletID:%String,LocatieID:%String</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
+	Set PalletID = $Extract(PalletID, 1, 8)
 	#Dim StaatErOp As %Boolean = 0
 	Set ResultSet = ##class(%ResultSet).%New()
 	Do ResultSet.Prepare("SELECT 1 FROM EWMS.Inventory I "_
@@ -894,7 +911,9 @@
 <Method name="KanPalletRecepteren">
 <FormalSpec><![CDATA[PalletID:%String,&ErrorString:%String]]></FormalSpec>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit ##class(EWMS.ToReceive).PalletIsInToReceive(PalletID, .ErrorString)
+<Implementation><![CDATA[
+	Set PalletID = $Extract(PalletID, 1, 8)
+	Quit ##class(EWMS.ToReceive).PalletIsInToReceive(PalletID, .ErrorString)
 ]]></Implementation>
 </Method>
 
@@ -908,9 +927,11 @@
 <Method name="HernoemPallet">
 <FormalSpec>OriginelePalletID:%String,NieuwePalletID:%String</FormalSpec>
 <Implementation><![CDATA[
-	If ($Length(NieuwePalletID) '= 8) {
-		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Nieuwe pallet ID moet 8 tekens lang zijn. Opgegeven PalletID:"_NieuwePalletID))
+	If (($Length(NieuwePalletID) < 8) || ($Length(NieuwePalletID) > 9)) {
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Nieuwe pallet ID moet 8 of 9 tekens lang zijn. Opgegeven PalletID:"_NieuwePalletID))
 	}
+	Set NieuwePalletID = $Extract(NieuwePalletID, 1, 8)
+	Set OriginelePalletID = $Extract(OriginelePalletID, 1, 8)
 	If (..IsPalletGeregistreerdOpEenLocatie(NieuwePalletID)) {
 		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Nieuwe pallet '"_NieuwePalletID_"' bestaat al."))
 	}
@@ -930,8 +951,11 @@
 	
 	#Dim MagazijnLocatie As DOM.MAG.MagazijnLocatie = ..GeefLocatieVoorDrager(OriginelePalletID)
 	Do ##class(EWMS.Locations).CreateEmpty(MagazijnLocatie.GeefMagazijn(), MagazijnLocatie.GeefGang(), MagazijnLocatie.GeefX(), MagazijnLocatie.GeefY(), , NieuwePalletID)
-	#Dim DoelLocatieID As %List = ##class(EWMS.TransLoc).GetTransLocation(MagazijnLocatie.GeefMagazijn() ,MagazijnLocatie.GeefGang(), MagazijnLocatie.GeefX(), MagazijnLocatie.GeefY())
-	
+	#Dim DoelLocatieID As %String = ##class(EWMS.TransLoc).GetTransLocation(MagazijnLocatie.GeefMagazijn() ,MagazijnLocatie.GeefGang(), MagazijnLocatie.GeefX(), MagazijnLocatie.GeefY())
+	If $$$Not($$$HasLength(DoelLocatieID)) && (..GeefLocatieVoorDrager(OriginelePalletID).GeefMagazijn()="04") {
+		Set DoelLocatieID = OrigineleLocatie.GeefID()
+	}
+		
 	Set ProductenOpPallet = ..GeefProductenOpPallet(OriginelePalletID)
 	#Dim LocatieOriginelePallet As %String = ""
 	
@@ -972,15 +996,14 @@
 
 <Method name="GeefLocatieVoorDrager">
 <FormalSpec>DragerID:%String</FormalSpec>
-<Private>1</Private>
 <ReturnType>DOM.MAG.MagazijnLocatie</ReturnType>
 <Implementation><![CDATA[
-	If ($Length(DragerID) > 8) {
+	If ($Length(DragerID) > 9) {
 		Set ExceptionDragerIDIsTeLang = ##class(TECH.Exceptions.InvalidUserInputException).%New("Een drager mag maximum 8 tekens bevatten.")
 		Do ExceptionDragerIDIsTeLang.VoegToeExtraInfo("DragerID : "_DragerID)
 		Do ##class(TECH.ExceptionHandler).Throw(ExceptionDragerIDIsTeLang)
 	}
-	
+	Set DragerID = $Extract(DragerID, 1, 8)
 	#Dim Locatie As DOM.MAG.MagazijnLocatie = ##class(DOM.DomeinContext).Instance().GeefMagazijnAPI().GeefMagazijnLocatie("")
 	#Dim SQL As %String = "SELECT L.loc_m As M,L.loc_g As G,L.loc_x As X,L.loc_y As Y FROM EWMS.Locations L WHERE Loc_id = ? "
 	#Dim ResultSet As %ResultSet = $$ExecDynQuery^vhLib.Query(SQL,$listbuild(DragerID))