Index: DOM/ProdRes/impl/VerwachteUitvoerAPIimpl.cls.xml
===================================================================
diff -u -r33071 -r33221
--- DOM/ProdRes/impl/VerwachteUitvoerAPIimpl.cls.xml	(.../VerwachteUitvoerAPIimpl.cls.xml)	(revision 33071)
+++ DOM/ProdRes/impl/VerwachteUitvoerAPIimpl.cls.xml	(.../VerwachteUitvoerAPIimpl.cls.xml)	(revision 33221)
@@ -12,12 +12,13 @@
 </Property>
 
 <Method name="%OnNew">
+<FormalSpec>QueryAPI:TECH.Query.QueryAPI=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..QueryAPI = ##class(TECH.Context).Instance().GeefQueryAPI()
+	Set ..QueryAPI = $$$Inject(QueryAPI, ##class(TECH.Context).Instance().GeefQueryAPI())
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -127,9 +128,19 @@
 <ReturnType>%Double</ReturnType>
 <Implementation><![CDATA[
 	#dim Aantal As %Float = 0
-	#dim Query As TECH.String = "SELECT Sum(R.Aantal) As Aantal FROM DOM_ProdRes_impl.UitvoerReservatieImpl R WHERE R.ProductID = ? AND R.ReservatieFase IN ('" _ ##class(TECH.ListUtils).ListToPieces(ReservatieFases, "', '") _ "') AND (R.DueOut is null OR R.DueOut <= ?) AND R.Bedrijf = ? AND (? = 1 OR IsTransferReservatie = 0)"
-	#dim ResultSet As TECH.ResultSet = ..QueryAPI.GetDynamicResultSet(Query, $ListBuild(ProductID, MaxDueOut, Bedrijf, InclusiefTransferReservatie))
+	#dim MogelijkeReservatieFases As TECH.String = ##class(TECH.ListUtils).ListToPieces(ReservatieFases, "', '")
+	#dim Statement As TECH.String = ""
+
+	Set Statement = Statement _ "SELECT Sum(Reservatie.Aantal) As Aantal FROM DOM_ProdRes_impl.UitvoerReservatieImpl Reservatie "
+	Set Statement = Statement _ "WHERE Reservatie.ProductID = ? "
+	Set Statement = Statement _ "AND Reservatie.ReservatieFase IN ('?') "
+	Set Statement = Statement _ "AND (Reservatie.DueOut is null OR Reservatie.DueOut <= ?) "
+	Set Statement = Statement _ "AND Reservatie.Bedrijf = ? "
+	Set Statement = Statement _ "AND (? = 1 OR IsTransferReservatie = 0)"
 	
+	#dim Query As TECH.DynamicQuery = ##class(TECH.DynamicQuery).%New(Statement, $ListBuild(ProductID, MogelijkeReservatieFases, MaxDueOut, Bedrijf, InclusiefTransferReservatie))
+	#dim ResultSet As TECH.ResultSet = ..QueryAPI.GetResultSet(Query)
+
 	If (ResultSet.Next()) {
 		Set Aantal = ResultSet.Data("Aantal")
 	}