Index: vhUnitTest/APPS/VisiDot/TestVHossCases.cls.xml
===================================================================
diff -u -r2572 -r2783
--- vhUnitTest/APPS/VisiDot/TestVHossCases.cls.xml	(.../TestVHossCases.cls.xml)	(revision 2572)
+++ vhUnitTest/APPS/VisiDot/TestVHossCases.cls.xml	(.../TestVHossCases.cls.xml)	(revision 2783)
@@ -2,7 +2,7 @@
 <Export generator="Cache" version="9">
 <Class name="vhUnitTest.APPS.VisiDot.TestVHossCases">
 <Description>
-do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","APPS.VisiDot")</Description>
+do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","APPS.VisiDot.TestVHossCases")</Description>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>vhUnitTest.APPS.VisiDot.VHossTestCase</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
@@ -11,6 +11,20 @@
 <Type>vhUnitTest.APPS.VisiDot.impl.BuildVHossCapture</Type>
 </Property>
 
+<Property name="ToeleveringID">
+<Type>%Integer</Type>
+</Property>
+
+<Parameter name="OrderID">
+<Type>%String</Type>
+<Default>9999999</Default>
+</Parameter>
+
+<Parameter name="KLNr">
+<Type>%String</Type>
+<Default>1239</Default>
+</Parameter>
+
 <Method name="OnBeforeOneTest">
 <Description>
 Opzetten van de VHossBuilder</Description>
@@ -19,23 +33,41 @@
 <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"
 	
+	/// Order opzetten
+	Set ^KOD(..#KLNr,"F",..#OrderID,0)="313"
+	Set ^KOD(..#KLNr,"F",..#OrderID,1)="\03.11.11\EDI 305452/TBX\\\1239\OD5;1`OD5;2`OD5;3`OD5;4`OD5;5\1055#1100#62398,31366\\\\\\1\\\\EUR\\\00\2\\1055#62398,31378#116943\\\\\\\\\vh1  45 /d 4\\305452\\\\\\\\\\62398,31378"
+ 	Set ^KOD(..#KLNr,"F",..#OrderID,2)="\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
+	Set ^KOD(..#KLNr,"F",..#OrderID,3)="1\KELLER\KEUKENFABRIEK\B.V.\ETTENSEWEG 74\NL-4706-PB\ROOSENDAAL\1147\N\\\\\\\\\\.\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
+	Set ^KOD(..#KLNr,"F",..#OrderID,4)="213"
+	Set ^KOD(..#KLNr,"F",..#OrderID,101)="703100 \418689\2\\\19.51\40#1\0\39.02\39.02\703100 \L\\\100\39.02\KF0\\\\E1\EUR\\\62402\\235601\101\\\\\\\1.0.0\1\SBMKWU120\62398,31454\\62402\\\\\45 48901 4 UKEL 120         L\0\\RCLD;11316"
+	Set ^KOD(..#KLNr,"F",..#OrderID,102)="703100 \418754\1\\\25.04\40#1\0\25.04\25.04\703100 \L\\\110\25.04\KF0\\\\E1\EUR\\\62402\\235601\102\\\\\\\2.0.0\1\SBMLBW120\62398,31454\\62402\\\\\45 48901 4 UKEL 120         L\0\\RCLD;5658"
+	
+	Set ^KO1(..#OrderID,"F") = "1239\Leveringsnummer"
+	Set ^KO1(..#OrderID,"F","Leveringsnummer") = ""
+	
 	/// Toelevering opzetten
 	Set ToeleveringAPI = ##class(DOM.DomeinContext).Instance().GeefToeleveringAPI()
 	Set LeverancierID = ToeleveringAPI.GeefLeverancierHalux().GeefNummer()
-	Set ToeleveringID = ##class(vhUnitTest.APPS.common.Toelevering).MaakToelevering(LeverancierID,QueueList)
+	Set ..ToeleveringID = ##class(vhUnitTest.APPS.common.Toelevering).MaakToelevering(LeverancierID,QueueList, ..#OrderID)
+		
+	/// Batch opzetten
+	Set BatchService = ##class(APPS.Halux.common.BatchService).%New()
+	Set Batch = BatchService.GeefNieuweBatch()
+	Set Toelevering = ToeleveringAPI.GeefToelevering(..ToeleveringID)
+	Do Batch.VoegToeToelevering(Toelevering)
+	Do Batch.%Save()
+	Set BatchID = Batch.GeefBatchID()	
 	
 	/// Queue opzetten
-	Do QueueBuilder.Initialize(BatchID,SlotLabel,ToeleveringID,KLNr,SequenceNr,QueueList)
+	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()
@@ -47,19 +79,19 @@
 <FormalSpec>aTestName:%String</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
+	//// Als hier een break gezet wordt kan je volgende globals nakijken
+	//// ^UPRCP("B","TB",
+	//// ^KTO(6332,..ToeleveringID
+	//// ^TO(,,..ToeleveringID
+		
+	Do ##class(vhUnitTest.APPS.common.Toelevering).VerwijderToelevering(..ToeleveringID)
 	k ^UPRCP("B","TB")
+	k ^KOD(1239,"F",..#OrderID)
+	k ^KO1(..#OrderID)
 	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)