Index: APPS/MAG/UGLYPicking/impl/BonInMagazijnIterator.cls.xml
===================================================================
diff -u
--- APPS/MAG/UGLYPicking/impl/BonInMagazijnIterator.cls.xml	(revision 0)
+++ APPS/MAG/UGLYPicking/impl/BonInMagazijnIterator.cls.xml	(revision 1578)
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="APPS.MAG.UGLYPicking.impl.BonInMagazijnIterator">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%RegisteredObject,TECH.Iterator</Super>
+
+<Property name="Magazijn">
+<Type>APPS.MAG.UGLYPicking.enu.Magazijn</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="HuidigConsolidatieNr">
+<Type>%Integer</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>MagazijnNaam:%String</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ..Magazijn = ##class(APPS.MAG.UGLYPicking.enu.Magazijn).DisplayToLogical(MagazijnNaam)
+	Do ..BepaalVolgende()
+	Quit $$$OK
+
+]]></Implementation>
+</Method>
+
+<Method name="HasNext">
+<Description>
+Returns true if the iteration has more elements.</Description>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	Quit ..HuidigConsolidatieNr '= ""
+
+]]></Implementation>
+</Method>
+
+<Method name="Next">
+<Description>
+Returns the next element in the iteration.
+Only returns a valid element if HasNext() returns true
+Causes an error if HasNext() returns false</Description>
+<ReturnType>%CacheString</ReturnType>
+<Implementation><![CDATA[
+	Set ConsolidatieNr = ..HuidigConsolidatieNr
+	Do ..BepaalVolgende()
+	Quit ConsolidatieNr
+
+]]></Implementation>
+</Method>
+
+<Method name="BepaalVolgende">
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set ..HuidigConsolidatieNr = $Order(^ORDW("IW",..HuidigConsolidatieNr))
+	While (..HuidigConsolidatieNr '= "") && ('(..Magazijn [ ^ORDW("IW",..HuidigConsolidatieNr)))
+	{
+		Set ..HuidigConsolidatieNr = $Order(^ORDW("IW",..HuidigConsolidatieNr))
+	}
+
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: vhUnitTest/APPS/MAG/UGLYPicking/TestUglyPickingService.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/MAG/UGLYPicking/TestUglyPickingService.cls.xml	(revision 0)
+++ vhUnitTest/APPS/MAG/UGLYPicking/TestUglyPickingService.cls.xml	(revision 1578)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="vhUnitTest.APPS.MAG.UGLYPicking.TestUglyPickingService">
+<Description>
+Do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","APPS.MAG.UGLYPicking.TestUglyPickingService")</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>vhUnitTest.TestCase</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Method name="TestGeefMagazijnen">
+<Implementation><![CDATA[
+	Set Service = ##class(APPS.MAG.UGLYPicking.impl.UglyPickingService).%New()
+	
+	Set Magazijnen = Service.GeefMagazijnen()
+	
+	Do $$$AssertTrue($IsObject(Magazijnen),"Een magazijnen object werd teruggegeven")
+	
+	Do $$$AssertEquals(Magazijnen.Lijst.Count(),5,"Er zijn 5 magazijnen")
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: APPS/MAG/UGLYPicking/enu/BonStatus.cls.xml
===================================================================
diff -u -r1576 -r1578
--- APPS/MAG/UGLYPicking/enu/BonStatus.cls.xml	(.../BonStatus.cls.xml)	(revision 1576)
+++ APPS/MAG/UGLYPicking/enu/BonStatus.cls.xml	(.../BonStatus.cls.xml)	(revision 1578)
@@ -1,15 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="9">
 <Class name="APPS.MAG.UGLYPicking.enu.BonStatus">
+<ClassType>datatype</ClassType>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>%RegisteredObject</Super>
+<Super>%String</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
 
-<Property name="InGebruik">
-<Type>%Integer</Type>
-</Property>
+<Parameter name="VALUELIST">
+<Default>;InGebruik;Vrij</Default>
+</Parameter>
 
-<Property name="Vrij">
-<Type>%Integer</Type>
-</Property>
+<Method name="InGebruik">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.MAG.UGLYPicking.enu.BonStatus</ReturnType>
+<Implementation><![CDATA[	Quit "InGebruik"
+]]></Implementation>
+</Method>
+
+<Method name="Vrij">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.MAG.UGLYPicking.enu.BonStatus</ReturnType>
+<Implementation><![CDATA[	Quit "Vrij"
+]]></Implementation>
+</Method>
 </Class>
 </Export>
Index: APPS/MAG/UGLYPicking/dto/Magazijnen.cls.xml
===================================================================
diff -u -r1576 -r1578
--- APPS/MAG/UGLYPicking/dto/Magazijnen.cls.xml	(.../Magazijnen.cls.xml)	(revision 1576)
+++ APPS/MAG/UGLYPicking/dto/Magazijnen.cls.xml	(.../Magazijnen.cls.xml)	(revision 1578)
@@ -3,8 +3,9 @@
 <Class name="APPS.MAG.UGLYPicking.dto.Magazijnen">
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject,%XML.Adaptor</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
 
-<Property name="Magazijnen">
+<Property name="Lijst">
 <Type>APPS.MAG.UGLYPicking.dto.Magazijn</Type>
 <Collection>list</Collection>
 </Property>
Index: TECH/DateTime.cls.xml
===================================================================
diff -u -r1482 -r1578
--- TECH/DateTime.cls.xml	(.../DateTime.cls.xml)	(revision 1482)
+++ TECH/DateTime.cls.xml	(.../DateTime.cls.xml)	(revision 1578)
@@ -13,6 +13,14 @@
 ]]></Implementation>
 </Method>
 
+<Method name="HorologToTimeStamp">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Horolog:%String</FormalSpec>
+<ReturnType>%TimeStamp</ReturnType>
+<Implementation><![CDATA[	Quit $zdt(Horolog,3)
+]]></Implementation>
+</Method>
+
 <Method name="TimestampToSeconds">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>Timestamp:%TimeStamp</FormalSpec>
Index: WS/MAG/UGLYPicking/UGLYPickingService.cls.xml
===================================================================
diff -u
--- WS/MAG/UGLYPicking/UGLYPickingService.cls.xml	(revision 0)
+++ WS/MAG/UGLYPicking/UGLYPickingService.cls.xml	(revision 1578)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="WS.MAG.UGLYPicking.UGLYPickingService">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>WS.WebService</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Parameter name="SERVICENAME">
+<Default>UGLYPicking</Default>
+</Parameter>
+
+<Parameter name="NAMESPACE">
+<Default>http://www.vanhoecke.be/MAG/UGLYPicking</Default>
+</Parameter>
+
+<Method name="GeefMagazijnen">
+<ReturnType>APPS.MAG.UGLYPicking.dto.Magazijnen</ReturnType>
+<WebMethod>1</WebMethod>
+<Implementation><![CDATA[	Quit ##class(APPS.MAG.UglyPickingService).%New().GeefMagazijnen()
+]]></Implementation>
+</Method>
+
+<Method name="GeefBonnen">
+<FormalSpec>MagazijnNaam:%String</FormalSpec>
+<ReturnType>APPS.MAG.UGLYPicking.dto.Bonnen</ReturnType>
+<WebMethod>1</WebMethod>
+<Implementation><![CDATA[	Quit ##class(APPS.MAG.UglyPickingService).%New().GeefBonnen(MagazijnNaam)
+]]></Implementation>
+</Method>
+
+<Method name="GeefBon">
+<FormalSpec>BonNr:%Integer</FormalSpec>
+<ReturnType>APPS.MAG.UGLYPicking.dto.Bon</ReturnType>
+<WebMethod>1</WebMethod>
+<Implementation><![CDATA[	Quit ##class(APPS.MAG.UglyPickingService).%New().GeefBon(BonNr)
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: APPS/MAG/UGLYPicking/impl/Sessie.cls.xml
===================================================================
diff -u -r1576 -r1578
--- APPS/MAG/UGLYPicking/impl/Sessie.cls.xml	(.../Sessie.cls.xml)	(revision 1576)
+++ APPS/MAG/UGLYPicking/impl/Sessie.cls.xml	(.../Sessie.cls.xml)	(revision 1578)
@@ -3,6 +3,7 @@
 <Class name="APPS.MAG.UGLYPicking.impl.Sessie">
 <ProcedureBlock>1</ProcedureBlock>
 <Super>TECH.ChangeInfo</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="DeviceNaam">
 <Type>%String</Type>
@@ -13,5 +14,29 @@
 <Type>%String</Type>
 <Private>1</Private>
 </Property>
+
+<Method name="%OnNew">
+<FormalSpec>DeviceNaam:%String,IP:%String</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ..DeviceNaam = DeviceNaam
+	Set ..IP = IP
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="GeefDeviceNaam">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..DeviceNaam
+]]></Implementation>
+</Method>
+
+<Method name="GeefIP">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..IP
+]]></Implementation>
+</Method>
 </Class>
 </Export>
Index: CSC Ugly Picking.prj.xml
===================================================================
diff -u -r1576 -r1578
--- CSC Ugly Picking.prj.xml	(.../CSC Ugly Picking.prj.xml)	(revision 1576)
+++ CSC Ugly Picking.prj.xml	(.../CSC Ugly Picking.prj.xml)	(revision 1578)
@@ -1,5 +1,85 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="9">
-<Project name="CSC Ugly Picking" LastModified="2011-07-01 09:27:53">
+<Project name="CSC Ugly Picking" LastModified="2011-07-01 15:41:54">
+  <Items>
+    <ProjectItem name="APPS.MAG.UGLYPicking.dto.Bon" type="CLS"/>
+    <ProjectItem name="APPS.MAG.UGLYPicking.dto.Bonnen" type="CLS"/>
+    <ProjectItem name="APPS.MAG.UGLYPicking.dto.GepickedProduct" type="CLS"/>
+    <ProjectItem name="APPS.MAG.UGLYPicking.dto.Inhoud" type="CLS"/>
+    <ProjectItem name="APPS.MAG.UGLYPicking.dto.Magazijn" type="CLS"/>
+    <ProjectItem name="APPS.MAG.UGLYPicking.dto.Magazijnen" type="CLS"/>
+    <ProjectItem name="APPS.MAG.UGLYPicking.dto.Pallet" type="CLS"/>
+    <ProjectItem name="APPS.MAG.UGLYPicking.dto.ProductLijn" type="CLS"/>
+    <ProjectItem name="APPS.MAG.UGLYPicking.dto.ProductLijnOplossing" type="CLS"/>
+    <ProjectItem name="APPS.MAG.UGLYPicking.dto.ProductLijnProbleem" type="CLS"/>
+    <ProjectItem name="APPS.MAG.UGLYPicking.dto.ProductLijnen" type="CLS"/>
+    <ProjectItem name="APPS.MAG.UGLYPicking.dto.ReservatieProbleem" type="CLS"/>
+    <ProjectItem name="APPS.MAG.UGLYPicking.dto.Sessie" type="CLS"/>
+    <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.UitstelOptie" type="CLS"/>
+    <ProjectItem name="APPS.MAG.UGLYPicking.impl.BonInMagazijnIterator" 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.UglyPickingService" type="CLS"/>
+    <ProjectItem name="APPS.MAG.UglyPickingService" type="CLS"/>
+    <ProjectItem name="BL.MB.UGLYPicking.Aventosbak.Aventosbak" type="CLS"/>
+    <ProjectItem name="BL.MB.UGLYPicking.Aventosbak.Doc.Aventos" type="CLS"/>
+    <ProjectItem name="BL.MB.UGLYPicking.Aventosbak.Doc.Bak" type="CLS"/>
+    <ProjectItem name="BL.MB.UGLYPicking.Aventosbak.Doc.Vak" type="CLS"/>
+    <ProjectItem name="BL.MB.UGLYPicking.CycleCount" type="CLS"/>
+    <ProjectItem name="BL.MB.UGLYPicking.Events.AutoReceptie" type="CLS"/>
+    <ProjectItem name="BL.MB.UGLYPicking.Events.Subscription" type="CLS"/>
+    <ProjectItem name="BL.MB.UGLYPicking.Events.ToeFinishedEvent" type="CLS"/>
+    <ProjectItem name="BL.MB.UGLYPicking.Events.ToeFinishedEventData" type="CLS"/>
+    <ProjectItem name="BL.MB.UGLYPicking.General" type="CLS"/>
+    <ProjectItem name="BL.MB.UGLYPicking.Locations" type="CLS"/>
+    <ProjectItem name="BL.MB.UGLYPicking.Opslag" type="CLS"/>
+    <ProjectItem name="BL.MB.UGLYPicking.OrderFeedback" type="CLS"/>
+    <ProjectItem name="BL.MB.UGLYPicking.OrderOpkuis" type="CLS"/>
+    <ProjectItem name="BL.MB.UGLYPicking.OrderReservatie" type="CLS"/>
+    <ProjectItem name="BL.MB.UGLYPicking.OrderSel" type="CLS"/>
+    <ProjectItem name="BL.MB.UGLYPicking.PalletPick" type="CLS"/>
+    <ProjectItem name="BL.MB.UGLYPicking.Receptie" type="CLS"/>
+    <ProjectItem name="BL.MB.UGLYPicking.ReceptieOpkuis" type="CLS"/>
+    <ProjectItem name="BL.MB.UGLYPicking.ReceptieProductie" type="CLS"/>
+    <ProjectItem name="BL.MB.UGLYPicking.sub.pxLocationLabel" type="CLS"/>
+    <ProjectItem name="UI.MB.UGLYPicking.MainForm" type="CLS"/>
+    <ProjectItem name="UI.MB.UGLYPicking.dlgCC" type="CLS"/>
+    <ProjectItem name="UI.MB.UGLYPicking.dlgCCLocationsSummary" type="CLS"/>
+    <ProjectItem name="UI.MB.UGLYPicking.dlgCCProdSel" type="CLS"/>
+    <ProjectItem name="UI.MB.UGLYPicking.dlgCCRedenen" type="CLS"/>
+    <ProjectItem name="UI.MB.UGLYPicking.dlgChargeInput" type="CLS"/>
+    <ProjectItem name="UI.MB.UGLYPicking.dlgDueOutDelay" type="CLS"/>
+    <ProjectItem name="UI.MB.UGLYPicking.dlgKB" type="CLS"/>
+    <ProjectItem name="UI.MB.UGLYPicking.dlgLogon" type="CLS"/>
+    <ProjectItem name="UI.MB.UGLYPicking.dlgMsgBox" type="CLS"/>
+    <ProjectItem name="UI.MB.UGLYPicking.dlgNoAlloc" type="CLS"/>
+    <ProjectItem name="UI.MB.UGLYPicking.dlgOpslagBijladen" type="CLS"/>
+    <ProjectItem name="UI.MB.UGLYPicking.dlgOpslagPalSel" type="CLS"/>
+    <ProjectItem name="UI.MB.UGLYPicking.dlgOpslagReceptieDetail" type="CLS"/>
+    <ProjectItem name="UI.MB.UGLYPicking.dlgOrderList" type="CLS"/>
+    <ProjectItem name="UI.MB.UGLYPicking.dlgOrderPick" type="CLS"/>
+    <ProjectItem name="UI.MB.UGLYPicking.dlgOrderPickActie" type="CLS"/>
+    <ProjectItem name="UI.MB.UGLYPicking.dlgOrderSel" type="CLS"/>
+    <ProjectItem name="UI.MB.UGLYPicking.dlgPalletPick" type="CLS"/>
+    <ProjectItem name="UI.MB.UGLYPicking.dlgPickList" type="CLS"/>
+    <ProjectItem name="UI.MB.UGLYPicking.dlgPickListActie" type="CLS"/>
+    <ProjectItem name="UI.MB.UGLYPicking.dlgReceptie" type="CLS"/>
+    <ProjectItem name="UI.MB.UGLYPicking.dlgReceptieChargeInput" type="CLS"/>
+    <ProjectItem name="UI.MB.UGLYPicking.dlgReceptieChargeList" type="CLS"/>
+    <ProjectItem name="UI.MB.UGLYPicking.dlgReceptieControle" type="CLS"/>
+    <ProjectItem name="UI.MB.UGLYPicking.dlgReceptieSel" type="CLS"/>
+    <ProjectItem name="UI.MB.UGLYPicking.dlgReceptieTBH" type="CLS"/>
+    <ProjectItem name="UI.MB.UGLYPicking.dlgReceptieWijzig" type="CLS"/>
+    <ProjectItem name="UI.MB.UGLYPicking.dlgReceptieWijzigTBH" type="CLS"/>
+    <ProjectItem name="UI.MB.UGLYPicking.dlgVirtualNrKbd" type="CLS"/>
+    <ProjectItem name="UI.MB.UGLYPicking.dlgWijzigAantal" type="CLS"/>
+    <ProjectItem name="UI.MB.UGLYPicking.dlgZendAutoList" type="CLS"/>
+    <ProjectItem name="UI.MB.UGLYPicking.dlgZendAutoOptions" type="CLS"/>
+    <ProjectItem name="WS.MAG.UGLYPicking.UGLYPickingService" type="CLS"/>
+    <ProjectItem name="vhUnitTest.APPS.MAG.UGLYPicking.TestUglyPickingService" type="CLS"/>
+  </Items>
 </Project>
 </Export>
Index: APPS/MAG/UglyPickingService.cls.xml
===================================================================
diff -u -r1576 -r1578
--- APPS/MAG/UglyPickingService.cls.xml	(.../UglyPickingService.cls.xml)	(revision 1576)
+++ APPS/MAG/UglyPickingService.cls.xml	(.../UglyPickingService.cls.xml)	(revision 1578)
@@ -5,21 +5,39 @@
 <Super>%RegisteredObject</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
+<Property name="Service">
+<Type>APPS.MAG.UglyPickingService</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ..Service = ##class(APPS.MAG.UGLYPicking.impl.UglyPickingService).%New()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="GeefBon">
 <FormalSpec>BonNr:%Integer</FormalSpec>
 <ReturnType>APPS.MAG.UGLYPicking.dto.Bon</ReturnType>
-<Implementation><![CDATA[]]></Implementation>
+<Implementation><![CDATA[	Quit ..Service.GeefBon(BonNr)
+]]></Implementation>
 </Method>
 
 <Method name="GeefBonnen">
 <FormalSpec>MagazijnNaam:%String</FormalSpec>
 <ReturnType>APPS.MAG.UGLYPicking.dto.Bonnen</ReturnType>
-<Implementation><![CDATA[]]></Implementation>
+<Implementation><![CDATA[	Quit ..Service.GeefBonnen(MagazijnNaam)
+]]></Implementation>
 </Method>
 
 <Method name="GeefMagazijnen">
 <ReturnType>APPS.MAG.UGLYPicking.dto.Magazijnen</ReturnType>
-<Implementation><![CDATA[]]></Implementation>
+<Implementation><![CDATA[	Quit ..Service.GeefMagazijnen()
+]]></Implementation>
 </Method>
 
 <Method name="GeefOpenstaandeSessies">
Index: APPS/MAG/UGLYPicking/impl/UglyPickingService.cls.xml
===================================================================
diff -u -r1576 -r1578
--- APPS/MAG/UGLYPicking/impl/UglyPickingService.cls.xml	(.../UglyPickingService.cls.xml)	(revision 1576)
+++ APPS/MAG/UGLYPicking/impl/UglyPickingService.cls.xml	(.../UglyPickingService.cls.xml)	(revision 1578)
@@ -3,87 +3,215 @@
 <Class name="APPS.MAG.UGLYPicking.impl.UglyPickingService">
 <ProcedureBlock>1</ProcedureBlock>
 <Super>APPS.MAG.UglyPickingService</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
 
+<Method name="%OnNew">
+<Description>
+Deze moet overschreven worden en mag geen super aanroepen,
+anders krijg je een framestack error.</Description>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="GeefBon">
 <FormalSpec>BonNr:%Integer</FormalSpec>
 <ReturnType>APPS.MAG.UGLYPicking.dto.Bon</ReturnType>
 <Implementation><![CDATA[
+	If ($$IsLocked^vhLib("^UGLYOrderPick("_BonNr_")"))
+	{
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Bon met nummer "_BonNr_" is reeds in gebruik."))
+	}
+	
+	Set Bon = ..GeefBonBasis(BonNr)
+	
+	Set Magazijnen = ^ORDW("IW",BonNr)
+	
+	For i=1:1:$Length(Magazijnen)
+	{
+		Set MagazijnLetter = $Extract(Magazijnen,i,i)
+		If (##class(APPS.MAG.UGLYPicking.enu.Magazijn).IsValidDT(MagazijnLetter))
+		{
+			Set Magazijn = ##class(APPS.MAG.UGLYPicking.dto.Magazijn).%New()
+			Set Magazijn.Naam = ##class(APPS.MAG.UGLYPicking.enu.Magazijn).LogicalToDisplay(MagazijnLetter)
+			Do Bon.Magazijnen.Insert(Magazijn)
+		}
+	}
+	
+	Quit Bon
 ]]></Implementation>
 </Method>
 
 <Method name="GeefBonnen">
 <FormalSpec>MagazijnNaam:%String</FormalSpec>
 <ReturnType>APPS.MAG.UGLYPicking.dto.Bonnen</ReturnType>
 <Implementation><![CDATA[
+	Set Bonnen = ##class(APPS.MAG.UGLYPicking.dto.Bonnen).%New()
+	
+	Set Iterator = ##class(APPS.MAG.UGLYPicking.impl.BonInMagazijnIterator).%New(MagazijnNaam)
+	While (Iterator.HasNext())
+	{
+		Set BonNr = Iterator.Next()
+		Set Bon = ..GeefBonBasis(BonNr)
+		If ($$IsLocked^vhLib("^UGLYOrderPick("_BonNr_")"))
+		{
+			Set Bon.Status = ##class(APPS.MAG.UGLYPicking.enu.BonStatus).InGebruik()
+		}
+		Else
+		{
+			Set Bon.Status = ##class(APPS.MAG.UGLYPicking.enu.BonStatus).Vrij()
+		}
+		
+		Set Bon.AantalLijnen = 0		
+		Set OrderHoofding = ##class(Flow.OrderWMS.Hoofding).%OpenId(BonNr,0)
+		Set LijnIterator = ##class(TECH.ListIterator).%New(OrderHoofding.Lijnen)
+		While (LijnIterator.HasNext())
+		{
+			Set Lijn = LijnIterator.Next()
+			Set SublijnIterator = ##class(TECH.ListIterator).%New(Lijn.Subs)
+			While (SublijnIterator.HasNext())
+			{
+				Set Sublijn = SublijnIterator.Next()
+				If (Sublijn.VerwerkingSoftware = ##class(APPS.MAG.UGLYPicking.enu.Magazijn).DisplayToLogical(MagazijnNaam))
+				{
+					Set Bon.AantalLijnen = Bon.AantalLijnen + 1
+				}
+			}
+		}
+		
+		Do Bonnen.Lijst.Insert(Bon)
+	}
+	
+	Quit Bonnen
 ]]></Implementation>
 </Method>
 
+<Method name="GeefBonBasis">
+<FormalSpec>BonNr:%Integer</FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.MAG.UGLYPicking.dto.Bon</ReturnType>
+<Implementation><![CDATA[
+	Set OrderHoofding = ##class(Flow.OrderWMS.Hoofding).%OpenId(BonNr,0)
+	
+	If ('$IsObject(OrderHoofding))
+	{
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Bon met nummer "_BonNr_" bestaat niet."))
+	}
+	
+	Set Bon = ##class(APPS.MAG.UGLYPicking.dto.Bon).%New()
+	Set Bon.BonNr = BonNr
+		
+	Set Bon.DueOut = ##class(TECH.DateTime).HorologToTimeStamp(OrderHoofding.DueOutTime)
+	Set Bon.Klant = OrderHoofding.Klant.Naam
+	Set Bon.Land = $$LAND^vhRtn1(OrderHoofding.Klant.Nummer,"K")
+	
+	Quit Bon
+]]></Implementation>
+</Method>
+
 <Method name="GeefMagazijnen">
 <ReturnType>APPS.MAG.UGLYPicking.dto.Magazijnen</ReturnType>
 <Implementation><![CDATA[
+	Set Magazijnen = ##class(APPS.MAG.UGLYPicking.dto.Magazijnen).%New()
+	
+	Set MagazijnNamen = ##class(APPS.MAG.UGLYPicking.enu.Magazijn).GeefMagazijnen()
+	// Delimiter afzonderen
+	Set Delimiter = $Extract(MagazijnNamen,1,1)
+	Set MagazijnNamen = $Extract(MagazijnNamen,2,$Length(MagazijnNamen))
+	
+	Set MagazijnNaamIterator = ##class(TECH.PiecesIterator).%New(MagazijnNamen,Delimiter)
+	While (MagazijnNaamIterator.HasNext())
+	{
+		Set Magazijn = ##class(APPS.MAG.UGLYPicking.dto.Magazijn).%New()
+		
+		Set Magazijn.Naam = MagazijnNaamIterator.Next()
+		Set Magazijn.AantalOrders = 0
+		
+		Set Status = ""
+		Set Iterator = ##class(APPS.MAG.UGLYPicking.impl.BonInMagazijnIterator).%New(Magazijn.Naam)
+		While (Iterator.HasNext())
+		{
+			Set BonNr = Iterator.Next()
+			Set Magazijn.AantalOrders = Magazijn.AantalOrders + 1
+			
+			Set OrderHoofding = ##class(Flow.OrderWMS.Hoofding).%OpenId(BonNr,0)
+			Set DueOutTime = ##class(TECH.DateTime).HorologToTimeStamp(OrderHoofding.DueOutTime)
+			
+			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
+				{
+					Set Status = ##class(APPS.MAG.UGLYPicking.enu.MagazijnStatus).Dringend()
+				}
+			}
+		}
+		
+		Set Magazijn.Status = Status
+		
+		Do Magazijnen.Lijst.Insert(Magazijn)
+	}
+	
+	Quit Magazijnen
 ]]></Implementation>
 </Method>
 
 <Method name="GeefOpenstaandeSessies">
 <ReturnType>APPS.MAG.UGLYPicking.impl.Sessie</ReturnType>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefPalletInhoud">
 <FormalSpec>PalletID:%String</FormalSpec>
 <ReturnType>APPS.MAG.UGLYPicking.dto.Pallet</ReturnType>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefProductLijnen">
 <FormalSpec>BonNr:%Integer</FormalSpec>
 <ReturnType>APPS.MAG.UGLYPicking.dto.ProductLijnen</ReturnType>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="NeemSessieOver">
 <FormalSpec>Sessie:APPS.MAG.UGLYPicking.dto.Sessie</FormalSpec>
 <ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="PalletOpvragenAutoMagazijn">
 <FormalSpec>ProductLijn:APPS.MAG.UGLYPicking.dto.ProductLijn</FormalSpec>
 <ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="ReservatieProbleemOplossen">
 <FormalSpec>ProductLijn:APPS.MAG.UGLYPicking.dto.ProductLijn,NieuwReservatieAantal:%Integer</FormalSpec>
 <ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="StelUit">
 <FormalSpec>Bon:APPS.MAG.UGLYPicking.dto.Bon,UitstelOptie:APPS.MAG.UGLYPicking.enu.UitstelOptie</FormalSpec>
 <ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VoerPickingUit">
 <FormalSpec>Product:APPS.MAG.UGLYPicking.dto.GepickedProduct</FormalSpec>
 <ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefSessie">
 <Private>1</Private>
 <ReturnType>APPS.MAG.UGLYPicking.impl.Sessie</ReturnType>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 </Class>
 </Export>
Index: APPS/MAG/UGLYPicking/enu/MagazijnStatus.cls.xml
===================================================================
diff -u
--- APPS/MAG/UGLYPicking/enu/MagazijnStatus.cls.xml	(revision 0)
+++ APPS/MAG/UGLYPicking/enu/MagazijnStatus.cls.xml	(revision 1578)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="APPS.MAG.UGLYPicking.enu.MagazijnStatus">
+<ClassType>datatype</ClassType>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%String</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Parameter name="VALUELIST">
+<Default>;Superspoed;Dringend</Default>
+</Parameter>
+
+<Method name="Superspoed">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.MAG.UGLYPicking.enu.MagazijnStatus</ReturnType>
+<Implementation><![CDATA[	Quit "Superspoed"
+]]></Implementation>
+</Method>
+
+<Method name="Dringend">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.MAG.UGLYPicking.enu.MagazijnStatus</ReturnType>
+<Implementation><![CDATA[	Quit "Dringend"
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: APPS/MAG/UGLYPicking/dto/Bon.cls.xml
===================================================================
diff -u -r1576 -r1578
--- APPS/MAG/UGLYPicking/dto/Bon.cls.xml	(.../Bon.cls.xml)	(revision 1576)
+++ APPS/MAG/UGLYPicking/dto/Bon.cls.xml	(.../Bon.cls.xml)	(revision 1578)
@@ -3,7 +3,12 @@
 <Class name="APPS.MAG.UGLYPicking.dto.Bon">
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject,%XML.Adaptor</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
 
+<Property name="AantalLijnen">
+<Type>%Integer</Type>
+</Property>
+
 <Property name="BonNr">
 <Type>%Integer</Type>
 </Property>
@@ -20,17 +25,8 @@
 <Type>%String</Type>
 </Property>
 
-<Property name="OrderID">
-<Type>%String</Type>
-</Property>
-
-<Property name="OrderReferentie">
-<Type>%String</Type>
-</Property>
-
 <Property name="Status">
 <Type>APPS.MAG.UGLYPicking.enu.BonStatus</Type>
-<Private>1</Private>
 </Property>
 
 <Property name="Magazijnen">
Index: APPS/MAG/UGLYPicking/enu/Magazijn.cls.xml
===================================================================
diff -u
--- APPS/MAG/UGLYPicking/enu/Magazijn.cls.xml	(revision 0)
+++ APPS/MAG/UGLYPicking/enu/Magazijn.cls.xml	(revision 1578)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="APPS.MAG.UGLYPicking.enu.Magazijn">
+<ClassType>datatype</ClassType>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%String</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Parameter name="VALUELIST">
+<Default>;H;O;U;L;A</Default>
+</Parameter>
+
+<Parameter name="DISPLAYLIST">
+<Default>;HALUX;ORGALUX;UGLY;LANG;TANDEM/AVENT</Default>
+</Parameter>
+
+<Method name="Halux">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[	Quit "HALUX"
+]]></Implementation>
+</Method>
+
+<Method name="Orgalux">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[	Quit "ORGALUX"
+]]></Implementation>
+</Method>
+
+<Method name="Ugly">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[	Quit "UGLY"
+]]></Implementation>
+</Method>
+
+<Method name="LangGoed">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[	Quit "LANG"
+]]></Implementation>
+</Method>
+
+<Method name="TandemAventos">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[	Quit "TANDEM/AVENT"
+]]></Implementation>
+</Method>
+
+<Method name="GeefMagazijnen">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[	Quit ..#DISPLAYLIST
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: APPS/MAG/UGLYPicking/dto/Bonnen.cls.xml
===================================================================
diff -u -r1576 -r1578
--- APPS/MAG/UGLYPicking/dto/Bonnen.cls.xml	(.../Bonnen.cls.xml)	(revision 1576)
+++ APPS/MAG/UGLYPicking/dto/Bonnen.cls.xml	(.../Bonnen.cls.xml)	(revision 1578)
@@ -3,8 +3,9 @@
 <Class name="APPS.MAG.UGLYPicking.dto.Bonnen">
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject,%XML.Adaptor</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
 
-<Property name="Bonnen">
+<Property name="Lijst">
 <Type>APPS.MAG.UGLYPicking.dto.Bon</Type>
 <Collection>list</Collection>
 </Property>
Index: APPS/MAG/UGLYPicking/dto/Magazijn.cls.xml
===================================================================
diff -u -r1576 -r1578
--- APPS/MAG/UGLYPicking/dto/Magazijn.cls.xml	(.../Magazijn.cls.xml)	(revision 1576)
+++ APPS/MAG/UGLYPicking/dto/Magazijn.cls.xml	(.../Magazijn.cls.xml)	(revision 1578)
@@ -3,6 +3,7 @@
 <Class name="APPS.MAG.UGLYPicking.dto.Magazijn">
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject,%XML.Adaptor</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="AantalOrders">
 <Type>%Integer</Type>