Index: WS/MAG/UGLYPicking/UGLYPickingService.cls.xml
===================================================================
diff -u -r1797 -r2127
--- WS/MAG/UGLYPicking/UGLYPickingService.cls.xml	(.../UGLYPickingService.cls.xml)	(revision 1797)
+++ WS/MAG/UGLYPicking/UGLYPickingService.cls.xml	(.../UGLYPickingService.cls.xml)	(revision 2127)
@@ -116,5 +116,12 @@
 <Implementation><![CDATA[	Do ##class(APPS.MAG.UglyPickingService).%New().WijzigReservatieAantal(BonNr, ProductLijn, NieuwReservatieAantal)
 ]]></Implementation>
 </Method>
+
+<Method name="VerwijderReservatie">
+<FormalSpec>BonNr:%Integer,MagazijnID:APPS.MAG.UGLYPicking.enu.Magazijn,ProductID:%String</FormalSpec>
+<WebMethod>1</WebMethod>
+<Implementation><![CDATA[	Do ##class(APPS.MAG.UglyPickingService).%New().VerwijderReservatie(BonNr, MagazijnID, ProductID)
+]]></Implementation>
+</Method>
 </Class>
 </Export>
Index: vhUnitTest/APPS/MAG/Inventaris/TestInventarisService.cls.xml
===================================================================
diff -u -r2094 -r2127
--- vhUnitTest/APPS/MAG/Inventaris/TestInventarisService.cls.xml	(.../TestInventarisService.cls.xml)	(revision 2094)
+++ vhUnitTest/APPS/MAG/Inventaris/TestInventarisService.cls.xml	(.../TestInventarisService.cls.xml)	(revision 2127)
@@ -9,7 +9,6 @@
 
 <Method name="TestGeefProductenOpPallet">
 <Implementation><![CDATA[
-	
 	Set Service = ##class(APPS.MAG.InventarisService).%New()
 	
 	Set ProductenOpPallet = Service.GeefProductenOpPallet("98765432")
@@ -82,6 +81,39 @@
 ]]></Implementation>
 </Method>
 
+<Method name="TestBevestigCycleCount">
+<Implementation><![CDATA[
+	Set Service = ##class(APPS.MAG.InventarisService).%New()
+	
+	Set ProductenOpPallet = Service.GeefProductenOpPallet("98765432")
+	Set ProductOpPallet = ProductenOpPallet.GetAt(1)
+	Do $$$AssertEquals(ProductOpPallet.ProductID,1000,"Product 1000")
+	Do $$$AssertEquals(ProductOpPallet.Aantal,170,"170 stuks van product 1000")
+	
+	// Aantal van 170 naar 161 zetten, 80 verpakkingen van 2 stuks + 1 stuk
+	Set AantalGrootVerpakkingen = 0
+	Set AantalNormaleVerpakkingen = 80
+	Set AantalStukVerpakkingen = 1
+	Do Service.BevestigCycleCount("98765432",1000,"unittesten cyclecount",AantalGrootVerpakkingen, AantalNormaleVerpakkingen, AantalStukVerpakkingen)
+	
+	Set ProductenOpPallet = Service.GeefProductenOpPallet("98765432")
+	Set ProductOpPallet = ProductenOpPallet.GetAt(1)
+	Do $$$AssertEquals(ProductOpPallet.ProductID,1000,"Product 1000")
+	Do $$$AssertEquals(ProductOpPallet.Aantal,161,"160 stuks van product 1000")
+	
+	// Aantal terug op 170 plaatsen
+	Set AantalGrootVerpakkingen = 0
+	Set AantalNormaleVerpakkingen = 85
+	Set AantalStukVerpakkingen = 0
+	Do Service.BevestigCycleCount("98765432",1000,"unittesten cyclecount",AantalGrootVerpakkingen, AantalNormaleVerpakkingen, AantalStukVerpakkingen)
+	
+	Set ProductenOpPallet = Service.GeefProductenOpPallet("98765432")
+	Set ProductOpPallet = ProductenOpPallet.GetAt(1)
+	Do $$$AssertEquals(ProductOpPallet.ProductID,1000,"Product 1000")
+	Do $$$AssertEquals(ProductOpPallet.Aantal,170,"170 stuks van product 1000")
+]]></Implementation>
+</Method>
+
 <Method name="TestGeefProductReceptieDetail">
 <Implementation><![CDATA[
 	Do ..MaakToReceivePallet()
Index: APPS/MAG/InventarisService.cls.xml
===================================================================
diff -u -r2094 -r2127
--- APPS/MAG/InventarisService.cls.xml	(.../InventarisService.cls.xml)	(revision 2094)
+++ APPS/MAG/InventarisService.cls.xml	(.../InventarisService.cls.xml)	(revision 2127)
@@ -455,7 +455,7 @@
 	Set Product = ##class(DOM.DomeinContext).Instance().GeefProductAPI().GeefProduct(ProductID)
 	
 	Set ResultSet = ##class(%ResultSet).%New()
-	Do ResultSet.Prepare("SELECT CAST(qty_pcs AS INT) as Aantal FROM EWMS.Inventory I WHERE loc_id = ? and product = ?")
+	Do ResultSet.Prepare("SELECT CAST(qty_pcs AS INT) as Aantal FROM EWMS.Inventory I WHERE loc_id = ? AND product = ? AND loc_m < 5")
 	Do ResultSet.Execute(PalletID, ProductID)
 	If (ResultSet.Next())
 	{
@@ -472,6 +472,7 @@
 	
 	// Geen enumeratie nodig, opsomming kan makkelijk uitgebreid worden indien nodig.
 	// De reden voor cyclecount wordt achteraf toch niet getest.
+	// Extra redenen zouden eventueel vanuit GUI kunnen worden ingetypt door de gebruiker.
 	Do CycleCountInfo.Redenen.Insert("Beschadigd")
 	Do CycleCountInfo.Redenen.Insert("Cycle count")
 	Do CycleCountInfo.Redenen.Insert("Receptie correctie")
@@ -531,5 +532,44 @@
 	Quit AanwezigInMagazijnen
 ]]></Implementation>
 </Method>
+
+<Method name="BevestigCycleCount">
+<FormalSpec>PalletID:%String,ProductID:%String,Reden:%String,AantalGrootVerpakkingen:%Integer,AantalNormaalVerpakkingen:%Integer,AantalKleinVerpakkingen:%Integer</FormalSpec>
+<Implementation><![CDATA[
+	Set Aantal = 0
+	Set Sectie = ""
+	Set ResultSet = ##class(%ResultSet).%New()
+	Do ResultSet.Prepare("SELECT Sectie As Sectie FROM EWMS.Inventory I WHERE loc_id = ? AND product = ? AND loc_m < 5")
+	Do ResultSet.Execute(PalletID, ProductID)
+	If (ResultSet.Next())
+	{
+		Set Sectie = ResultSet.Data("Sectie")
+	}
+	Else
+	{
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Product "_ProductID_" op pallet "_PalletID_" kon niet worden gevonden"))
+	}
+	
+	Set Locatie = ##class(BL.MB.UGLYPicking.General).GetLocationViaLocID(PalletID)
+	
+	Set Product = ##class(DOM.DomeinContext).Instance().GeefProductAPI().GeefProduct(ProductID)
+	
+	If ('$IsObject(Product))
+	{
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Product "_ProductID_" bestaat niet"))
+	}
+	
+	Set Aantal = Product.GeefAantalInGrootVerpakking() * AantalGrootVerpakkingen + Aantal
+	Set Aantal = Product.GeefAantalInNormaalVerpakking() * AantalNormaalVerpakkingen + Aantal
+	Set Aantal = AantalKleinVerpakkingen + Aantal
+	
+	Set ErrorBoodschap = ##class(BL.MB.UGLYPicking.Opslag).CommitChangeStock(PalletID, Locatie, Sectie, ProductID, Aantal, Reden, ##class(TECH.Context.RuntimeContext).Instance().GeefGebruikerInitialen(),"C/C: "_Reden)
+	
+	If (ErrorBoodschap '= "")
+	{
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.GeneralErrorException).%New("Kon de cyclecount niet doorvoeren: "_ErrorBoodschap))
+	}
+]]></Implementation>
+</Method>
 </Class>
 </Export>
Index: APPS/MAG/UglyPickingService.cls.xml
===================================================================
diff -u -r1948 -r2127
--- APPS/MAG/UglyPickingService.cls.xml	(.../UglyPickingService.cls.xml)	(revision 1948)
+++ APPS/MAG/UglyPickingService.cls.xml	(.../UglyPickingService.cls.xml)	(revision 2127)
@@ -116,5 +116,11 @@
 <Implementation><![CDATA[	Quit ..Service.IsBonInGebruik(BonNr)
 ]]></Implementation>
 </Method>
+
+<Method name="VerwijderReservatie">
+<FormalSpec>BonNr:%Integer,MagazijnID:APPS.MAG.UGLYPicking.enu.Magazijn,ProductID:%String</FormalSpec>
+<Implementation><![CDATA[	Do ..Service.VerwijderReservatie(BonNr, MagazijnID, ProductID)
+]]></Implementation>
+</Method>
 </Class>
 </Export>
Index: APPS/MAG/UGLYPicking/impl/UglyPickingService.cls.xml
===================================================================
diff -u -r1948 -r2127
--- APPS/MAG/UGLYPicking/impl/UglyPickingService.cls.xml	(.../UglyPickingService.cls.xml)	(revision 1948)
+++ APPS/MAG/UGLYPicking/impl/UglyPickingService.cls.xml	(.../UglyPickingService.cls.xml)	(revision 2127)
@@ -864,5 +864,11 @@
 	Quit Sessie
 ]]></Implementation>
 </Method>
+
+<Method name="VerwijderReservatie">
+<FormalSpec>BonNr:%Integer,MagazijnID:APPS.MAG.UGLYPicking.enu.Magazijn,ProductID:%String</FormalSpec>
+<Implementation><![CDATA[	Do ##class(BL.MB.UGLYPicking.PalletPick).UndoProductReservation(BonNr,##class(APPS.MAG.UGLYPicking.enu.Magazijn).LogicalToDisplay(MagazijnID),$LB(ProductID))
+]]></Implementation>
+</Method>
 </Class>
 </Export>