Index: Flow/OrderWMS/PalletReservatie.cls.xml
===================================================================
diff -u -r1606 -r1617
--- Flow/OrderWMS/PalletReservatie.cls.xml	(.../PalletReservatie.cls.xml)	(revision 1606)
+++ Flow/OrderWMS/PalletReservatie.cls.xml	(.../PalletReservatie.cls.xml)	(revision 1617)
@@ -560,6 +560,13 @@
  ORDER BY ConsolidatieNr</SqlQuery>
 </Query>
 
+<Query name="GetIDViaConsNrPallIDAndProd">
+<Type>%SQLQuery</Type>
+<FormalSpec>paConsolidatieNr:%String,paPalletID:%String,paProdNr:%String</FormalSpec>
+<SqlQuery> SELECT ID FROM Flow_OrderWMS.PalletReservatie
+ WHERE (ConsolidatieNr = :paConsolidatieNr AND PalletID = :paPalletID AND Product = :paProdNr)</SqlQuery>
+</Query>
+
 <Query name="GetReservatiesViaPalletID">
 <Type>%SQLQuery</Type>
 <FormalSpec>PalletID:%String</FormalSpec>
FishEye: Tag 1617 refers to a dead (removed) revision in file `APPS/MAG/UGLYPicking/dto/PalletReservatie.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: vhUnitTest/APPS/MAG/UGLYPicking/TestUglyPickingService.cls.xml
===================================================================
diff -u -r1616 -r1617
--- vhUnitTest/APPS/MAG/UGLYPicking/TestUglyPickingService.cls.xml	(.../TestUglyPickingService.cls.xml)	(revision 1616)
+++ vhUnitTest/APPS/MAG/UGLYPicking/TestUglyPickingService.cls.xml	(.../TestUglyPickingService.cls.xml)	(revision 1617)
@@ -51,14 +51,8 @@
 	Do ..MaakProducten()
 	Do ..MaakPalletReservatie()
 	
-	set dtoPalletReservatie = ##class(APPS.MAG.UGLYPicking.dto.PalletReservatie).%New()
-	set dtoPalletReservatie.BonNr = 999999
-	set dtoPalletReservatie.Magazijn = "UNITTEST"
-	set dtoPalletReservatie.PalletID = 1234
-	set dtoPalletReservatie.ProductID = 1000
-	set dtoPalletReservatie.Sectie = "UT-SECTIE"
 	
-	set dtoPallet = Service.GeefPalletInhoud(dtoPalletReservatie)
+	set dtoPallet = Service.GeefPalletInhoud(999999,1000,1234)
 	
 	do $$$AssertEquals(dtoPallet.Inhouden.Size,2,"Aantal inhouden")
 	do $$$AssertEquals(dtoPallet.Inhouden.GetAt(1).VerpakkingOmschrijving,"Kx2","Controle omschrijving")
@@ -68,16 +62,8 @@
 	do $$$AssertEquals(dtoPallet.Inhouden.GetAt(2).AantalTePicken,1,"Controle aantal te picken")
 	do $$$AssertEquals(dtoPallet.Inhouden.GetAt(2).AantalResterend,1,"Controle aantal resterend")
 	
+	set dtoPallet = Service.GeefPalletInhoud(999998,1001,1235)
 	
-	set dtoPalletReservatie = ##class(APPS.MAG.UGLYPicking.dto.PalletReservatie).%New()
-	set dtoPalletReservatie.BonNr = 999998
-	set dtoPalletReservatie.Magazijn = "UNITTEST"
-	set dtoPalletReservatie.PalletID = 1235
-	set dtoPalletReservatie.ProductID = 1001
-	set dtoPalletReservatie.Sectie = "UT-SECTIE"
-	
-	set dtoPallet = Service.GeefPalletInhoud(dtoPalletReservatie)
-	
 	do $$$AssertEquals(dtoPallet.Inhouden.Size,2,"Aantal inhouden")
 	do $$$AssertEquals(dtoPallet.Inhouden.GetAt(1).VerpakkingOmschrijving,"Gx10","Controle omschrijving")
 	do $$$AssertEquals(dtoPallet.Inhouden.GetAt(1).AantalTePicken,4,"Controle aantal te picken")
@@ -87,9 +73,13 @@
 	do $$$AssertEquals(dtoPallet.Inhouden.GetAt(2).AantalResterend,5,"Controle aantal resterend")
 	
 	Do ..VerwijderPalletReservatie()
-	
 	Do ..VerwijderProducten()
 	
+	Set Service = ##class(APPS.MAG.UGLYPicking.impl.UglyPickingService).%New()
+	Do ..MaakBon(1234)
+	Set Bon = Service.GeefBon(1234)
+	
+	
 	Quit
 ]]></Implementation>
 </Method>
@@ -176,6 +166,7 @@
 	do ##class(Flow.OrderWMS.PalletReservatie).%DeleteId(ID)
 	set ID = 999998 _"||" _"UNITTEST"_ "||" _ 1235 _ "||"_ 1001 _ "||" _ "UT-SECTIE"
 	do ##class(Flow.OrderWMS.PalletReservatie).%DeleteId(ID)
+	quit
 ]]></Implementation>
 </Method>
 
Index: APPS/MAG/UGLYPicking/dto/PickingResultaat.cls.xml
===================================================================
diff -u
--- APPS/MAG/UGLYPicking/dto/PickingResultaat.cls.xml	(revision 0)
+++ APPS/MAG/UGLYPicking/dto/PickingResultaat.cls.xml	(revision 1617)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="APPS.MAG.UGLYPicking.dto.PickingResultaat">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%RegisteredObject,%XML.Adaptor</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="Waarschuwingen">
+<Type>%String</Type>
+<Collection>list</Collection>
+</Property>
+
+<Property name="CycleCountUitvoeren">
+<Type>%Boolean</Type>
+</Property>
+
+<Property name="ReCalcReservation">
+<Type>%Boolean</Type>
+</Property>
+</Class>
+</Export>
Index: APPS/MAG/UglyPickingService.cls.xml
===================================================================
diff -u -r1608 -r1617
--- APPS/MAG/UglyPickingService.cls.xml	(.../UglyPickingService.cls.xml)	(revision 1608)
+++ APPS/MAG/UglyPickingService.cls.xml	(.../UglyPickingService.cls.xml)	(revision 1617)
@@ -46,11 +46,9 @@
 </Method>
 
 <Method name="GeefPalletInhoud">
-<FormalSpec>dtoPalletReservatie:APPS.MAG.UGLYPicking.dto.PalletReservatie</FormalSpec>
+<FormalSpec>BonNr:%String,ProductID:%String,PalletID:%String</FormalSpec>
 <ReturnType>APPS.MAG.UGLYPicking.dto.Pallet</ReturnType>
-<Implementation><![CDATA[
-	
-	Quit ..Service.GeefPalletInhoud(dtoPalletReservatie)
+<Implementation><![CDATA[	Quit ..Service.GeefPalletInhoud(BonNr,ProductID,PalletID)
 ]]></Implementation>
 </Method>
 
@@ -88,8 +86,9 @@
 
 <Method name="VoerPickingUit">
 <FormalSpec>Product:APPS.MAG.UGLYPicking.dto.GepickedProduct</FormalSpec>
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[]]></Implementation>
+<ReturnType>APPS.MAG.UGLYPicking.dto.PickingResultaat</ReturnType>
+<Implementation><![CDATA[	Quit ..Service.VoerPickingUit(Product)
+]]></Implementation>
 </Method>
 </Class>
 </Export>
Index: APPS/MAG/UGLYPicking/impl/UglyPickingService.cls.xml
===================================================================
diff -u -r1615 -r1617
--- APPS/MAG/UGLYPicking/impl/UglyPickingService.cls.xml	(.../UglyPickingService.cls.xml)	(revision 1615)
+++ APPS/MAG/UGLYPicking/impl/UglyPickingService.cls.xml	(.../UglyPickingService.cls.xml)	(revision 1617)
@@ -168,15 +168,14 @@
 </Method>
 
 <Method name="GeefPalletInhoud">
-<FormalSpec>dtoPalletReservatie:APPS.MAG.UGLYPicking.dto.PalletReservatie</FormalSpec>
+<FormalSpec>BonNr:%String,ProductID:%String,PalletID:%String</FormalSpec>
 <ReturnType>APPS.MAG.UGLYPicking.dto.Pallet</ReturnType>
 <Implementation><![CDATA[
 	set OrderAPI = ##class(DOM.DomeinContext).Instance().GeefOrderAPI()
 	
 	set dtoPallet = ##class(APPS.MAG.UGLYPicking.dto.Pallet).%New()
-	//set dtoPallet.PalletReservatie = dtoPalletReservatie
 	
-	set PalletReservatieID = dtoPalletReservatie.BonNr_"||"_dtoPalletReservatie.Magazijn_"||"_dtoPalletReservatie.PalletID_"||"_dtoPalletReservatie.ProductID_"||"_dtoPalletReservatie.Sectie
+	set PalletReservatieID = ..BepaalPalletReservatieID(BonNr,ProductID,PalletID) 
 	
 	set PalletReservatie=##class(Flow.OrderWMS.PalletReservatie).%OpenId(PalletReservatieID)
 	set itOrderNrs = ##class(TECH.ListbuildIterator).%New(PalletReservatie.GetOrderNrList())
@@ -213,8 +212,25 @@
 ]]></Implementation>
 </Method>
 
+<Method name="BepaalPalletReservatieID">
+<FormalSpec>BonNr:%String,ProductID:%String,PalletID:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	set rsPalletReservatie = ##class(%ResultSet).%New("Flow.OrderWMS.PalletReservatie:GetIDViaConsNrPallIDAndProd")
+	do rsPalletReservatie.Execute(BonNr, PalletID , ProductID)
+	if rsPalletReservatie.Next() { set Result = rsPalletReservatie.Get("ID") }
+	
+	if '$length($get(Result)) { 
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("PalletReservatie niet gevonden voor "_BonNr_" "_ProductID_" "_PalletID)) 
+	}
+	
+	quit Result
+]]></Implementation>
+</Method>
+
 <Method name="BuildInhoud">
-<FormalSpec>Omschrijving,AantalInVerpakking,AantalTePicken,AantalResterend</FormalSpec>
+<FormalSpec>Omschrijving:%String,AantalInVerpakking:%Integer,AantalTePicken:%Integer,AantalResterend:%Integer</FormalSpec>
 <Private>1</Private>
 <ReturnType>APPS.MAG.UGLYPicking.dto.Inhoud</ReturnType>
 <Implementation><![CDATA[
@@ -378,13 +394,109 @@
 </Method>
 
 <Method name="VoerPickingUit">
-<FormalSpec>Product:APPS.MAG.UGLYPicking.dto.GepickedProduct</FormalSpec>
-<ReturnType>%Status</ReturnType>
-</Method>
+<FormalSpec>GepickedProduct:APPS.MAG.UGLYPicking.dto.GepickedProduct</FormalSpec>
+<ReturnType>APPS.MAG.UGLYPicking.dto.PickingResultaat</ReturnType>
+<Implementation><![CDATA[
+	set dtoPickingResultaat = ##class(APPS.MAG.UGLYPicking.dto.PickingResultaat).%New()
+	
+	if '##class(Flow.OrderWMS.Hoofding).%ExistsId(GepickedProduct.BonNr) {
+		do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Bon met nummer "_GepickedProduct.BonNr_" bestaat niet."))
+	}
+	
+	lock +^ORDW("D",GepickedProduct.BonNr):0  else  do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Bon met nummer "_GepickedProduct.BonNr_" is in gebruik."))
+	
+	set PalletReservatieID = ..BepaalPalletReservatieID(GepickedProduct.BonNr,GepickedProduct.ProductID,GepickedProduct.PalletID)
+	
+	set PalletReservatie = ##class(Flow.OrderWMS.PalletReservatie).%OpenId(PalletReservatieID)
+	
+	if '$IsObject(PalletReservatie) {
+		do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("PalletReservatie "_PalletReservatieID_" bestaat niet."))	
+	}
+	
+	if '$IsObject(PalletReservatie.AssociatedZeroPallet) {
+		do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Interne fout: de pallet-reservatie is niet meer gekoppeld aan een geldige zero-pallet'!"))	
+	}
+	
+	if 'PalletReservatie.AssociatedZeroPallet.ReservationIsDone {
+		do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New(PalletReservatie.AssociatedZeroPallet.FailedReservation))	
+	}	
+	
+	if '$IsObject(PalletReservatie.Inventory) {
+		do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("De pallet-reservatie is niet meer gekoppeld aan een geldig inventory-object!"))
+	}
+	
+	if '$IsObject(PalletResObj.Locations) {
+		do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("De pallet-reservatie is niet meer gekoppeld aan een geldig locations-object!"))
+	}
+	
+ 	set AantalTePicken = PalletReservatie.AantalTePicken
+ 	set OrigAantal=PalletReservatie.AantalTePicken
 
-<Method name="GeefSessie">
-<Private>1</Private>
-<ReturnType>APPS.MAG.UGLYPicking.impl.Sessie</ReturnType>
+	set InventoryID=PalletReservatie.Inventory.%Id()
+	set LocationsID=PalletReservatie.Locations.%Id()
+
+ 	if PalletReservatie.AantalTePicken'=AantalTePicken { 
+ 	 	set PalletReservatie.AantalTePicken=AantalTePicken
+ 	 	do PalletReservatie.%Save()
+ 	 	set dtoPickingResultaat.CycleCountUitvoeren = 1   ;Cycle-count vereist: u hebt het # aangepast, dit heeft een c/c reden (bijv. beschadigd)
+ 	 	set dtoPickingResultaat.ReCalcReservation = 1	  ;Het wijzigen vh aantal moet resulteren in een herberekening vd reservatie	
+	}
+
+ 	if AantalTePicken>PalletReservatie.Inventory.QtyPcs {
+ 		do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Het te picken aantal ("_AantalTePicken_") is nu groter dan het aantal beschikbaar op de pallet ("_PalletResObj.Inventory.QtyPcs_")."))
+ 	}
+ 
+ 	;Pallet volledig picken?
+ 	If PalletReservatie.Inventory.QtyPcs-AantalTePicken=0 {
+ 		;Set:('..IgnoreCCWhenFullPick) dtoPickingResultaat.CycleCountUitvoeren=1   ;Indien Ignore-flag niet op 0->C/C triggeren
+ 	}
+ 	
+	;do PalletReservatie.%Close()
+ 	set PalletReservatie = ""
+
+	if GepickedProduct.Charges.Count > 0 {
+		;$$$WriteToLog("*** RegisterORDWChargeTrace ***")
+ 		set itCharges = ##class(TECH.ListIterator).%New(GepickedProduct.Charges)
+ 		set errRegisterCharges = ""
+ 		while itCharges.HasNext() && '$length(errRegisterCharges) {
+		 	set ChargeInfo = itCharges.Next()
+		 	;$$$WriteToLog("- ConsNr: "_..ConsNr_" - Magazijn: "_..Magazijn_" - ProdNr: "_..ProductNr_" - Qty: "_ChargeQty_" - ChargeID: "_ChargeID)
+		 	set errRegisterCharges = ##class(BL.ProdHist.ChargeTrace).RegisterORDWChargeTrace(GepickedProduct.BonNr,GepickedProduct.Magazijn,GepickProduct.ProductID,ChargeInfo.Aantal,ChargeInfo.ChargeID,.varlbAssocChargeAantal) 	
+		 	;$$$WriteToLog("  ChargeTraceAantalIDs => "_$$LCVT^vhLib(varlbAssocChargeAantal))
+ 		}
+ 	
+ 		if $length(errRegisterCharges) {
+	 		do dtoPickingResultaat.Waarschuwingen.Insert("Fout tijdens vastleggen ChargeIDs: "_errRegisterCharges_".")
+ 		}
+		else {
+			;$$$WriteToLog("RegisterChargeTrace success")	
+		}
+ 	}
+
+ 	set errCommitReservation=##class(Flow.OrderWMS.PalletReservatie).CommitReservation(PalletReservatieID)
+ 	
+ 	if $length(errCommitReservation) {
+	 	do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New(errCommitReservation))
+ 	}
+ 	
+ 	;Mogelijk is AantalTePicken <> OrigAantal omdat met de mogelijkheid heeft het aantal te wijzigen
+ 	;in deze form, om de reservatie dan correct weg te halen moet het originele aantal worden
+ 	;opgegeven. Stel QtyOrig=30, dan is QtyOrigRes=30, u verandert het aantal in 10. U drukt op de
+ 	;button 'klaar'. Deze zal een reservatie van slechts 10 weghalen indien u niet met CommitPicking
+ 	;het reservatie-aantal opgeeft. Dan neemt deze gewoon de nieuwe Qty=10. Dwz dat er nog 20 gereserveerd
+ 	;blijven, terwijl deze helemaal ter beschikking zijn van de gebruiker. Dus wij geven OrigAantal (=30)
+ 	;mee aan CommitPicking:
+ 	
+ 	set errCommitPicking=##class(EWMS.Inventory).CommitPicking(InventoryID,LocationsID,AantalTePicken,OrigAantal,GepickedProduct.BonNr)
+ 	if $length(errCommitPicking) {
+	 	do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New(errCommitPicking))
+ 	}
+ 
+ 	; Afdrukken van etiket in dien nod
+ 	;Do:(..AskForPrintPalletEtiket) ..PrintPalletEtiket(..ConsNr,1,..Magazijn)
+ 
+ 	quit dtoPickingResultaat
+]]></Implementation>
 </Method>
 </Class>
 </Export>
Index: APPS/MAG/UGLYPicking/dto/Charges.cls.xml
===================================================================
diff -u
--- APPS/MAG/UGLYPicking/dto/Charges.cls.xml	(revision 0)
+++ APPS/MAG/UGLYPicking/dto/Charges.cls.xml	(revision 1617)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="APPS.MAG.UGLYPicking.dto.Charges">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%RegisteredObject,%XML.Adaptor</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="ChargeID">
+<Type>%String</Type>
+</Property>
+
+<Property name="Aantal">
+<Type>%Integer</Type>
+</Property>
+</Class>
+</Export>
Index: APPS/MAG/UGLYPicking/dto/GepickedProduct.cls.xml
===================================================================
diff -u -r1576 -r1617
--- APPS/MAG/UGLYPicking/dto/GepickedProduct.cls.xml	(.../GepickedProduct.cls.xml)	(revision 1576)
+++ APPS/MAG/UGLYPicking/dto/GepickedProduct.cls.xml	(.../GepickedProduct.cls.xml)	(revision 1617)
@@ -3,15 +3,21 @@
 <Class name="APPS.MAG.UGLYPicking.dto.GepickedProduct">
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject,%XML.Adaptor</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="BonNr">
 <Type>%Integer</Type>
 </Property>
 
-<Property name="ChargeNummers">
-<Type>%Integer</Type>
+<Property name="Charges">
+<Type>APPS.MAG.UGLYPicking.dto.Charges</Type>
+<Collection>list</Collection>
 </Property>
 
+<Property name="MagazijnID">
+<Type>APPS.MAG.UGLYPicking.enu.Magazijn</Type>
+</Property>
+
 <Property name="LocatieID">
 <Type>%String</Type>
 </Property>
@@ -23,5 +29,9 @@
 <Property name="ProductID">
 <Type>%String</Type>
 </Property>
+
+<Property name="Aantal">
+<Type>%Integer</Type>
+</Property>
 </Class>
 </Export>