Index: vhUnitTest/APPS/Halux/PPS/impl/PalletIDBepaler/GeefNieuwPalletID/Test.cls.xml
===================================================================
diff -u -r73175 -r73281
--- vhUnitTest/APPS/Halux/PPS/impl/PalletIDBepaler/GeefNieuwPalletID/Test.cls.xml	(.../Test.cls.xml)	(revision 73175)
+++ vhUnitTest/APPS/Halux/PPS/impl/PalletIDBepaler/GeefNieuwPalletID/Test.cls.xml	(.../Test.cls.xml)	(revision 73281)
@@ -135,6 +135,22 @@
 	Do $$$AssertEquals(PalletId, "TBP12345B")
 ]]></Implementation>
 </Method>
+
+<Method name="Test: GeefPalletId type TBP met ProductNummer op Probox en laatst gescande DnaCode was voor onderdelenpallet geeft volgende PalletId A">
+<Implementation><![CDATA[
+	#dim LaatstGescandePalletCode As %String = "TBX12345"
+	
+	Do ..PalletIDBepalerHelperMock.IndienMethodCall("GeefVerpakkingTypeVanProduct", ..#DummyProductNr).DanReturn("Probox")
+	Do ..PalletIDBepalerHelperMock.IndienMethodCall("GeefPalletCodeVanLaatstGescandeLade", ..#DummyToeleveringId).DanReturn(LaatstGescandePalletCode)
+	Do ..PalletIDBepalerHelperMock.IndienMethodCall("GeefSuffixVoorPalletCode", ..#DummyToeleveringId, LaatstGescandePalletCode).DanReturn("B")
+	
+	#dim Type = "TBP"
+	#dim PalletIdBepaler = ##class(APPS.Halux.PPS.impl.PalletIDBepaler).%New(..PalletIDBepalerHelperMock)
+	#dim PalletId = PalletIdBepaler.GeefNieuwPalletID(Type, ..#DummyToeleveringId, ..#DummyProductNr)
+	
+	Do $$$AssertEquals(PalletId, "TBP12346A")
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: APPS/Halux/PPS/impl/PalletIDBepaler.cls.xml
===================================================================
diff -u -r73169 -r73281
--- APPS/Halux/PPS/impl/PalletIDBepaler.cls.xml	(.../PalletIDBepaler.cls.xml)	(revision 73169)
+++ APPS/Halux/PPS/impl/PalletIDBepaler.cls.xml	(.../PalletIDBepaler.cls.xml)	(revision 73281)
@@ -53,10 +53,17 @@
 <Implementation><![CDATA[
 	#dim LaatstGescandePalletCode = ..PalletIDBepalerHelper.GeefPalletCodeVanLaatstGescandeLade(ToeleveringId)
 	#dim NieuwePalletCode As %String
+	#dim PalletNr As %Integer
 	
+	If ..IsPalletCodeVoorOnderdelenDoos(LaatstGescandePalletCode) {
+		Set PalletNr = ..GeefVolgendPalletNr()
+		Do ..Verwerk(Type)
+		Quit ..Prefix _ ##class(TECH.StringUtils).AlignRight(PalletNr,0, LengteBarcode - $Length(..Prefix)) _ "A"
+	}
+	
 	#dim Suffix As %String = ..PalletIDBepalerHelper.GeefSuffixVoorPalletCode(ToeleveringId, LaatstGescandePalletCode)
 	If (Suffix = "A") {
-		#dim PalletNr As %Integer = ..GeefVolgendPalletNr()
+		Set PalletNr = ..GeefVolgendPalletNr()
 		Do ..Verwerk(Type)
 		Set NieuwePalletCode = ..Prefix _ ##class(TECH.StringUtils).AlignRight(PalletNr,0, LengteBarcode - $Length(..Prefix)) _ "A"
 	} Else {
@@ -67,6 +74,14 @@
 ]]></Implementation>
 </Method>
 
+<Method name="IsPalletCodeVoorOnderdelenDoos">
+<FormalSpec>PalletCode:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit $$$Not($Extract(PalletCode, 1, 3) = "TBP")
+]]></Implementation>
+</Method>
+
 <Method name="GeefVolgendPalletNr">
 <Private>1</Private>
 <ReturnType>%Integer</ReturnType>
Index: APPS/MAG/Inventaris/impl/InventarisService.cls.xml
===================================================================
diff -u -r73265 -r73281
--- APPS/MAG/Inventaris/impl/InventarisService.cls.xml	(.../InventarisService.cls.xml)	(revision 73265)
+++ APPS/MAG/Inventaris/impl/InventarisService.cls.xml	(.../InventarisService.cls.xml)	(revision 73281)
@@ -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 = ?")
@@ -533,6 +534,7 @@
 <Method name="VerplaatsPallet">
 <FormalSpec>PalletID:%String,DoelLocatieID:%String</FormalSpec>
 <Implementation><![CDATA[
+	Set PalletID = $Extract(PalletID, 1, 8)
 	If (##class(APPS.VisiDot.impl.Tech).IsFrameID(PalletID)){
 		Set PalletID = ##class(APPS.VisiDot.impl.Tech).GeefPalletIDVanVHossID(PalletID)
 	}
@@ -564,6 +566,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)){
@@ -591,6 +594,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)
@@ -617,6 +621,7 @@
 <Private>1</Private>
 <ReturnType>%Integer</ReturnType>
 <Implementation><![CDATA[
+	Set PalletID = $Extract(PalletID, 1, 8)
 	#Dim Aantal As %Integer = ""
 	
 	Try {
@@ -695,6 +700,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)
@@ -823,6 +829,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 "
@@ -855,6 +862,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 = ? "
@@ -883,6 +891,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 "_
@@ -899,7 +908,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>
 
@@ -917,6 +928,7 @@
 		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."))
 	}