Index: APPS/Halux/PPS/Verpakking/impl/LosseComponentenKartonWerkpost.cls.xml
===================================================================
diff -u -r30549 -r30803
--- APPS/Halux/PPS/Verpakking/impl/LosseComponentenKartonWerkpost.cls.xml	(.../LosseComponentenKartonWerkpost.cls.xml)	(revision 30549)
+++ APPS/Halux/PPS/Verpakking/impl/LosseComponentenKartonWerkpost.cls.xml	(.../LosseComponentenKartonWerkpost.cls.xml)	(revision 30803)
@@ -47,6 +47,22 @@
 <Implementation><![CDATA[	Do ..Logger.Debug("APPS.Halux.PPS.Verpakking.impl.LosseComponentenKartonWerkpost", "Gebruikte machine reeds correct ingevuld, dus wordt niet aangepast.")
 ]]></Implementation>
 </Method>
+
+<Query name="BatchIDList">
+<Type>%SQLQuery</Type>
+<SqlQuery>	SELECT Distinct(Batch.ID) As BatchID 
+	FROM APPS_Halux_PPS_Activiteit_impl_common_dto.KartonSnijdenUitvoeringInfo As UI 
+	JOIN APPS_Halux_common_impl.BatchImpl as Batch on Batch.ID = UI.BatchID 
+	WHERE (Batch.IsActief = 1) 
+	ORDER BY Batch.ID</SqlQuery>
+</Query>
+
+<Method name="GeefBatchIDLijst">
+<FormalSpec><![CDATA[&varDataSet:BL.Sys.Proxy.pxXMLDataSet]]></FormalSpec>
+<ReturnType>BL.Sys.Proxy.pxStatus</ReturnType>
+<Implementation><![CDATA[	Quit ##class(BL.Sys.Proxy.pxXMLDataSet).CreateQuery(.varDataSet,..%ClassName(1)_":BatchIDList")
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: WS/Prod/OptiBox/OptiServer.cls.xml
===================================================================
diff -u -r30802 -r30803
--- WS/Prod/OptiBox/OptiServer.cls.xml	(.../OptiServer.cls.xml)	(revision 30802)
+++ WS/Prod/OptiBox/OptiServer.cls.xml	(.../OptiServer.cls.xml)	(revision 30803)
@@ -689,12 +689,28 @@
 	
 	$$$CheckAccess($$$rsPPSTBXOptiBox,$$$prRead)
 
-	Set WPClassName=##class(BL.PPS.TBX.OptiBox).GetWPClassName(Werkpost)
-	Quit:(WPClassName="") $$$pxStatusErrorEx("Onbekende werkpost.",Werkpost)
-	
-	#dim QueryName as %String=WPClassName_":BatchIDList"
-	
-	Quit ##class(BL.Sys.Proxy.pxXMLDataSet).CreateQuery(.varDataSet,QueryName)
+
+	If ..IsOudeWijzeVanVerwerkingFromCategorie(##class(APPS.Halux.common.enu.Categorie).Tandembox(),Werkpost)
+	{
+
+		Set WPClassName=##class(BL.PPS.TBX.OptiBox).GetWPClassName(Werkpost)
+		Set:(WPClassName="") pxStatus=$$$pxStatusErrorEx("Onbekende werkpost (GetWPBatchIDsViaWerkpost).",Werkpost)
+		If $$$pxStatusIsOK(pxStatus)
+		{
+			#dim QueryName as %String=WPClassName_":BatchIDList"
+			Set pxStatus=##class(BL.Sys.Proxy.pxXMLDataSet).CreateQuery(.varDataSet,QueryName)
+		}
+	}
+	Else  ; Nieuwe verwerking
+	{
+		#dim WerkpostImpl As APPS.Halux.PPS.Verpakking.KartonWerkpost = ..GeefWerkpostImpl(Werkpost)
+		If (WerkpostImpl = "") {
+			Set pxStatus = $$$pxStatusErrorEx("Onbekende werkpost (GetWPBatchIDsViaWerkpost)" _ Werkpost, Werkpost)
+		} Else {
+			Set pxStatus = WerkpostImpl.GeefBatchIDLijst(.varDataSet)
+		}
+	}
+	Quit pxStatus
 ]]></Implementation>
 </Method>