Index: TECH/Exceptions/LockedException.cls.xml
===================================================================
diff -u
--- TECH/Exceptions/LockedException.cls.xml	(revision 0)
+++ TECH/Exceptions/LockedException.cls.xml	(revision 1759)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="TECH.Exceptions.LockedException">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>TECH.Exceptions.AbstractOmschrijvingException</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Method name="GeefExceptionCode">
+<ReturnType>TECH.enu.ExceptionCode</ReturnType>
+<Implementation><![CDATA[	Quit ##class(TECH.enu.ExceptionCode).Locked()
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: WS/MAG/UGLYPicking/UGLYPickingService.cls.xml
===================================================================
diff -u -r1748 -r1759
--- WS/MAG/UGLYPicking/UGLYPickingService.cls.xml	(.../UGLYPickingService.cls.xml)	(revision 1748)
+++ WS/MAG/UGLYPicking/UGLYPickingService.cls.xml	(.../UGLYPickingService.cls.xml)	(revision 1759)
@@ -29,14 +29,28 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefVolgendeVrijeBon">
+<Method name="GeefBonVrijUitSessie">
+<FormalSpec>DeviceNaam:%String</FormalSpec>
+<WebMethod>1</WebMethod>
+<Implementation><![CDATA[	Do ##class(APPS.MAG.UglyPickingService).%New().GeefBonVrijUitSessie(DeviceNaam)
+]]></Implementation>
+</Method>
+
+<Method name="StartVolgendeVrijeBon">
 <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><![CDATA[	Quit ##class(APPS.MAG.UglyPickingService).%New().StartVolgendeVrijeBon(MagazijnID)
 ]]></Implementation>
 </Method>
 
+<Method name="GeefOpenstaandeSessies">
+<ReturnType>APPS.MAG.UGLYPicking.dto.Sessies</ReturnType>
+<WebMethod>1</WebMethod>
+<Implementation><![CDATA[	Quit ##class(APPS.MAG.UglyPickingService).%New().GeefOpenstaandeSessies()
+]]></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/Sessies.cls.xml
===================================================================
diff -u
--- APPS/MAG/UGLYPicking/dto/Sessies.cls.xml	(revision 0)
+++ APPS/MAG/UGLYPicking/dto/Sessies.cls.xml	(revision 1759)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="APPS.MAG.UGLYPicking.dto.Sessies">
+<ClassType>serial</ClassType>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%ListOfObjects</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Parameter name="ELEMENTTYPE">
+<Default>APPS.MAG.UGLYPicking.dto.Sessie</Default>
+</Parameter>
+
+<Storage name="Custom">
+<Type>%Library.CompleteCustomStorage</Type>
+</Storage>
+</Class>
+</Export>
Index: APPS/MAG/UGLYPicking/dto/Sessie.cls.xml
===================================================================
diff -u -r1576 -r1759
--- APPS/MAG/UGLYPicking/dto/Sessie.cls.xml	(.../Sessie.cls.xml)	(revision 1576)
+++ APPS/MAG/UGLYPicking/dto/Sessie.cls.xml	(.../Sessie.cls.xml)	(revision 1759)
@@ -3,17 +3,18 @@
 <Class name="APPS.MAG.UGLYPicking.dto.Sessie">
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject,%XML.Adaptor</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
 
-<Property name="AangemaaktOp">
-<Type>%TimeStamp</Type>
-</Property>
-
 <Property name="DeviceNaam">
 <Type>%String</Type>
 </Property>
 
 <Property name="LaatstGebruiktOp">
 <Type>%TimeStamp</Type>
 </Property>
+
+<Property name="GebruiktBonNr">
+<Type>%Integer</Type>
+</Property>
 </Class>
 </Export>
Index: CSC Ugly Picking.prj.xml
===================================================================
diff -u -r1748 -r1759
--- CSC Ugly Picking.prj.xml	(.../CSC Ugly Picking.prj.xml)	(revision 1748)
+++ CSC Ugly Picking.prj.xml	(.../CSC Ugly Picking.prj.xml)	(revision 1759)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="9">
-<Project name="CSC Ugly Picking" LastModified="2011-08-04 15:16:09">
+<Project name="CSC Ugly Picking" LastModified="2011-08-05 08:44:00">
   <Items>
     <ProjectItem name="APPS.MAG.UGLYPicking.dto.Bon" type="CLS"/>
     <ProjectItem name="APPS.MAG.UGLYPicking.dto.Bonnen" type="CLS"/>
@@ -17,6 +17,7 @@
     <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.dto.Sessies" 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"/>
@@ -55,6 +56,7 @@
     <ProjectItem name="Flow.OrderWMS.Sub" type="CLS"/>
     <ProjectItem name="TECH.Context.RuntimeContext" type="CLS"/>
     <ProjectItem name="TECH.Exceptions.GeneralErrorException" type="CLS"/>
+    <ProjectItem name="TECH.Exceptions.LockedException" type="CLS"/>
     <ProjectItem name="TECH.Exceptions.SaveFailedException" type="CLS"/>
     <ProjectItem name="UI.MB.UGLYPicking.MainForm" type="CLS"/>
     <ProjectItem name="UI.MB.UGLYPicking.dlgCC" type="CLS"/>
Index: APPS/MAG/UGLYPicking/impl/UglyPickingService.cls.xml
===================================================================
diff -u -r1748 -r1759
--- APPS/MAG/UGLYPicking/impl/UglyPickingService.cls.xml	(.../UglyPickingService.cls.xml)	(revision 1748)
+++ APPS/MAG/UGLYPicking/impl/UglyPickingService.cls.xml	(.../UglyPickingService.cls.xml)	(revision 1759)
@@ -69,19 +69,57 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefVolgendeVrijeBon">
+<Method name="GeefBonVrijUitSessie">
+<FormalSpec>DeviceNaam:%String</FormalSpec>
+<Implementation><![CDATA[
+	Set Sessie = ##class(APPS.MAG.UGLYPicking.impl.Sessie).%OpenId(DeviceNaam)
+	
+	If ('$IsObject(Sessie))
+	{
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Device "_DeviceNaam_" bezit geen sessie!"))
+	}
+	
+	Do Sessie.ZetGebruiktBonNr("")
+	Set Status = Sessie.%Save()
+	
+	If ($$$ISERR(Status))
+	{
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.SaveFailedException).%New("Kon de bon niet vrijgeven omdat de sessie niet kon worden opgeslagen!",Status))
+	}
+]]></Implementation>
+</Method>
+
+<Method name="StartVolgendeVrijeBon">
 <FormalSpec>MagazijnID:APPS.MAG.UGLYPicking.enu.Magazijn</FormalSpec>
 <ReturnType>APPS.MAG.UGLYPicking.dto.Bon</ReturnType>
 <Implementation><![CDATA[
-	Set Bon = ""
+	Set VolgendeBon = ""
 	Set Bonnen = ..GeefBonnen(MagazijnID)
 	
-	If (Bonnen.Lijst.Count() > 0)
+	Set BonIterator = ##class(TECH.ListIterator).%New(Bonnen.Lijst)
+	While (('$IsObject(VolgendeBon)) && BonIterator.HasNext())
 	{
-		Set Bon = Bonnen.Lijst.GetAt(1)
+		Set Bon = BonIterator.Next()
+		If (Bon.Status '= ##class(APPS.MAG.UGLYPicking.enu.BonStatus).InGebruik())
+		{
+			Set $ZTRAP = "Locked"
+			Do ..StartBon(Bon.BonNr)
+			Set VolgendeBon = Bon
+			Set $ZTRAP = ""
+			Goto Finally
+Locked
+			Set $ZTRAP = ""
+			Set LockedException = ##class(TECH.ExceptionHandler).Catch("TECH.Exceptions.LockedException")
+Finally
+		}
 	}
 	
-	Quit Bon
+	If ('$IsObject(VolgendeBon))
+	{
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.GeneralErrorException).%New("Er is geen volgende vrije bon voor magazijn "_##class(APPS.MAG.UGLYPicking.enu.Magazijn).LogicalToDisplay(MagazijnID)))
+	}
+	
+	Quit VolgendeBon
 ]]></Implementation>
 </Method>
 
@@ -96,7 +134,7 @@
 	{
 		Set BonNr = Iterator.Next()
 		Set Bon = ..GeefBonBasis(BonNr)
-		If ((..IsBonInGebruik(BonNr) || ($$IsLocked^vhLib("^UGLYOrderPick("_BonNr_")"))) && (..GeefSessie().GeefGebruiktBon() '= BonNr))
+		If ((..IsBonInGebruik(BonNr) || ($$IsLocked^vhLib("^UGLYOrderPick("_BonNr_")"))) && (..GeefSessie().GeefGebruiktBonNr() '= BonNr))
 		{
 			Set Bon.Status = ##class(APPS.MAG.UGLYPicking.enu.BonStatus).InGebruik()
 		}
@@ -216,8 +254,24 @@
 </Method>
 
 <Method name="GeefOpenstaandeSessies">
-<ReturnType>APPS.MAG.UGLYPicking.impl.Sessie</ReturnType>
-<Implementation><![CDATA[]]></Implementation>
+<ReturnType>APPS.MAG.UGLYPicking.dto.Sessies</ReturnType>
+<Implementation><![CDATA[
+	Set Sessies = ##class(APPS.MAG.UGLYPicking.dto.Sessies).%New()
+	
+	Set ResultSet = ##class(%ResultSet).%New()
+	Do ResultSet.Prepare("SELECT ID, GewijzigdOp, GebruiktBonNr FROM APPS_MAG_UGLYPicking_impl.Sessie ORDER BY GewijzigdOp DESC")
+	Do ResultSet.Execute()
+	While (ResultSet.Next())
+	{
+		Set Sessie = ##class(APPS.MAG.UGLYPicking.dto.Sessie).%New()
+		Set Sessie.DeviceNaam = ResultSet.Data("ID")
+		Set Sessie.LaatstGebruiktOp = ResultSet.Data("GewijzigdOp")
+		Set Sessie.GebruiktBonNr = ResultSet.Data("GebruiktBonNr")
+		Do Sessies.Insert(Sessie)
+	}
+	
+	Quit Sessies
+]]></Implementation>
 </Method>
 
 <Method name="GeefPalletPickingOpdracht">
@@ -484,6 +538,12 @@
 	}
 	
 	Set Sessie = ..GeefSessie()
+	
+	If (..IsBonInGebruik(BonNr) && (Sessie.GeefGebruiktBonNr() '= BonNr))
+	{
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.LockedException).%New("Bon met nummer "_BonNr_" kan niet gestart worden omdat deze reeds in gebruik is."))
+	}
+	
 	Do Sessie.ZetGebruiktBonNr(BonNr)
 	Set Status = Sessie.%Save()
 	
Index: APPS/MAG/UglyPickingService.cls.xml
===================================================================
diff -u -r1748 -r1759
--- APPS/MAG/UglyPickingService.cls.xml	(.../UglyPickingService.cls.xml)	(revision 1748)
+++ APPS/MAG/UglyPickingService.cls.xml	(.../UglyPickingService.cls.xml)	(revision 1759)
@@ -27,10 +27,16 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefVolgendeVrijeBon">
+<Method name="GeefBonVrijUitSessie">
+<FormalSpec>DeviceNaam:%String</FormalSpec>
+<Implementation><![CDATA[	Quit ..Service.GeefBonVrijUitSessie(DeviceNaam)
+]]></Implementation>
+</Method>
+
+<Method name="StartVolgendeVrijeBon">
 <FormalSpec>MagazijnID:APPS.MAG.UGLYPicking.enu.Magazijn</FormalSpec>
 <ReturnType>APPS.MAG.UGLYPicking.dto.Bon</ReturnType>
-<Implementation><![CDATA[	Quit ..Service.GeefVolgendeVrijeBon(MagazijnID)
+<Implementation><![CDATA[	Quit ..Service.StartVolgendeVrijeBon(MagazijnID)
 ]]></Implementation>
 </Method>
 
@@ -48,8 +54,9 @@
 </Method>
 
 <Method name="GeefOpenstaandeSessies">
-<ReturnType>APPS.MAG.UGLYPicking.impl.Sessie</ReturnType>
-<Implementation><![CDATA[]]></Implementation>
+<ReturnType>APPS.MAG.UGLYPicking.dto.Sessies</ReturnType>
+<Implementation><![CDATA[	Quit ..Service.GeefOpenstaandeSessies()
+]]></Implementation>
 </Method>
 
 <Method name="GeefPalletPickingOpdracht">
Index: vhUnitTest/APPS/MAG/UGLYPicking/TestUglyPickingService.cls.xml
===================================================================
diff -u -r1748 -r1759
--- vhUnitTest/APPS/MAG/UGLYPicking/TestUglyPickingService.cls.xml	(.../TestUglyPickingService.cls.xml)	(revision 1748)
+++ vhUnitTest/APPS/MAG/UGLYPicking/TestUglyPickingService.cls.xml	(.../TestUglyPickingService.cls.xml)	(revision 1759)
@@ -69,6 +69,38 @@
 ]]></Implementation>
 </Method>
 
+<Method name="TestGeefBonVrijUitSessie">
+<Implementation><![CDATA[
+	Set Service = ##class(APPS.MAG.UGLYPicking.impl.UglyPickingService).%New()
+	
+	Do ..MaakBon(1234)
+	
+	Do Service.StartBon(1234)
+	
+	Do Service.GeefBonVrijUitSessie("UnitTestDevice")
+	
+	Set Sessie = ##class(APPS.MAG.UGLYPicking.impl.Sessie).%OpenId("UnitTestDevice")
+	
+	Do $$$AssertEquals(Sessie.GeefGebruiktBonNr(),"","De bon nr is leeg gemaakt")
+]]></Implementation>
+</Method>
+
+<Method name="TestStartVolgendeVrijeBon">
+<Implementation><![CDATA[
+	Set Service = ##class(APPS.MAG.UGLYPicking.impl.UglyPickingService).%New()
+	
+	Do ..MaakBon(1234)
+	
+	Set Bon = Service.StartVolgendeVrijeBon(##class(APPS.MAG.UGLYPicking.enu.Magazijn).TandemAventos())
+	
+	Do $$$AssertTrue($IsObject(Bon),"De bon werd teruggegeven")
+	
+	Do Service.StopHuidigeBon()
+	
+	Do ..VerwijderBon(1234)
+]]></Implementation>
+</Method>
+
 <Method name="TestGeefPalletInhoud">
 <Implementation><![CDATA[
 	Set Service = ##class(APPS.MAG.UGLYPicking.impl.UglyPickingService).%New()
@@ -322,6 +354,26 @@
 ]]></Implementation>
 </Method>
 
+<Method name="TestGeefOpenstaandeSessies">
+<Implementation><![CDATA[
+	Set Service = ##class(APPS.MAG.UGLYPicking.impl.UglyPickingService).%New()
+	
+	Do ..MaakBon(1234)	
+	Do Service.StartBon(1234)
+	
+	Set Sessies = Service.GeefOpenstaandeSessies()
+	
+	// Omdat de sessies gesorteerd worden op laatst gewijzigd komt de unittest sessie als eerste
+	
+	Do $$$AssertTrue(Sessies.Count()>0,"Er zijn sessies")
+	Do $$$AssertEquals(Sessies.GetAt(1).DeviceNaam,"UnitTestDevice","De devicenaam is correct ingesteld")
+	Do $$$AssertEquals(Sessies.GetAt(1).GebruiktBonNr,1234,"De gebruikte bonnr is correct ingesteld")
+	
+	Do Service.StopHuidigeBon()	
+	Do ..VerwijderBon(1234)
+]]></Implementation>
+</Method>
+
 <Method name="MaakBon">
 <FormalSpec>ID:%Integer</FormalSpec>
 <ReturnType>%Status</ReturnType>