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>