Index: APPS/MAG/InventarisService.cls.xml
===================================================================
diff -u -r2359 -r2372
--- APPS/MAG/InventarisService.cls.xml	(.../InventarisService.cls.xml)	(revision 2359)
+++ APPS/MAG/InventarisService.cls.xml	(.../InventarisService.cls.xml)	(revision 2372)
@@ -571,12 +571,20 @@
 	Set ProductenBijTeLaden = ##class(%ListOfObjects).%New()
 	
 	Set TePickenProducten = ..GeefTePickenProductInfo(BijladenTotTimeStamp)
-	Set arAantalPickbaar = ..GeefAantalPickbaar()
 	
+	Set ProductIDs = ##class(%ListOfDataTypes).%New()
 	Set TePickenProductenIt = ##class(TECH.ListIterator).%New(TePickenProducten)
 	While TePickenProductenIt.HasNext() 
 	{
 		Set TePickenProduct = TePickenProductenIt.Next()
+		Do ProductIDs.Insert(TePickenProduct.ProductID)		
+	}
+	Set arAantalPickbaar = ..GeefAantalPickbaar(ProductIDs)
+	
+	Set TePickenProductenIt = ##class(TECH.ListIterator).%New(TePickenProducten)
+	While TePickenProductenIt.HasNext() 
+	{
+		Set TePickenProduct = TePickenProductenIt.Next()
 		Set ProductID = TePickenProduct.ProductID
 		
 		/// Als er geen data is dat het product pickbaar is
@@ -595,6 +603,7 @@
 			{
 				Set ProductOpPallet	= ProductOpPalletIt.Next()
 				Set TePickenProduct.ProductData = ProductOpPallet.ProductData
+				If $L(TePickenProduct.ProductData.Code) = 0 { Set TePickenProduct.ProductData.Code = ProductID }
 				If ProductOpPallet.IsPickbaar {
 					Do TePickenProduct.PickbareLocaties.Insert(ProductOpPallet)
 				}Else {
@@ -645,19 +654,28 @@
 <Method name="GeefAantalPickbaar">
 <Description>
 Een array met ProductID als key en AantalPickbaar als value</Description>
-<FormalSpec>IsPickbaar:%Boolean=1</FormalSpec>
+<FormalSpec>ProductIDs:%ListOfDataTypes,IsPickbaar:%Boolean=1</FormalSpec>
 <Private>1</Private>
 <ReturnType>%ArrayOfDataTypes</ReturnType>
 <Implementation><![CDATA[
 	Set arAantalPickbaar = ##class(%ArrayOfDataTypes).%New()	
 	
+	Set IN = ""
+	Set ProductIDIt = ##class(TECH.ListIterator).%New(ProductIDs)
+	While ProductIDIt.HasNext(){
+		Set IN = IN_ProductIDIt.Next()
+		If ProductIDIt.HasNext(){
+			Set IN = IN_", "
+		}
+	}
 	Set ResultSet = ##class(%ResultSet).%New()	
-	Do ResultSet.Prepare("SELECT I.Product As ProductID, SUM(CAST(qty_pcs AS INT)) as Aantal"
+	Set Statement = "SELECT I.Product As ProductID, SUM(CAST(qty_pcs AS INT)) as Aantal"
 							 _" FROM EWMS.Inventory I"
 							 _" JOIN EWMS.Locations L ON I.loc_m = L.loc_m and I.loc_id = L.loc_id"
 							 _" LEFT JOIN EWMS.TransLoc T ON T.loc_m  = L.loc_m AND T.loc_g = L.loc_g AND T.loc_x = L.loc_x AND T.loc_y = L.loc_y"
 							 _" GROUP BY I.Product,T.Loc_ispickbaar, I.loc_m"
-							 _" HAVING T.loc_ispickbaar = ? AND I.loc_m < 5")
+							 _" HAVING T.loc_ispickbaar = ? AND I.loc_m < 5 AND I.Product IN ("_IN_")"
+	Do ResultSet.Prepare(Statement)
 	Set Status = ResultSet.Execute(IsPickbaar)
 	If $$$ISERR(Status) Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.StatusException).%New(##class(TECH.enu.ExceptionCode).GeneralError(),"Kon de aantal pickbare producten niet ophalen.",Status))
 	While ResultSet.Next()