Index: CSC Ugly Picking.prj.xml
===================================================================
diff -u -r1970 -r2094
--- CSC Ugly Picking.prj.xml	(.../CSC Ugly Picking.prj.xml)	(revision 1970)
+++ CSC Ugly Picking.prj.xml	(.../CSC Ugly Picking.prj.xml)	(revision 2094)
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="9">
-<Project name="CSC Ugly Picking" LastModified="2011-09-02 10:49:52">
+<Project name="CSC Ugly Picking" LastModified="2011-09-15 14:49:12">
   <Items>
     <ProjectItem name="APPS.MAG.Inventaris.dto.AanwezigInMagazijn" type="CLS"/>
     <ProjectItem name="APPS.MAG.Inventaris.dto.BijladenInfo" type="CLS"/>
     <ProjectItem name="APPS.MAG.Inventaris.dto.BijladenUitgevoerd" type="CLS"/>
     <ProjectItem name="APPS.MAG.Inventaris.dto.BijladenVanVerpakking" type="CLS"/>
+    <ProjectItem name="APPS.MAG.Inventaris.dto.CycleCountInfo" type="CLS"/>
     <ProjectItem name="APPS.MAG.Inventaris.dto.ProductOpPallet" type="CLS"/>
     <ProjectItem name="APPS.MAG.Inventaris.dto.ProductReceptieDetail" type="CLS"/>
+    <ProjectItem name="APPS.MAG.Inventaris.dto.ProductVerpakking" type="CLS"/>
     <ProjectItem name="APPS.MAG.Inventaris.dto.ProductenOpPallet" type="CLS"/>
     <ProjectItem name="APPS.MAG.Inventaris.dto.ReceptieDetail" type="CLS"/>
     <ProjectItem name="APPS.MAG.Inventaris.enu.AutoMagazijnUitgang" type="CLS"/>
Index: APPS/MAG/Inventaris/dto/CycleCountInfo.cls.xml
===================================================================
diff -u
--- APPS/MAG/Inventaris/dto/CycleCountInfo.cls.xml	(revision 0)
+++ APPS/MAG/Inventaris/dto/CycleCountInfo.cls.xml	(revision 2094)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="APPS.MAG.Inventaris.dto.CycleCountInfo">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%RegisteredObject,%XML.Adaptor</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="Aantal">
+<Type>%Integer</Type>
+</Property>
+
+<Property name="PalletID">
+<Type>%String</Type>
+</Property>
+
+<Property name="ProductID">
+<Type>%String</Type>
+</Property>
+
+<Property name="Redenen">
+<Type>%String</Type>
+<Collection>list</Collection>
+</Property>
+
+<Property name="GrootVerpakking">
+<Type>APPS.MAG.Inventaris.dto.ProductVerpakking</Type>
+</Property>
+
+<Property name="NormaalVerpakking">
+<Type>APPS.MAG.Inventaris.dto.ProductVerpakking</Type>
+</Property>
+
+<Property name="KleinVerpakking">
+<Type>APPS.MAG.Inventaris.dto.ProductVerpakking</Type>
+</Property>
+</Class>
+</Export>
Index: vhUnitTest/APPS/MAG/Inventaris/TestInventarisService.cls.xml
===================================================================
diff -u -r2004 -r2094
--- vhUnitTest/APPS/MAG/Inventaris/TestInventarisService.cls.xml	(.../TestInventarisService.cls.xml)	(revision 2004)
+++ vhUnitTest/APPS/MAG/Inventaris/TestInventarisService.cls.xml	(.../TestInventarisService.cls.xml)	(revision 2094)
@@ -59,6 +59,29 @@
 ]]></Implementation>
 </Method>
 
+<Method name="TestGeefCycleCountInfo">
+<Implementation><![CDATA[
+	Set Service = ##class(APPS.MAG.InventarisService).%New()
+	Set CycleCountInfo = Service.GeefCycleCountInfo("98765432",1000)
+	
+	Do $$$AssertEquals(CycleCountInfo.PalletID,"98765432","De pallet id")	
+	Do $$$AssertEquals(CycleCountInfo.ProductID,1000,"De product id")
+	Do $$$AssertTrue(CycleCountInfo.Redenen.Count()>0,"Er zijn redenen ingevuld")
+	
+	Set GrootVerpakking = CycleCountInfo.GrootVerpakking
+	Do $$$AssertEquals(GrootVerpakking.AantalVerpakkingen,0,"Aantal grootverpakkingen")
+	Do $$$AssertEquals(GrootVerpakking.AantalInVerpakking,0,"Aantal in grootverpakking")
+	
+	Set NormaalVerpakking = CycleCountInfo.NormaalVerpakking
+	Do $$$AssertEquals(NormaalVerpakking.AantalVerpakkingen,85,"Aantal normaalverpakkingen")
+	Do $$$AssertEquals(NormaalVerpakking.AantalInVerpakking,2,"Aantal in normaalverpakking")
+	
+	Set KleinVerpakking = CycleCountInfo.KleinVerpakking
+	Do $$$AssertEquals(KleinVerpakking.AantalVerpakkingen,0,"Aantal Kleinverpakkingen")
+	Do $$$AssertEquals(KleinVerpakking.AantalInVerpakking,0,"Aantal in Kleinverpakking")
+]]></Implementation>
+</Method>
+
 <Method name="TestGeefProductReceptieDetail">
 <Implementation><![CDATA[
 	Do ..MaakToReceivePallet()
Index: APPS/MAG/Inventaris/dto/ProductVerpakking.cls.xml
===================================================================
diff -u
--- APPS/MAG/Inventaris/dto/ProductVerpakking.cls.xml	(revision 0)
+++ APPS/MAG/Inventaris/dto/ProductVerpakking.cls.xml	(revision 2094)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="APPS.MAG.Inventaris.dto.ProductVerpakking">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%RegisteredObject,%XML.Adaptor</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="AantalInVerpakking">
+<Type>%Integer</Type>
+</Property>
+
+<Property name="AantalVerpakkingen">
+<Type>%Integer</Type>
+</Property>
+</Class>
+</Export>
Index: APPS/MAG/InventarisService.cls.xml
===================================================================
diff -u -r2004 -r2094
--- APPS/MAG/InventarisService.cls.xml	(.../InventarisService.cls.xml)	(revision 2004)
+++ APPS/MAG/InventarisService.cls.xml	(.../InventarisService.cls.xml)	(revision 2094)
@@ -446,6 +446,69 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefCycleCountInfo">
+<FormalSpec>PalletID:%String,ProductID:%String</FormalSpec>
+<ReturnType>APPS.MAG.Inventaris.dto.CycleCountInfo</ReturnType>
+<Implementation><![CDATA[
+	Set CycleCountInfo = ##class(APPS.MAG.Inventaris.dto.CycleCountInfo).%New()
+	
+	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.Execute(PalletID, ProductID)
+	If (ResultSet.Next())
+	{
+		Set Aantal = ResultSet.Data("Aantal")
+	}
+	Else
+	{
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Product "_ProductID_" op pallet "_PalletID_" kon niet worden gevonden"))
+	}
+	
+	Set CycleCountInfo.PalletID = PalletID
+	Set CycleCountInfo.ProductID = ProductID
+	Set CycleCountInfo.Aantal = Aantal
+	
+	// Geen enumeratie nodig, opsomming kan makkelijk uitgebreid worden indien nodig.
+	// De reden voor cyclecount wordt achteraf toch niet getest.
+	Do CycleCountInfo.Redenen.Insert("Beschadigd")
+	Do CycleCountInfo.Redenen.Insert("Cycle count")
+	Do CycleCountInfo.Redenen.Insert("Receptie correctie")
+	Do CycleCountInfo.Redenen.Insert("Picking correctie")
+	
+	Set GrootVerpakking = ##class(APPS.MAG.Inventaris.dto.ProductVerpakking).%New()
+	Set GrootVerpakking.AantalInVerpakking = Product.GeefAantalInGrootVerpakking()
+	Set GrootVerpakking.AantalVerpakkingen = 0
+	If (GrootVerpakking.AantalInVerpakking > 0)
+	{
+		Set GrootVerpakking.AantalVerpakkingen = ##class(TECH.Math).Floor(Aantal/GrootVerpakking.AantalInVerpakking)
+		Set Aantal = Aantal#GrootVerpakking.AantalInVerpakking
+	}
+	Set CycleCountInfo.GrootVerpakking = GrootVerpakking
+	Set NormaalVerpakking = ##class(APPS.MAG.Inventaris.dto.ProductVerpakking).%New()
+	Set NormaalVerpakking.AantalInVerpakking = Product.GeefAantalInNormaalVerpakking()
+	Set NormaalVerpakking.AantalVerpakkingen = 0
+	If (NormaalVerpakking.AantalInVerpakking > 0)
+	{
+		Set NormaalVerpakking.AantalVerpakkingen = ##class(TECH.Math).Floor(Aantal/NormaalVerpakking.AantalInVerpakking)
+		Set Aantal = Aantal#NormaalVerpakking.AantalInVerpakking
+	}
+	Set CycleCountInfo.NormaalVerpakking = NormaalVerpakking
+	Set KleinVerpakking = ##class(APPS.MAG.Inventaris.dto.ProductVerpakking).%New()
+	Set KleinVerpakking.AantalInVerpakking = 0
+	Set KleinVerpakking.AantalVerpakkingen = 0
+	If (Aantal > 0)
+	{
+		Set KleinVerpakking.AantalInVerpakking = 1
+		Set KleinVerpakking.AantalVerpakkingen = Aantal
+	}
+	Set CycleCountInfo.KleinVerpakking = KleinVerpakking
+	
+	Quit CycleCountInfo
+]]></Implementation>
+</Method>
+
 <Method name="GeefAanwezigInMagazijnen">
 <FormalSpec>ProductID:%Integer</FormalSpec>
 <Private>1</Private>