Index: APPS/MAG/UGLYPicking/dto/Magazijn.cls.xml
===================================================================
diff -u -r1594 -r1662
--- APPS/MAG/UGLYPicking/dto/Magazijn.cls.xml	(.../Magazijn.cls.xml)	(revision 1594)
+++ APPS/MAG/UGLYPicking/dto/Magazijn.cls.xml	(.../Magazijn.cls.xml)	(revision 1662)
@@ -24,7 +24,7 @@
 </Property>
 
 <Property name="Status">
-<Type>%String</Type>
+<Type>APPS.MAG.UGLYPicking.enu.MagazijnStatus</Type>
 </Property>
 </Class>
 </Export>
Index: APPS/MAG/UGLYPicking/enu/MagazijnStatus.cls.xml
===================================================================
diff -u -r1578 -r1662
--- APPS/MAG/UGLYPicking/enu/MagazijnStatus.cls.xml	(.../MagazijnStatus.cls.xml)	(revision 1578)
+++ APPS/MAG/UGLYPicking/enu/MagazijnStatus.cls.xml	(.../MagazijnStatus.cls.xml)	(revision 1662)
@@ -7,7 +7,7 @@
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Parameter name="VALUELIST">
-<Default>;Superspoed;Dringend</Default>
+<Default>;Superspoed;Dringend;Afhaling</Default>
 </Parameter>
 
 <Method name="Superspoed">
@@ -23,5 +23,12 @@
 <Implementation><![CDATA[	Quit "Dringend"
 ]]></Implementation>
 </Method>
+
+<Method name="Afhaling">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.MAG.UGLYPicking.enu.MagazijnStatus</ReturnType>
+<Implementation><![CDATA[	Quit "Afhaling"
+]]></Implementation>
+</Method>
 </Class>
 </Export>
Index: APPS/MAG/UGLYPicking/impl/MagazijnStatusComparator.cls.xml
===================================================================
diff -u
--- APPS/MAG/UGLYPicking/impl/MagazijnStatusComparator.cls.xml	(revision 0)
+++ APPS/MAG/UGLYPicking/impl/MagazijnStatusComparator.cls.xml	(revision 1662)
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="APPS.MAG.UGLYPicking.impl.MagazijnStatusComparator">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%RegisteredObject,TECH.Comparator.IComparator</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="EnuMapping">
+<Type>%Integer</Type>
+<Collection>array</Collection>
+</Property>
+
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ..EnuMapping = ##class(%ArrayOfDataTypes).%New()
+	Do ..EnuMapping.SetAt(1,##class(APPS.MAG.UGLYPicking.enu.MagazijnStatus).Superspoed())
+	Do ..EnuMapping.SetAt(2,##class(APPS.MAG.UGLYPicking.enu.MagazijnStatus).Afhaling())
+	Do ..EnuMapping.SetAt(3,##class(APPS.MAG.UGLYPicking.enu.MagazijnStatus).Dringend())
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="GeefWaarde">
+<FormalSpec>MagazijnStatus:APPS.MAG.UGLYPicking.enu.MagazijnStatus</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Set Waarde = ..EnuMapping.Count()+1
+	If (MagazijnStatus '= "")
+	{
+		Set Waarde = ..EnuMapping.GetAt(MagazijnStatus)
+	}
+	Quit Waarde
+]]></Implementation>
+</Method>
+
+<Method name="IsKleinerDan">
+<FormalSpec>Waarde1:%String,Waarde2:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ..GeefWaarde(Waarde1) < ..GeefWaarde(Waarde2)
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: CSC Ugly Picking.prj.xml
===================================================================
diff -u -r1608 -r1662
--- CSC Ugly Picking.prj.xml	(.../CSC Ugly Picking.prj.xml)	(revision 1608)
+++ CSC Ugly Picking.prj.xml	(.../CSC Ugly Picking.prj.xml)	(revision 1662)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="9">
-<Project name="CSC Ugly Picking" LastModified="2011-07-05 14:16:14">
+<Project name="CSC Ugly Picking" LastModified="2011-07-12 13:19:17">
   <Items>
     <ProjectItem name="APPS.MAG.UGLYPicking.dto.Bon" type="CLS"/>
     <ProjectItem name="APPS.MAG.UGLYPicking.dto.Bonnen" type="CLS"/>
@@ -20,8 +20,10 @@
     <ProjectItem name="APPS.MAG.UGLYPicking.enu.BonStatus" type="CLS"/>
     <ProjectItem name="APPS.MAG.UGLYPicking.enu.Magazijn" type="CLS"/>
     <ProjectItem name="APPS.MAG.UGLYPicking.enu.MagazijnStatus" type="CLS"/>
+    <ProjectItem name="APPS.MAG.UGLYPicking.enu.PickActie" type="CLS"/>
     <ProjectItem name="APPS.MAG.UGLYPicking.enu.UitstelOptie" type="CLS"/>
     <ProjectItem name="APPS.MAG.UGLYPicking.impl.BonInMagazijnIterator" type="CLS"/>
+    <ProjectItem name="APPS.MAG.UGLYPicking.impl.BonStatusComparator" type="CLS"/>
     <ProjectItem name="APPS.MAG.UGLYPicking.impl.EventCatcher" type="CLS"/>
     <ProjectItem name="APPS.MAG.UGLYPicking.impl.Sessie" type="CLS"/>
     <ProjectItem name="APPS.MAG.UGLYPicking.impl.SublijnInBonIterator" type="CLS"/>
Index: APPS/MAG/UGLYPicking/impl/UglyPickingService.cls.xml
===================================================================
diff -u -r1658 -r1662
--- APPS/MAG/UGLYPicking/impl/UglyPickingService.cls.xml	(.../UglyPickingService.cls.xml)	(revision 1658)
+++ APPS/MAG/UGLYPicking/impl/UglyPickingService.cls.xml	(.../UglyPickingService.cls.xml)	(revision 1662)
@@ -154,6 +154,8 @@
 	Set Delimiter = $Extract(MagazijnNamen,1,1)
 	Set MagazijnNamen = $Extract(MagazijnNamen,2,$Length(MagazijnNamen))
 	
+	Set MagazijnStatusComparator = ##class(APPS.MAG.UGLYPicking.impl.MagazijnStatusComparator).%New()
+	
 	Set MagazijnNaamIterator = ##class(TECH.PiecesIterator).%New(MagazijnNamen,Delimiter)
 	While (MagazijnNaamIterator.HasNext())
 	{
@@ -173,20 +175,28 @@
 			Set OrderHoofding = ##class(Flow.OrderWMS.Hoofding).%OpenId(BonNr,0)
 			Set DueOutTime = ##class(TECH.DateTime).HorologToTimeStamp(OrderHoofding.DueOutTime)
 			
+			Set Status = ""
 			If (##class(TECH.DateTime).CurrentTimeStamp() ] DueOutTime)
 			{
 				If (OrderHoofding.Klant.Nummer = ##class(DOM.DomeinContext).Instance().GeefKlantAPI().GeefKlantKeller().GeefNummer())
 				{
 					Set Status = ##class(APPS.MAG.UGLYPicking.enu.MagazijnStatus).Superspoed()
 				}
-				ElseIf (Status '=  ##class(APPS.MAG.UGLYPicking.enu.MagazijnStatus).Superspoed()) // Enkel status invullen met dringend als deze nog niet op superspoed stond
+				Else
 				{
 					Set Status = ##class(APPS.MAG.UGLYPicking.enu.MagazijnStatus).Dringend()
 				}
 			}
+			ElseIf ($Extract(OrderHoofding.VerzendWijze,1,2) = "AF")
+			{
+				Set Status = ##class(APPS.MAG.UGLYPicking.enu.MagazijnStatus).Afhaling()
+			}
 		}
 		
-		Set Magazijn.Status = Status
+		If (MagazijnStatusComparator.IsKleinerDan(Status,Magazijn.Status))
+		{
+			Set Magazijn.Status = Status
+		}
 		
 		Do Magazijnen.Insert(Magazijn)
 	}
@@ -377,8 +387,7 @@
 		Do ProductLijnenPerPallet.GetAt(ProductLijn.PalletID).Insert(ProductLijn)
 	}
 	
-	// Nog eens voor alle palletten controleren of de volledige pallet kan gepicked worden.
-	
+	// Nog eens voor alle palletten controleren of de volledige pallet kan gepicked worden.	
 	Set ProductLijnPerPalletIterator = ##class(TECH.ListIterator).%New(ProductLijnenPerPallet)
 	While (ProductLijnPerPalletIterator.HasNext())
 	{