Index: PV VisiDot.prj.xml
===================================================================
diff -u -r2494 -r2572
--- PV VisiDot.prj.xml	(.../PV VisiDot.prj.xml)	(revision 2494)
+++ PV VisiDot.prj.xml	(.../PV VisiDot.prj.xml)	(revision 2572)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="9">
-<Project name="PV VisiDot" LastModified="2011-10-25 16:00:33">
+<Project name="PV VisiDot" LastModified="2011-10-27 17:12:50" Target="BUILDIU^FLOWTOE3" TargetType="2">
   <Items>
     <ProjectItem name="APPS.Halux.common.BatchService" type="CLS"/>
     <ProjectItem name="APPS.Halux.common.impl.BatchImpl" type="CLS"/>
@@ -81,10 +81,12 @@
     <ProjectItem name="vhUnitTest.APPS.VisiDot.TestDetectionHelper" type="CLS"/>
     <ProjectItem name="vhUnitTest.APPS.VisiDot.TestVHoss" type="CLS"/>
     <ProjectItem name="vhUnitTest.APPS.VisiDot.TestVHossCaptureHelper" type="CLS"/>
+    <ProjectItem name="vhUnitTest.APPS.VisiDot.TestVHossCases" type="CLS"/>
     <ProjectItem name="vhUnitTest.APPS.VisiDot.TestVHossXML" type="CLS"/>
     <ProjectItem name="vhUnitTest.APPS.VisiDot.VHossTestCase" type="CLS"/>
     <ProjectItem name="vhUnitTest.APPS.VisiDot.impl.BuildQueue" type="CLS"/>
     <ProjectItem name="vhUnitTest.APPS.VisiDot.impl.BuildVHossCapture" type="CLS"/>
+    <ProjectItem name="vhUnitTest.APPS.common.Toelevering" type="CLS"/>
     <ProjectItem name="vhUnitTest.TECH.Print.TestPrintUtils" type="CLS"/>
     <ProjectItem name="zTryout.JBL.VisiDot.Tryout" type="CLS"/>
     <ProjectItem name="zTryout.JCL.Conflict2" type="CLS"/>
Index: vhUnitTest/APPS/VisiDot/TestVHossCases.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/VisiDot/TestVHossCases.cls.xml	(revision 0)
+++ vhUnitTest/APPS/VisiDot/TestVHossCases.cls.xml	(revision 2572)
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="vhUnitTest.APPS.VisiDot.TestVHossCases">
+<Description>
+do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","APPS.VisiDot")</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>vhUnitTest.APPS.VisiDot.VHossTestCase</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="VHossBuilder">
+<Type>vhUnitTest.APPS.VisiDot.impl.BuildVHossCapture</Type>
+</Property>
+
+<Method name="OnBeforeOneTest">
+<Description>
+Opzetten van de VHossBuilder</Description>
+<FormalSpec>aTestName:%String</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set QueueBuilder = ##class(vhUnitTest.APPS.VisiDot.impl.BuildQueue).%New()
+	
+	Set BatchID=99999
+	Set SlotLabel=0
+	Set KLNr=1239
+	Set SequenceNr=0
+	
+	/// QueueList : item1\item2\item3 
+	/// met volgende inhoud : PRNr,Aantal,VHossID	/// 
+	Set QueueList = "418581;3;1.1\418582;2;1.1\418588;4;1.1\418589;4;1.1\418609;5;1.1\418703;2;1.1\418704;1;1.1\418715;4;1.1\"
+	Set QueueList = QueueList _"427384;5;2.1\427390;20;2.1\427394;1;2.1\427470;14;2.2\427478;2;2.2\460765;2;2.2"
+	
+	/// Toelevering opzetten
+	Set ToeleveringAPI = ##class(DOM.DomeinContext).Instance().GeefToeleveringAPI()
+	Set LeverancierID = ToeleveringAPI.GeefLeverancierHalux().GeefNummer()
+	Set ToeleveringID = ##class(vhUnitTest.APPS.common.Toelevering).MaakToelevering(LeverancierID,QueueList)
+	
+	/// Queue opzetten
+	Do QueueBuilder.Initialize(BatchID,SlotLabel,ToeleveringID,KLNr,SequenceNr,QueueList)
+	Set BatchID=QueueBuilder.BuildBatch()
+	Set ..VHossBuilder = ##class(vhUnitTest.APPS.VisiDot.impl.BuildVHossCapture).%New(BatchID)
+	Set ..WebService = ##class(WS.VisiDot.OperatorServer).%New()
+	Quit ##super()
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	k ^UPRCP("B","TB")
+	Quit ##super()
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterAllTests">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	k ^KTO(10)
+ 	Quit ##super()
+]]></Implementation>
+</Method>
+
+<Method name="TestZijkantCorrect">
+<Implementation><![CDATA[
+	Set Capture=..VHossBuilder.CorrectVHoss(1,1)
+	d ##class(APPS.VisiDot.impl.Tech).ShowVHoss(Capture)
+	Set Status = Capture.XMLExportToStream(.CaptureInfoStream,,"literal")		
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfoStream, .ResultDesc, .ProcessedData)
+
+	Set ErrorCode=..Finish(ProcessedData)	
+	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).OK(),"Capture moet correct zijn (zonder fouten)")
+]]></Implementation>
+</Method>
+
+<Method name="TestZijkantLadeFoutiefvak">
+<Implementation><![CDATA[
+	
+	Set Capture=..VHossBuilder.CorrectVHossLadeFout(1,1)
+	Set Status = Capture.XMLExportToStream(.CaptureInfoStream,,"literal")	
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfoStream, .ResultDesc, .ProcessedData)
+
+	Set ErrorCode=..Finish(ProcessedData)	
+	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).VHossNoInfo(),"Capture bevat een lade in een foutief vak")
+]]></Implementation>
+</Method>
+
+<Method name="TestZijkantPlusOne">
+<Implementation><![CDATA[
+	
+	Set Capture=..VHossBuilder.CorrectVHossPlusOne(1,1)
+	Set Status = Capture.XMLExportToStream(.CaptureInfoStream,,"literal")	
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfoStream, .ResultDesc, .ProcessedData)
+
+	Set ErrorCode=..Finish(ProcessedData)	
+	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).VHossLadeFoutief(),"Capture bevat een extra lade (teveel)")
+]]></Implementation>
+</Method>
+
+<Method name="TestZijkantMinusOne">
+<Implementation><![CDATA[
+	
+	Set Capture=..VHossBuilder.CorrectVHossMinusOne(1,1)
+	Set Status = Capture.XMLExportToStream(.CaptureInfoStream,,"literal")	
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfoStream, .ResultDesc, .ProcessedData)
+
+	Set ErrorCode=..Finish(ProcessedData)	
+	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).VHossLadeOntbrekend(),"Capture bevat een ontbrekende lade")
+]]></Implementation>
+</Method>
+
+<Method name="TestZijkantDubbel">
+<Implementation><![CDATA[
+	
+	Set Capture=..VHossBuilder.CorrectVHossMinusOne(1,1)
+	Set Status = Capture.XMLExportToStream(.CaptureInfoStream,,"literal")	
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfoStream, .ResultDesc, .ProcessedData)
+	
+	Set Capture=..VHossBuilder.CorrectVHoss(1,1)
+	Do ..VHossBuilder.ZetBatchID()
+	Set Status = Capture.XMLExportToStream(.CaptureInfoStream,,"literal")	
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfoStream, .ResultDesc, .ProcessedData)
+	
+	Set ErrorCode=..Finish(ProcessedData)	
+	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).OK(),"Capture wordt voor een tweede keer ingelezen en is dan correct")
+]]></Implementation>
+</Method>
+
+<Method name="TestZijkantZonderLade">
+<Implementation><![CDATA[
+	Set Capture=..VHossBuilder.CorrectVHoss(99,1)
+	Set Status = Capture.XMLExportToStream(.CaptureInfoStream,,"literal")	
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfoStream, .ResultDesc, .ProcessedData)
+
+	Set ErrorCode=..Finish(ProcessedData)	
+	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).VHossGeenBatchID(),"Lege foto zonder Frame en Batch gegevens")
+]]></Implementation>
+</Method>
+
+<Method name="TestZijkantZonderLadeMetBatch">
+<Implementation><![CDATA[
+	Set Capture=..VHossBuilder.CorrectVHoss(99,1)
+	Do ..VHossBuilder.ZetBatchID()
+	Set Status = Capture.XMLExportToStream(.CaptureInfoStream,,"literal")	
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfoStream, .ResultDesc, .ProcessedData)
+
+	Set ErrorCode=..Finish(ProcessedData)	
+	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).VHossGeenLaden(),"Lege foto zonder Frame en Batch gegevens")
+]]></Implementation>
+</Method>
+
+<Method name="TestEnd">
+<Implementation><![CDATA[
+	Set Capture=..VHossBuilder.CorrectVHoss(1,1)
+	Set Status = Capture.XMLExportToStream(.CaptureInfoStream,,"literal")	
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfoStream, .ResultDesc, .ProcessedData)
+	Set Capture=..VHossBuilder.CorrectVHoss(2,1)
+	Do ..VHossBuilder.ZetBatchID()
+	Set Status = Capture.XMLExportToStream(.CaptureInfoStream,,"literal")	
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfoStream, .ResultDesc, .ProcessedData)
+	Set Capture=..VHossBuilder.CorrectVHoss(2,2)
+	Do ..VHossBuilder.ZetBatchID()
+	Set Status = Capture.XMLExportToStream(.CaptureInfoStream,,"literal")	
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfoStream, .ResultDesc, .ProcessedData)
+	
+	Set Capture=..VHossBuilder.Empty()
+	Do ..VHossBuilder.ZetBatchID()
+	Set Status = Capture.XMLExportToStream(.CaptureInfoStream,,"literal")	
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossEnd(), CaptureInfoStream, .ResultDesc, .ProcessedData)
+	
+	Set ErrorCode=..Finish(ProcessedData)	
+	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).OK(),"Alle queue elementen van de batch hebben frameIDs")
+]]></Implementation>
+</Method>
+
+<Method name="TestEndNotAllDone">
+<Implementation><![CDATA[
+	Set Capture=..VHossBuilder.CorrectVHoss(1,1)
+	Set Status = Capture.XMLExportToStream(.CaptureInfoStream,,"literal")	
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfoStream, .ResultDesc, .ProcessedData)
+	Set Capture=..VHossBuilder.CorrectVHoss(2,2)
+	Do ..VHossBuilder.ZetBatchID()
+	Set Status = Capture.XMLExportToStream(.CaptureInfoStream,,"literal")	
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfoStream, .ResultDesc, .ProcessedData)
+	
+	Set Capture=..VHossBuilder.Empty()
+	Do ..VHossBuilder.ZetBatchID()
+	Set Status = Capture.XMLExportToStream(.CaptureInfoStream,,"literal")	
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossEnd(), CaptureInfoStream, .ResultDesc, .ProcessedData)
+	
+	Set ErrorCode=..Finish(ProcessedData)	
+	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).VHossOntbrekendeFrame(),"1 ontbrekend frame want 1 zijkant is niet gescanned geworden")
+]]></Implementation>
+</Method>
+
+<Method name="TestEndGeenBatchID">
+<Implementation><![CDATA[
+	Set Capture=..VHossBuilder.Empty()
+	Set Status = Capture.XMLExportToStream(.CaptureInfoStream,,"literal")	
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfoStream, .ResultDesc, .ProcessedData)
+	
+	Set ErrorCode=..Finish(ProcessedData)	
+	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).VHossGeenBatchID(),"Er mag geen batchID gekend zijn")
+]]></Implementation>
+</Method>
+</Class>
+</Export>
FishEye: Tag 2572 refers to a dead (removed) revision in file `vhUnitTest/APPS/VisiDot/TestVHoss.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: vhUnitTest/APPS/common/Toelevering.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/common/Toelevering.cls.xml	(revision 0)
+++ vhUnitTest/APPS/common/Toelevering.cls.xml	(revision 2572)
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="vhUnitTest.APPS.common.Toelevering">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%RegisteredObject</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Method name="MaakToelevering">
+<Description>
+Input : 
+- LeverancierID
+- ProductLijst (item1\item2\item3) met item = ProductID,Aantal
+
+Set ProductLijst = "418581;3\418582;2\418588;4\418589;4\418609;5\418703;2\418704;1\418715;4\"
+	Set ProductLijst = ProductLijst _"427384;5\427390;20\427394;1\427470;14\427478;2\460765;2"
+
+Return : ToeleveringID
+</Description>
+<ClassMethod>1</ClassMethod>
+<FormalSpec>LeverancierID:%Integer,ProductLijst:%String</FormalSpec>
+<ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[
+		/// Waarden opzetten om oude routines te kunnen gebruiken.
+		Do ##class(vhLib.OldSchool).InitVars()
+	
+		/// Nieuw ToeleveringID opvragen
+		Set ToeleveringID = $$GETNUM^FLOW("KTO","KTO1")	
+		
+		/// Datum
+		Set CreatieDatum = ##class(TECH.DateTime).CurrentDate()
+		Set Datum = ##class(TECH.DateTime).GeefDatumInPuntNotatie(CreatieDatum)
+		
+		/// Hoofding voor Toelevering aanmaken	
+		Set ^KTO(LeverancierID,ToeleveringID,1)="\"_Datum_"\STOCK\\\"_ToeleveringID_"\\\\\\\\\\\\EUR\\\\\\\\"
+		
+		/// Producten toevoegen aan toelevering 
+		Set LijnNr = 101	
+		Set UniekLijnNr = 1
+		For I=1:1:$L(ProductLijst,"\") 
+		{
+			Set ProductID = $P($P(ProductLijst,"\",I),";",1)
+			Set Aantal = $P($P(ProductLijst,"\",I),";",2)
+			
+			Set ^KTO(LeverancierID,ToeleveringID,LijnNr)="\"_ProductID_"\"_Aantal_"\\\2.84\#\\284.00\284.00\\L\14\\"_(UniekLijnNr*100)_"\284.00\KTRPL\\\\E\EUR\\G\11/46\\\\11/46\\\\\\\"
+			
+			/// Index opbouwen voor deze ToeleveringLijn
+			DO BUILDTO^FLOWTOE3(LeverancierID, ToeleveringID, LijnNr)
+			
+			/// LijnNummer ophogen
+			Set LijnNr = LijnNr + 1
+			Set UniekLijnNr = UniekLijnNr + 1
+		}
+		
+		/// Volgend UniekLijnNr instellen
+		Set ^KTO(LeverancierID,ToeleveringID,4) = UniekLijnNr
+		
+		/// Index
+		Set ^KTO1(ToeleveringID)= LeverancierID_"\"
+		
+		w "Toelevering aangemaakt met ID : "_ToeleveringID,!
+		Quit ToeleveringID
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: APPS/VisiDot/impl/VHossCaptureHelper.cls.xml
===================================================================
diff -u -r2079 -r2572
--- APPS/VisiDot/impl/VHossCaptureHelper.cls.xml	(.../VHossCaptureHelper.cls.xml)	(revision 2079)
+++ APPS/VisiDot/impl/VHossCaptureHelper.cls.xml	(.../VHossCaptureHelper.cls.xml)	(revision 2572)
@@ -100,6 +100,22 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefFrameDetectionHelper">
+<ReturnType>APPS.VisiDot.impl.VHossFrameDetectionHelper</ReturnType>
+<Implementation><![CDATA[
+	Set FrameDetectionHelper = ""
+	Set DetectionIt = ##class(APPS.VisiDot.impl.DetectionIterator).%New(..CaptureInfo, ##this)
+	while DetectionIt.HasNext() 
+	{
+		Set Detection = DetectionIt.Next()
+		If (..IsFrameDetection(Detection)){
+			Set FrameDetectionHelper = ##class(APPS.VisiDot.impl.VHossFrameDetectionHelper).%New(Detection, ##this)
+		}
+	}
+	Quit FrameDetectionHelper
+]]></Implementation>
+</Method>
+
 <Method name="GeefBatchID">
 <Description><![CDATA[
 Amiram Sella" <Amiram.Sella@imageid.zetes.com> 
Index: APPS/VisiDot/impl/ZijkantAfhandelaar.cls.xml
===================================================================
diff -u -r2128 -r2572
--- APPS/VisiDot/impl/ZijkantAfhandelaar.cls.xml	(.../ZijkantAfhandelaar.cls.xml)	(revision 2128)
+++ APPS/VisiDot/impl/ZijkantAfhandelaar.cls.xml	(.../ZijkantAfhandelaar.cls.xml)	(revision 2572)
@@ -14,7 +14,8 @@
 <Implementation><![CDATA[
 	
 	Set ..ProcessedData = ProcessedData
-		
+	
+	Do ..RecepteerProducten()
 	Do ..KopieerFotos()
 	Do ..KopieerVerpakkingsDocument(ProcessedData)
 	
@@ -69,5 +70,49 @@
 <Implementation><![CDATA[	/// Dit wordt reeds in BL.PPS.TBX.DocsProPlus gedaan
 ]]></Implementation>
 </Method>
+
+<Method name="RecepteerProducten">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set CaptureHelper = ##class(APPS.VisiDot.impl.VHossCaptureHelper).%New(..ProcessedData,##class(APPS.VisiDot.impl.VHossProductionHelper).%New())
+	Set BatchService = ##class(APPS.Halux.common.BatchService).%New()
+
+	/// Enkel uitvoeren als er een batch te discoveren is.	
+	If (CaptureHelper.GeefBatchID()){
+		Set ProductionHelper = ##class(APPS.VisiDot.impl.VHossProductionHelper).%New()
+		
+		Set FrameDetectionHelper = CaptureHelper.GeefFrameDetectionHelper()
+		Set FrameID = FrameDetectionHelper.GeefID()
+		
+		Set LadeIt=CaptureHelper.GeefLadeDetectionIterator()
+		While LadeIt.HasNext()
+		{
+			Set DetectionHelper=LadeIt.Next()
+			If (DetectionHelper.IsCorrect()){
+				Set ProductID = DetectionHelper.GeefProduct()
+				Set VHossSlotNr = DetectionHelper.GeefSlotNr()
+				Set BatchID=DetectionHelper.GeefBatchID()	
+				Set VHossVolgNr=DetectionHelper.GeefVHossVolgNr()
+				Set VHossZijkant=DetectionHelper.GeefVHossZijkant()
+				
+				Set QueueHelper = ProductionHelper.ZoekQueueElement(BatchID,VHossVolgNr,VHossZijkant,VHossSlotNr,ProductID)
+				
+				Set Batch = BatchService.GeefBatch(BatchID)		
+				
+				Set ReceptieGroepID = "TB"
+				Set bfrVolgNr = "VolgNr"
+				Set Dossier = "Dossier"
+				Set Locatie = "Locatie"
+				Set DomeinContext = ##class(TECH.Context.RuntimeContext).Instance()
+				Set ProdIsInKOM = ""
+				Set GebruikerInitialen = DomeinContext.GeefGebruikerInitialen()
+				Set Status = ##class(BL.MB.UGLYPicking.Receptie).AddToBuffer(ReceptieGroepID,bfrVolgNr,ProductID,Dossier,Locatie,FrameID,GebruikerInitialen,.ProdIsInKOM)
+				
+				w Status,!
+			}
+		}
+	}
+]]></Implementation>
+</Method>
 </Class>
 </Export>