Index: WS/MAG/UGLYPicking/UGLYPickingService.cls.xml
===================================================================
diff -u -r1594 -r1608
--- WS/MAG/UGLYPicking/UGLYPickingService.cls.xml	(.../UGLYPickingService.cls.xml)	(revision 1594)
+++ WS/MAG/UGLYPicking/UGLYPickingService.cls.xml	(.../UGLYPickingService.cls.xml)	(revision 1608)
@@ -30,10 +30,10 @@
 </Method>
 
 <Method name="GeefProductLijnen">
-<FormalSpec>BonNr:%Integer</FormalSpec>
+<FormalSpec>BonNr:%Integer,MagazijnID:APPS.MAG.UGLYPicking.enu.Magazijn</FormalSpec>
 <ReturnType>APPS.MAG.UGLYPicking.dto.ProductLijnen</ReturnType>
 <WebMethod>1</WebMethod>
-<Implementation><![CDATA[	Quit ##class(APPS.MAG.UglyPickingService).%New().GeefProductLijnen(BonNr)
+<Implementation><![CDATA[	Quit ##class(APPS.MAG.UglyPickingService).%New().GeefProductLijnen(BonNr, MagazijnID)
 ]]></Implementation>
 </Method>
 
@@ -43,5 +43,12 @@
 <Implementation><![CDATA[	Quit ##class(APPS.MAG.UglyPickingService).%New().GeefMagazijnen()
 ]]></Implementation>
 </Method>
+
+<Method name="StelUit">
+<FormalSpec>BonNr:%Integer,UitstelOptie:APPS.MAG.UGLYPicking.enu.UitstelOptie</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[	Quit ##class(APPS.MAG.UglyPickingService).%New().StelUit(BonNr,UitstelOptie)
+]]></Implementation>
+</Method>
 </Class>
 </Export>
Index: APPS/MAG/UGLYPicking/impl/UglyPickingService.cls.xml
===================================================================
diff -u -r1594 -r1608
--- APPS/MAG/UGLYPicking/impl/UglyPickingService.cls.xml	(.../UglyPickingService.cls.xml)	(revision 1594)
+++ APPS/MAG/UGLYPicking/impl/UglyPickingService.cls.xml	(.../UglyPickingService.cls.xml)	(revision 1608)
@@ -229,21 +229,95 @@
 </Method>
 
 <Method name="GeefProductLijnen">
-<FormalSpec>BonNr:%Integer</FormalSpec>
+<FormalSpec>BonNr:%Integer,MagazijnID:APPS.MAG.UGLYPicking.enu.Magazijn</FormalSpec>
 <ReturnType>APPS.MAG.UGLYPicking.dto.ProductLijnen</ReturnType>
 <Implementation><![CDATA[
 	Set ProductLijnen = ##class(APPS.MAG.UGLYPicking.dto.ProductLijnen).%New()
+	Set Magazijn = ##class(APPS.MAG.UGLYPicking.enu.Magazijn).LogicalToDisplay(MagazijnID)
 	
-	Set ProductLijnen.BonNr = BonNr
+	Set OrderHoofding = ##class(Flow.OrderWMS.Hoofding).%OpenId(BonNr,0)
 	
-	Set lbKennisID=##class(BL.Derde.Kennis.Kennis).GetIDsToPopup(1000,.Error,$LB("MAG:PICK"),,,"UGLY Picking Klant",1000,1,4,0)
+	If ('$IsObject(OrderHoofding))
+	{
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Bon met nummer "_BonNr_" bestaat niet."))
+	}
 	
-	For i=1:1:$LL(lbKennisID)
+	Set KennisIDLb=##class(BL.Derde.Kennis.Kennis).GetIDsToPopup(OrderHoofding.KlantGetObjectId(),.Error,$LB("MAG:PICK"),,,"UGLY Picking Klant",1000,1,4,0)
+	
+	For i=1:1:$LL(KennisIDLb)
 	{
-		Set Kennis = ##class(Derde.Kennis.Kennis).%OpenId($LI(lbKennisID))
+		Set Kennis = ##class(Derde.Kennis.Kennis).%OpenId($LI(KennisIDLb))
 		Do ProductLijnen.KennisAnkers.Insert(Kennis.Msg)
 	}
 	
+	Set Status = ##class(BL.MB.UGLYPicking.OrderReservatie).CreateUnFinishedZeroPalletIDs(BonNr,Magazijn,##class(TECH.Context.RuntimeContext).Instance().GeefGebruikerInitialen())
+	
+	If ($$$ISERR(Status))
+	{
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.StatusException).%New(##class(TECH.enu.ExceptionCode).GeneralError(),"Pallet reservaties konden niet uitgevoerd worden",Status))
+	}
+	
+	Set Status = ##class(BL.MB.UGLYPicking.OrderReservatie).ProcessUnFinishedZeroPalletIDs(BonNr,Magazijn)
+	// Hier nog no alloc dinges checken als status een error is.
+	
+ 	Set ProductAPI = ##class(DOM.DomeinContext).Instance().GeefProductAPI()
+	
+	If ($$$ISERR(Status))
+	{
+		Set ResultSet = ##class(%ResultSet).%New("Flow.OrderWMS.PalletReservatie:GetUnFinishedZeroPalletIDs")
+ 		Do ResultSet.Execute(BonNr,Magazijn)
+ 		
+ 		While (ResultSet.Next())
+ 		{
+	 		Set ProductLijn = ##class(APPS.MAG.UGLYPicking.dto.ProductLijn).%New()
+	 		Set ProductLijn.Aantal = ResultSet.Data("AantalTePicken")
+	 		Set ProductLijn.ProductID = ResultSet.Data("Product")
+	 		Set ProductLijn.MagazijnID = MagazijnID
+	 		
+	 		Set Product = ProductAPI.GeefProduct(ResultSet.Data("Product"))
+	 		
+			Set ProductLijn.Korttekst = Product.GeefKorttekst()
+			Set ProductLijn.Langtekst = Product.GeefLangtekst()
+			
+			Set ReservatieProbleem = ##class(APPS.MAG.UGLYPicking.dto.ReservatieProbleem).%New()
+			Set ReservatieProbleem.FoutBoodschap = ResultSet.Data("FailedReservation")
+			
+			Do ProductLijn.Problemen.Insert(ReservatieProbleem)
+	 		
+	 		Do ProductLijnen.Lijst.Insert(ProductLijn)
+ 		}
+	}
+	
+	Set ResultSet = ##class(%ResultSet).%New("Flow.OrderWMS.PalletReservatie:GetReservaties")
+ 	Do ResultSet.Execute(BonNr,Magazijn)
+	
+	While (ResultSet.Next())
+	{
+		Set ProductLijn = ##class(APPS.MAG.UGLYPicking.dto.ProductLijn).%New()
+		Set ProductLijn.Aantal = ResultSet.Data("AantalTePicken")
+		Set ProductLijn.ProductID = ResultSet.Data("Product")
+		Set ProductLijn.LocatieID = ResultSet.Data("LocTrans")
+		Set ProductLijn.PalletID = ResultSet.Data("PalletID")
+		Set ProductLijn.MagazijnID = MagazijnID
+		Set ProductLijn.HeeftChargeNummer = ##class(BL.ProdHist.ChargeTrace).IsChargeProduct(ResultSet.Data("Product"),1)
+		Set ProductLijn.IsVollePallet = ResultSet.Data("IsFull")
+		Set ProductLijn.IsPalletVolledigTePicken = ResultSet.Data("NeedAll")
+		
+		Set Product = ProductAPI.GeefProduct(ResultSet.Data("Product"))
+		
+		Set ProductLijn.Korttekst = Product.GeefKorttekst()
+		Set ProductLijn.Langtekst = Product.GeefLangtekst()
+		
+		Set KennisIDLb=##class(BL.Derde.Kennis.Kennis).GetIDsToPopup(OrderHoofding.KlantGetObjectId(),.Error,$LB("MAG:PICK"),$LB(ResultSet.Data("Product")),,"UGLY Picking Product",ResultSet.Data("Product"),1,1,0)
+		For i=1:1:$LL(KennisIDLb)
+		{
+			Set Kennis = ##class(Derde.Kennis.Kennis).%OpenId($LI(KennisIDLb))
+			Do ProductLijn.KennisAnkers.Insert(Kennis.Msg)
+		}
+		
+		Do ProductLijnen.Lijst.Insert(ProductLijn)
+	}
+	
 	Quit ProductLijnen
 ]]></Implementation>
 </Method>
@@ -264,8 +338,25 @@
 </Method>
 
 <Method name="StelUit">
-<FormalSpec>Bon:APPS.MAG.UGLYPicking.dto.Bon,UitstelOptie:APPS.MAG.UGLYPicking.enu.UitstelOptie</FormalSpec>
-<ReturnType>%Status</ReturnType>
+<FormalSpec>BonNr:%Integer,UitstelOptie:APPS.MAG.UGLYPicking.enu.UitstelOptie</FormalSpec>
+<ReturnType>%TimeStamp</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."))
+	}
+	
+	If (UitstelOptie = ##class(APPS.MAG.UGLYPicking.enu.UitstelOptie).VijftienMinutenUitstellen())
+	{
+		Do ##class(Flow.OrderWMS.Hoofding).DelayDueOut(BonNr,15)
+	}
+	
+	Do OrderHoofding.%Reload()
+	
+	Quit ##class(TECH.DateTime).HorologToTimeStamp(OrderHoofding.DueOutTime)
+]]></Implementation>
 </Method>
 
 <Method name="VoerPickingUit">
Index: CSC Ugly Picking.prj.xml
===================================================================
diff -u -r1594 -r1608
--- CSC Ugly Picking.prj.xml	(.../CSC Ugly Picking.prj.xml)	(revision 1594)
+++ CSC Ugly Picking.prj.xml	(.../CSC Ugly Picking.prj.xml)	(revision 1608)
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="9">
-<Project name="CSC Ugly Picking" LastModified="2011-07-05 09:51:35">
+<Project name="CSC Ugly Picking" LastModified="2011-07-05 14:16:14">
   <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.OrderInfo" type="CLS"/>
     <ProjectItem name="APPS.MAG.UGLYPicking.dto.Pallet" type="CLS"/>
+    <ProjectItem name="APPS.MAG.UGLYPicking.dto.PalletReservatie" 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"/>
@@ -46,6 +48,8 @@
     <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="Flow.OrderWMS.PalletReservatie" type="CLS"/>
+    <ProjectItem name="Flow.OrderWMS.Sub" 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"/>
Index: UI/MB/UGLYPicking/dlgPickList.cls.xml
===================================================================
diff -u -r1074 -r1608
--- UI/MB/UGLYPicking/dlgPickList.cls.xml	(.../dlgPickList.cls.xml)	(revision 1074)
+++ UI/MB/UGLYPicking/dlgPickList.cls.xml	(.../dlgPickList.cls.xml)	(revision 1608)
@@ -5,6 +5,7 @@
 <IncludeCode>UglyPickingCNTs,KeyCodesCNTs</IncludeCode>
 <StorageStrategy>Default</StorageStrategy>
 <Super>%Library.TMFormClass</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
 
 <Method name="txtScanLocatieExit">
 <FormalSpec>Args:%String</FormalSpec>
@@ -1084,7 +1085,7 @@
  . Do NoAllocForm.Form.ShowModal()
  . Set ProcessOK=NoAllocForm.AllocOK
  . Do NoAllocForm.%Close()
-
+ 
  Quit:(DoDataOnly) 1
 
  ;==============================================================================
Index: APPS/MAG/UGLYPicking/dto/ProductLijn.cls.xml
===================================================================
diff -u -r1594 -r1608
--- APPS/MAG/UGLYPicking/dto/ProductLijn.cls.xml	(.../ProductLijn.cls.xml)	(revision 1594)
+++ APPS/MAG/UGLYPicking/dto/ProductLijn.cls.xml	(.../ProductLijn.cls.xml)	(revision 1608)
@@ -13,10 +13,15 @@
 <Type>%Boolean</Type>
 </Property>
 
-<Property name="KennisAnker">
+<Property name="KennisAnkers">
 <Type>%String</Type>
+<Collection>list</Collection>
 </Property>
 
+<Property name="ProductID">
+<Type>%String</Type>
+</Property>
+
 <Property name="LocatieID">
 <Type>%String</Type>
 </Property>
@@ -25,17 +30,37 @@
 <Type>%String</Type>
 </Property>
 
-<Property name="ProductID">
+<Property name="MagazijnID">
 <Type>%String</Type>
 </Property>
 
 <Property name="ProductOmschrijving">
 <Type>%String</Type>
 </Property>
 
-<Property name="ProductLijnProbleemen">
+<Property name="Problemen">
 <Type>APPS.MAG.UGLYPicking.dto.ProductLijnProbleem</Type>
 <Collection>list</Collection>
 </Property>
+
+<Property name="IsVollePallet">
+<Type>%Boolean</Type>
+</Property>
+
+<Property name="IsPalletVolledigTePicken">
+<Type>%Boolean</Type>
+</Property>
+
+<Property name="Korttekst">
+<Type>%String</Type>
+</Property>
+
+<Property name="Langtekst">
+<Type>%String</Type>
+</Property>
+
+<Property name="HeeftChargeNummer">
+<Type>%Boolean</Type>
+</Property>
 </Class>
 </Export>
Index: APPS/MAG/UGLYPicking/dto/ProductLijnen.cls.xml
===================================================================
diff -u -r1594 -r1608
--- APPS/MAG/UGLYPicking/dto/ProductLijnen.cls.xml	(.../ProductLijnen.cls.xml)	(revision 1594)
+++ APPS/MAG/UGLYPicking/dto/ProductLijnen.cls.xml	(.../ProductLijnen.cls.xml)	(revision 1608)
@@ -5,18 +5,14 @@
 <Super>%RegisteredObject,%XML.Adaptor</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
-<Property name="BonNr">
-<Type>%Integer</Type>
-</Property>
-
 <Property name="KennisAnkers">
 <Description>
 Dit is een kennisanker dat moet gelezen worden voor er gestart wordt met picken.</Description>
 <Type>%String</Type>
 <Collection>list</Collection>
 </Property>
 
-<Property name="ProductLijnen">
+<Property name="Lijst">
 <Type>APPS.MAG.UGLYPicking.dto.ProductLijn</Type>
 <Collection>list</Collection>
 </Property>
Index: APPS/MAG/UglyPickingService.cls.xml
===================================================================
diff -u -r1594 -r1608
--- APPS/MAG/UglyPickingService.cls.xml	(.../UglyPickingService.cls.xml)	(revision 1594)
+++ APPS/MAG/UglyPickingService.cls.xml	(.../UglyPickingService.cls.xml)	(revision 1608)
@@ -55,9 +55,9 @@
 </Method>
 
 <Method name="GeefProductLijnen">
-<FormalSpec>BonNr:%Integer</FormalSpec>
+<FormalSpec>BonNr:%Integer,MagazijnID:APPS.MAG.UGLYPicking.enu.Magazijn</FormalSpec>
 <ReturnType>APPS.MAG.UGLYPicking.dto.ProductLijnen</ReturnType>
-<Implementation><![CDATA[	Quit ..Service.GeefProductLijnen(BonNr)
+<Implementation><![CDATA[	Quit ..Service.GeefProductLijnen(BonNr, MagazijnID)
 ]]></Implementation>
 </Method>
 
@@ -80,8 +80,10 @@
 </Method>
 
 <Method name="StelUit">
-<FormalSpec>Bon:APPS.MAG.UGLYPicking.dto.Bon,UitstelOptie:APPS.MAG.UGLYPicking.enu.UitstelOptie</FormalSpec>
-<ReturnType>%Status</ReturnType>
+<FormalSpec>BonNr:%Integer,UitstelOptie:APPS.MAG.UGLYPicking.enu.UitstelOptie</FormalSpec>
+<ReturnType>%TimeStamp</ReturnType>
+<Implementation><![CDATA[	Quit ..Service.StelUit(BonNr,UitstelOptie)
+]]></Implementation>
 </Method>
 
 <Method name="VoerPickingUit">
Index: APPS/MAG/UGLYPicking/dto/ReservatieProbleem.cls.xml
===================================================================
diff -u -r1576 -r1608
--- APPS/MAG/UGLYPicking/dto/ReservatieProbleem.cls.xml	(.../ReservatieProbleem.cls.xml)	(revision 1576)
+++ APPS/MAG/UGLYPicking/dto/ReservatieProbleem.cls.xml	(.../ReservatieProbleem.cls.xml)	(revision 1608)
@@ -3,9 +3,10 @@
 <Class name="APPS.MAG.UGLYPicking.dto.ReservatieProbleem">
 <ProcedureBlock>1</ProcedureBlock>
 <Super>APPS.MAG.UGLYPicking.dto.ProductLijnProbleem</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
 
-<Property name="AantalGereserveerd">
-<Type>%Integer</Type>
+<Property name="FoutBoodschap">
+<Type>%String</Type>
 </Property>
 </Class>
 </Export>