Index: vhUnitTest/APPS/Halux/PPS/TBXZaag/TestBuild.cls.xml
===================================================================
diff -u -r2686 -r2732
--- vhUnitTest/APPS/Halux/PPS/TBXZaag/TestBuild.cls.xml	(.../TestBuild.cls.xml)	(revision 2686)
+++ vhUnitTest/APPS/Halux/PPS/TBXZaag/TestBuild.cls.xml	(.../TestBuild.cls.xml)	(revision 2732)
@@ -54,13 +54,15 @@
 <Method name="OnBeforeAllTests">
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
+
 	Do ##class(vhUnitTest.APPS.Halux.PPS.TBXZaag.impl.MaakProducten).MaakAlleProducten()
 	Set ..MaakSequentie=##class(vhUnitTest.APPS.Halux.PPS.TBXZaag.impl.MaakSequentie).%New()
 	Do ..MaakSequentie.MaakToelevering1()
 	Do ..MaakSequentie.MaakToelevering2()
 	Set ..Batch=..MaakSequentie.MaakBatch($LB(..MaakSequentie.TOENr1,..MaakSequentie.TOENr2))
 	Do ..MaakSequentie.MaakToeleveringSpecials()
 	Set ..BatchSpecials=..MaakSequentie.MaakBatch($LB(..MaakSequentie.TOENrSpecials))
+
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -82,7 +84,7 @@
 <Implementation><![CDATA[
 	Set BatchID=..Batch.%Id()
 	/* Te testen method */
-	Set ZaagBuilder=##class(APPS.Halux.PPS.TBXZaag.impl.Builder).%New(BatchID)
+	Set ZaagBuilder=##class(APPS.Halux.PPS.TBXZaag.impl.MaakBatch).%New(BatchID)
 	Set sc=ZaagBuilder.MaakZaagOpdrachten()
 	/* Verificatie */
 	Set rsBatches=##class(%ResultSet).%New("APPS.Halux.PPS.TBXZaag.impl.LijstHelper:qActieveBatchLijst")
@@ -126,8 +128,6 @@
 			Set sc=rsOpdrachten.Execute($P(rsBatches.Data("BatchKey"),"||"),$P(rsBatches.Data("BatchKey"),"||",2))
 			While (rsOpdrachten.Next())
 			{
-				Set Opdracht=##class(APPS.Halux.PPS.TBXZaag.Opdrachten).%OpenId(rsOpdrachten.GetData(1))
-				;w rsOpdrachten.GetData(1)," PRnr",Opdracht.Product.%Id(),!
 				Set Opdracht=##class(APPS.Halux.PPS.TBXZaag.dto.Opdracht).GetOpdracht(rsOpdrachten.GetData(1))
 				
 				Do:Opdracht.PRNr=..#TBXKOP $$$AssertNotEquals(Opdracht.PRNr,..#TBXKOP,"Bodem met KOP moeten in manuele mode verzaagd worden, dus mag niet voorkomen; PRNr:"_..#TBXKOP)
Index: vhUnitTest/APPS/Halux/PPS/TBXZaag/TestWerkpost.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/Halux/PPS/TBXZaag/TestWerkpost.cls.xml	(revision 0)
+++ vhUnitTest/APPS/Halux/PPS/TBXZaag/TestWerkpost.cls.xml	(revision 2732)
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="vhUnitTest.APPS.Halux.PPS.TBXZaag.TestWerkpost">
+<Description>
+do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","APPS.Halux.PPS.TBXZaag")</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>vhUnitTest.TestCase</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Parameter name="TBXKOP">
+<Default>1003</Default>
+</Parameter>
+
+<Parameter name="TBXSyfon">
+<Default>1005</Default>
+</Parameter>
+
+<Parameter name="TBXSpoelbak">
+<Default>1006</Default>
+</Parameter>
+
+<Parameter name="TBXStalenRugBodemGezaagd">
+<Default>1007</Default>
+</Parameter>
+
+<Parameter name="TBXStalenRug">
+<Default>1008</Default>
+</Parameter>
+
+<Parameter name="TBXSpecialBodemRug">
+<Default>1009</Default>
+</Parameter>
+
+<Parameter name="TBXSpecialRug">
+<Default>1010</Default>
+</Parameter>
+
+<Parameter name="TBXSpecialBodem">
+<Default>1011</Default>
+</Parameter>
+
+<Property name="MaakSequentie">
+<Type>vhUnitTest.APPS.Halux.PPS.TBXZaag.impl.MaakSequentie</Type>
+</Property>
+
+<Property name="iWerkpost">
+<Type>APPS.Halux.PPS.TBXZaag.IWerkpost</Type>
+</Property>
+
+<Property name="Batch">
+<Type>APPS.Halux.common.impl.BatchImpl</Type>
+</Property>
+
+<Property name="BatchSpecials">
+<Type>APPS.Halux.common.impl.BatchImpl</Type>
+</Property>
+
+<Method name="OnBeforeAllTests">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+
+	Do ##class(vhUnitTest.APPS.Halux.PPS.TBXZaag.impl.MaakProducten).MaakAlleProducten()
+	Set ..MaakSequentie=##class(vhUnitTest.APPS.Halux.PPS.TBXZaag.impl.MaakSequentie).%New()
+	Do ..MaakSequentie.MaakToelevering1()
+	Do ..MaakSequentie.MaakToelevering2()
+	Set ..Batch=..MaakSequentie.MaakBatch($LB(..MaakSequentie.TOENr1,..MaakSequentie.TOENr2))
+
+	Set ..iWerkpost=##class(APPS.Halux.PPS.TBXZaag.impl.Werkpost).%New(##class(APPS.Halux.common.enu.Werkpost).Zaag1())
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterAllTests">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Do ..MaakSequentie.VerwijderBatch(..Batch)
+	Do ..MaakSequentie.VerwijderToelevering1()
+	Do ..MaakSequentie.VerwijderToelevering2()
+	;Do ##class(vhUnitTest.APPS.Halux.PPS.TBXZaag.impl.MaakProducten).VerwijderAlleProducten()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="TestAfdrukkenEtiket">
+<Implementation><![CDATA[
+	Set BatchID=..Batch.%Id()
+	/* Te testen method */
+	Set ZaagBuilder=##class(APPS.Halux.PPS.TBXZaag.impl.Builder).%New(BatchID)
+	Set sc=ZaagBuilder.MaakZaagOpdrachten()
+	/* Verificatie */
+	Set rsBatches=##class(%ResultSet).%New("APPS.Halux.PPS.TBXZaag.impl.LijstHelper:qActieveBatchLijst")
+	Set rsOpdrachten=##class(%ResultSet).%New("APPS.Halux.PPS.TBXZaag.impl.LijstHelper:qZaagLijstHelper")
+	Set sc=rsBatches.Execute()
+	Set BatchCnt=0
+	While (rsBatches.Next())
+	{
+		If $P(rsBatches.Data("BatchKey"),"||")=BatchID 
+		{
+			Set BatchCnt=BatchCnt+1
+			Set OpdrachtCnt=0
+			Set sc=rsOpdrachten.Execute($P(rsBatches.Data("BatchKey"),"||"),$P(rsBatches.Data("BatchKey"),"||",2))
+			While (rsOpdrachten.Next())
+			{
+				Do ..iWerkpost.PrintEtiket(rsOpdrachten.GetData(1),##class(APPS.Halux.PPS.TBXZaag.enu.Output2Lijn).Lijn1(),##class(APPS.Halux.PPS.TBXZaag.enu.PrintDevice).LabelApplicator())
+			}
+			Set VerwachtAantal=$Case($P(rsBatches.Data("BatchKey"),"||",2),##class(APPS.Halux.PPS.TBXZaag.enu.SubBatch).SpoelbakSifon():3,##class(APPS.Halux.PPS.TBXZaag.enu.SubBatch).TipOn():2,:10)
+			Do $$$AssertEquals(OpdrachtCnt,VerwachtAantal,"Aantal per subbatch "_rsBatches.Data("BatchKey"))
+		}
+	}
+	Do $$$AssertEquals(BatchCnt,3,"Aantal splits in subbatches van "_BatchID)
+]]></Implementation>
+</Method>
+</Class>
+</Export>