Index: APPS/Halux/common/impl/ProductieGroepBepalerTBX.cls.xml
===================================================================
diff -u -r54787 -r54796
--- APPS/Halux/common/impl/ProductieGroepBepalerTBX.cls.xml	(.../ProductieGroepBepalerTBX.cls.xml)	(revision 54787)
+++ APPS/Halux/common/impl/ProductieGroepBepalerTBX.cls.xml	(.../ProductieGroepBepalerTBX.cls.xml)	(revision 54796)
@@ -41,7 +41,7 @@
 		Set ProductieGroep = ##class(APPS.Halux.common.enu.ProductieGroep).Specials()
 	} ElseIf ((Verpakking = ##class(DOM.PM.enu.TBXVerpakking).KastMetOnderdelen()) || (Verpakking = ##class(DOM.PM.enu.TBXVerpakking).KastZonderOnderdelen())) {
 		set ProductieGroep = ##class(APPS.Halux.common.enu.ProductieGroep).Pallet()
-		If (..IsKastKlant(ProductId)) {
+		If (..IsKastKlant(KlantId)) {
 			Set ProductieGroep = ##class(APPS.Halux.common.enu.ProductieGroep).Kast()
 		}
 	} ElseIf ((Verpakking = ##class(DOM.PM.enu.TBXVerpakking).Pallet()) || (Verpakking = ##class(DOM.PM.enu.TBXVerpakking).CommissieMetOnderdelen()) || (Verpakking = ##class(DOM.PM.enu.TBXVerpakking).CommissieZonderOnderdelen())) {
Index: vhUnitTest/BL/AutoReceptie/TestProductInTweeToeleveringen.cls.xml
===================================================================
diff -u -r44743 -r54796
--- vhUnitTest/BL/AutoReceptie/TestProductInTweeToeleveringen.cls.xml	(.../TestProductInTweeToeleveringen.cls.xml)	(revision 44743)
+++ vhUnitTest/BL/AutoReceptie/TestProductInTweeToeleveringen.cls.xml	(.../TestProductInTweeToeleveringen.cls.xml)	(revision 54796)
@@ -51,23 +51,31 @@
 <Default>O110000001</Default>
 </Parameter>
 
+<Parameter name="ProductId1">
+<Type>%Integer</Type>
+<Default>1163590</Default>
+</Parameter>
+
+<Parameter name="ProductId2">
+<Type>%Integer</Type>
+<Default>902644</Default>
+</Parameter>
+
 <Method name="OnBeforeOneTest">
 <FormalSpec>aTestName:%String</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	
-	do ##super()
+	Do ##super()
 	Do ..CleanUp()
-	Set QueueBuilder = ##class(vhUnitTest.APPS.VisiDot.impl.BuildQueue).%New()
 	
+	Set QueueBuilder = ##class(vhUnitTest.APPS.VisiDot.impl.BuildQueue).%New()
 	#dim SlotLabel1 As %String = 0
 	#dim SlotLabel2 As %String = 0
 	#dim SequenceNr1 As %Integer = 0
 	
 	/// QueueList : item1\item2\item3 			/// met volgende inhoud : PRNr,Aantal,VHossID	/// 
-	#dim ToeleveringQueueList1 As %String = "1163590;1;1.1\902644;2;1.1"
-	#dim ToeleveringQueueList2 As %String = "902644;3;1.1"
-	
+	#dim ToeleveringQueueList1 As %String = ..#ProductId1 _ ";1;1.1\" _ ..#ProductId2 _ ";2;1.1"
+	#dim ToeleveringQueueList2 As %String = ..#ProductId2 _ ";3;1.1"
 	Set ^KOD(..#KLNr,"F",..#OrderID1,1)="\03.11.11\EDI 305452/TBX\\\1239\OD5;1`OD5;2`OD5;3`OD5;4`OD5;5\1055#1100#62398,31366\\\\\\1\\\\EUR\\\00\2\\1055#62398,31378#116943\\\\\\\\\vh1  45 /d 4\\305452\\\\\\\\\\62398,31378"	
 	Set ^KOD(..#KLNr,"F",..#OrderID1,3) = ""
 	Set ^KOD(..#KLNr,"F",..#OrderID2,1)="\03.11.11\EDI 305452/TBX\\\1239\OD5;1`OD5;2`OD5;3`OD5;4`OD5;5\1055#1100#62398,31366\\\\\\1\\\\EUR\\\00\2\\1055#62398,31378#116943\\\\\\\\\vh1  45 /d 4\\305452\\\\\\\\\\62398,31378"
@@ -82,13 +90,15 @@
 	Set ..ToeleveringID1 = ##class(vhUnitTest.APPS.common.Toelevering).MaakToelevering(LeverancierNummer,ToeleveringQueueList1, ..#OrderID1)
 	Set ..ToeleveringID2 = ##class(vhUnitTest.APPS.common.Toelevering).MaakToelevering(LeverancierNummer,ToeleveringQueueList2, ..#OrderID2)
 		
-	#dim QueueList1 As %String = "1163590;1;1.1\902644;2;1.1"
-	Set QueueList1  = QueueList1_"\902644;3;1.1;"_..ToeleveringID2
+	#dim QueueList1 As %String = ..#ProductId1 _ ";1;1.1\" _ ..#ProductId2 _ ";2;1.1"
+	Set QueueList1 = QueueList1 _ "\" _ ..#ProductId2 _ ";3;1.1;"_..ToeleveringID2
 	
 	/// Batch opzetten
-	Set ..Batch = ##class(vhUnitTest.APPS.Halux.BatchUtils).GeefNieuweBatch()
 	#dim Toelevering1 As DOM.AKP.Toelevering = ToeleveringAPI.GeefToelevering(..ToeleveringID1)
 	#dim Toelevering2 As DOM.AKP.Toelevering = ToeleveringAPI.GeefToelevering(..ToeleveringID2)
+	
+	Set ..Batch = ##class(vhUnitTest.APPS.Halux.BatchUtils).GeefNieuweBatch()
+	
 	Do ..Batch.VoegToeToelevering(Toelevering1)
 	Do ..Batch.VoegToeToelevering(Toelevering2)
 	Do ..Batch.%Save()
@@ -102,7 +112,7 @@
 <Method name="OnAfterAllTests">
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	do ##super()
+	Do ##super()
 	Do ..CleanUp()
 ]]></Implementation>
 </Method>
@@ -118,11 +128,10 @@
 <Implementation><![CDATA[
 	#dim VHossDragerID1 As %String = ##class(APPS.VisiDot.impl.Tech).GeefPalletIDVanVHossID(..#VHossID1)
 	#dim UTReceptieGroep As %String = ##class(vhUnitTest.APPS.MAG.ReceptieServiceMock).GeefReceptieGroep()
-	Set ^UPRCP("B",UTReceptieGroep,1)="62942,40967\0\JBL"
-	Set ^UPRCP("B",UTReceptieGroep,1,1)="1163590\KICI\"_VHossDragerID1_"\"_..GeefVHossLocatie()_"\1\62942,40967\JBL\"_..ToeleveringID1
-	Set ^UPRCP("B",UTReceptieGroep,1,2)="902644\KICJ\"_VHossDragerID1_"\"_..GeefVHossLocatie()_"\2\62942,40967\JBL\"_..ToeleveringID1
-	Set ^UPRCP("B",UTReceptieGroep,1,3)="902644\KICJ\"_VHossDragerID1_"\"_..GeefVHossLocatie()_"\3\62942,40967\JBL\"_..ToeleveringID2
-	
+	Set ^UPRCP("B",UTReceptieGroep,1) = "62942,40967\0\JBL"
+	Set ^UPRCP("B",UTReceptieGroep,1,1) = ..#ProductId1 _ "\KICI\"_VHossDragerID1_"\"_..GeefVHossLocatie()_"\1\62942,40967\JBL\"_..ToeleveringID1
+	Set ^UPRCP("B",UTReceptieGroep,1,2) = ..#ProductId2 _ "\KICJ\"_VHossDragerID1_"\"_..GeefVHossLocatie()_"\2\62942,40967\JBL\"_..ToeleveringID1
+	Set ^UPRCP("B",UTReceptieGroep,1,3) = ..#ProductId2 _ "\KICJ\"_VHossDragerID1_"\"_..GeefVHossLocatie()_"\3\62942,40967\JBL\"_..ToeleveringID2
 	Set Data = ##class(BL.MB.UGLYPicking.Events.ToeFinishedEventData).%New(..ToeleveringID1,UTReceptieGroep,1)
 	Set Event = ##class(BL.MB.UGLYPicking.Events.ToeFinishedEvent).%New(Data)
 	Do ##class(BL.MB.UGLYPicking.Events.AutoReceptie).KoppelEnStuurDoor(Event)
@@ -133,9 +142,9 @@
 	#dim HadResultaat As %Boolean = 0
 	While ResultSet.Next(){
 		#dim ProductID As %String = ##class(TECH.StringUtils).Trim(ResultSet.Data("product"))
-		If ProductID = 1163590 {
+		If ProductID = ..#ProductId1 {
 			Do $$$AssertEquals(ResultSet.Data("Aantal"),"1.0","Aantal van product "_ProductID_" is correct op "_VHossDragerID1)	
-		}ElseIf ProductID = 902644 {
+		}ElseIf ProductID = ..#ProductId2 {
 			Do $$$AssertEquals(ResultSet.Data("Aantal"),"5.0","Aantal van product "_ProductID_" is correct op "_VHossDragerID1)	
 		}
 		Set HadResultaat = 1
@@ -147,25 +156,20 @@
 <Method name="CleanUp">
 <Implementation><![CDATA[
 	Kill ^UPRCP("B",##class(vhUnitTest.APPS.MAG.ReceptieServiceMock).GeefReceptieGroep())
-	
 	Do ##class(vhUnitTest.DataHelper).VerwijderOrder(..#OrderID1)
 	Do:$$$Not(..ToeleveringID1=0) ##class(vhUnitTest.DataHelper).VerwijderToelevering(..ToeleveringID1)		
-	
 	Do ##class(vhUnitTest.DataHelper).VerwijderOrder(..#OrderID2)
 	Do:$$$Not(..ToeleveringID2=0) ##class(vhUnitTest.DataHelper).VerwijderToelevering(..ToeleveringID2)
+	Kill ^EWPAL("D", ..#ProductId1, ..#VHossID1)
+	Kill ^EWPAL("D", ..#ProductId2, ..#VHossID1)
 	
-	k ^EWPAL("D",1163590,..#VHossID1)
-	k ^EWPAL("D",902644,..#VHossID1)
-	
 	If $IsObject(..Batch){
 		Do ..Batch.Delete()
 	}
 	
 	#dim VHossDragerID1 As %String = ##class(APPS.VisiDot.impl.Tech).GeefPalletIDVanVHossID(..#VHossID1)
-	
 	#dim Query As %String = "DELETE EWMS.Inventory where loc_id = ?"
 	Do ExecDynQuery^vhLib.Query(Query,$LB(VHossDragerID1))
-	
 	Set Query = "DELETE EWMS.Locations where loc_id = ?"
 	Do ExecDynQuery^vhLib.Query(Query,$LB(VHossDragerID1))
 ]]></Implementation>