Index: WS/MAG/UGLYPicking/UGLYPickingService.cls.xml
===================================================================
diff -u -r1649 -r1650
--- WS/MAG/UGLYPicking/UGLYPickingService.cls.xml	(.../UGLYPickingService.cls.xml)	(revision 1649)
+++ WS/MAG/UGLYPicking/UGLYPickingService.cls.xml	(.../UGLYPickingService.cls.xml)	(revision 1650)
@@ -29,6 +29,14 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefVolgendeVrijeBon">
+<FormalSpec>MagazijnID:APPS.MAG.UGLYPicking.enu.Magazijn</FormalSpec>
+<ReturnType>APPS.MAG.UGLYPicking.dto.Bon</ReturnType>
+<WebMethod>1</WebMethod>
+<Implementation><![CDATA[	Quit ##class(APPS.MAG.UglyPickingService).%New().GeefVolgendeVrijeBon(MagazijnID)
+]]></Implementation>
+</Method>
+
 <Method name="GeefProductLijnen">
 <FormalSpec>BonNr:%Integer,MagazijnID:APPS.MAG.UGLYPicking.enu.Magazijn</FormalSpec>
 <ReturnType>APPS.MAG.UGLYPicking.dto.ProductLijnen</ReturnType>
Index: APPS/MAG/UGLYPicking/dto/Bon.cls.xml
===================================================================
diff -u -r1582 -r1650
--- APPS/MAG/UGLYPicking/dto/Bon.cls.xml	(.../Bon.cls.xml)	(revision 1582)
+++ APPS/MAG/UGLYPicking/dto/Bon.cls.xml	(.../Bon.cls.xml)	(revision 1650)
@@ -7,6 +7,7 @@
 
 <Property name="AantalLijnen">
 <Type>%Integer</Type>
+<Required>1</Required>
 </Property>
 
 <Property name="AantalActieveLijnen">
@@ -21,6 +22,10 @@
 <Type>%TimeStamp</Type>
 </Property>
 
+<Property name="IsDringend">
+<Type>%Boolean</Type>
+</Property>
+
 <Property name="Klant">
 <Type>%String</Type>
 </Property>
Index: APPS/MAG/UglyPickingService.cls.xml
===================================================================
diff -u -r1649 -r1650
--- APPS/MAG/UglyPickingService.cls.xml	(.../UglyPickingService.cls.xml)	(revision 1649)
+++ APPS/MAG/UglyPickingService.cls.xml	(.../UglyPickingService.cls.xml)	(revision 1650)
@@ -27,6 +27,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefVolgendeVrijeBon">
+<FormalSpec>MagazijnID:APPS.MAG.UGLYPicking.enu.Magazijn</FormalSpec>
+<ReturnType>APPS.MAG.UGLYPicking.dto.Bon</ReturnType>
+<Implementation><![CDATA[	Quit ..Service.GeefVolgendeVrijeBon(MagazijnID)
+]]></Implementation>
+</Method>
+
 <Method name="GeefBonnen">
 <FormalSpec>MagazijnID:APPS.MAG.UGLYPicking.enu.Magazijn</FormalSpec>
 <ReturnType>APPS.MAG.UGLYPicking.dto.Bonnen</ReturnType>
Index: APPS/MAG/UGLYPicking/impl/UglyPickingService.cls.xml
===================================================================
diff -u -r1649 -r1650
--- APPS/MAG/UGLYPicking/impl/UglyPickingService.cls.xml	(.../UglyPickingService.cls.xml)	(revision 1649)
+++ APPS/MAG/UGLYPicking/impl/UglyPickingService.cls.xml	(.../UglyPickingService.cls.xml)	(revision 1650)
@@ -27,11 +27,27 @@
 	
 	Set Bon = ..GeefBonBasis(BonNr)
 	
-	Set Magazijnen = ^ORDW("IW",BonNr)
+	Set Magazijnen = ##class(%ArrayOfDataTypes).%New()
+	Set OrderHoofding = ##class(Flow.OrderWMS.Hoofding).%OpenId(BonNr,0)
 	
-	For i=1:1:$Length(Magazijnen)
+	If ((OrderHoofding.StatusWMS = "W") || (OrderHoofding.StatusWMS = "P"))
 	{
-		Set MagazijnLetter = $Extract(Magazijnen,i,i)
+		Set SublijnIterator = ##class(APPS.MAG.UGLYPicking.impl.SublijnInBonIterator).%New(BonNr)
+		While (SublijnIterator.HasNext())
+		{
+			Set Sublijn = SublijnIterator.Next()
+			If (Sublijn.StatusWMS="W")
+			{
+				Do Magazijnen.SetAt("",Sublijn.VerwerkingSoftware)
+			}
+		}
+	}
+	
+	Set MagazijnenIterator = ##class(TECH.ListIterator).%New(Magazijnen)	
+	While (MagazijnenIterator.HasNext())
+	{
+		Do MagazijnenIterator.Next()
+		Set MagazijnLetter = MagazijnenIterator.Key()
 		If (##class(APPS.MAG.UGLYPicking.enu.Magazijn).IsValidDT(MagazijnLetter))
 		{
 			Set Magazijn = ##class(APPS.MAG.UGLYPicking.dto.Magazijn).%New()
@@ -45,6 +61,22 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefVolgendeVrijeBon">
+<FormalSpec>MagazijnID:APPS.MAG.UGLYPicking.enu.Magazijn</FormalSpec>
+<ReturnType>APPS.MAG.UGLYPicking.dto.Bon</ReturnType>
+<Implementation><![CDATA[
+	Set Bon = ""
+	Set BonIterator = ##class(APPS.MAG.UGLYPicking.impl.BonInMagazijnIterator).%New(MagazijnID)
+	
+	If (BonIterator.HasNext())
+	{
+		Set Bon = ..GeefBon(BonIterator.Next())
+	}
+	
+	Quit Bon
+]]></Implementation>
+</Method>
+
 <Method name="GeefBonnen">
 <FormalSpec>MagazijnID:APPS.MAG.UGLYPicking.enu.Magazijn</FormalSpec>
 <ReturnType>APPS.MAG.UGLYPicking.dto.Bonnen</ReturnType>
@@ -104,6 +136,7 @@
 	Set Bon.BonNr = BonNr
 		
 	Set Bon.DueOut = ##class(TECH.DateTime).HorologToTimeStamp(OrderHoofding.DueOutTime)
+	Set Bon.IsDringend = ##class(TECH.DateTime).CurrentTimeStamp() ] Bon.DueOut
 	Set Bon.Klant = OrderHoofding.Klant.Naam
 	Set Bon.Land = $$LAND^vhRtn1(OrderHoofding.Klant.Nummer,"K")