Index: APPS/Halux/PPS/TBXZaag/impl/Werkpost.cls.xml
===================================================================
diff -u -r2466 -r2575
--- APPS/Halux/PPS/TBXZaag/impl/Werkpost.cls.xml	(.../Werkpost.cls.xml)	(revision 2466)
+++ APPS/Halux/PPS/TBXZaag/impl/Werkpost.cls.xml	(.../Werkpost.cls.xml)	(revision 2575)
@@ -11,14 +11,6 @@
 <Private>1</Private>
 </Property>
 
-<Parameter name="DeviceLabelApplicator">
-<Default>Halux_Zaag_Appl</Default>
-</Parameter>
-
-<Parameter name="DeviceLabelBackup">
-<Default>Halux_Zaag_Appl</Default>
-</Parameter>
-
 <Property name="Logger">
 <Type>vhLib.Logger</Type>
 <Private>1</Private>
@@ -115,39 +107,23 @@
 </Method>
 
 <Method name="PrintLabel">
-<FormalSpec>ZaagID:%Integer,Device:APPS.Halux.PPS.TBXZaag.enu.PrintDevice</FormalSpec>
+<FormalSpec>ZaagID:%Integer,Output2Lijn:APPS.Halux.PPS.TBXZaag.enu.Output2Lijn,Device:APPS.Halux.PPS.TBXZaag.enu.PrintDevice</FormalSpec>
 <Implementation><![CDATA[
-	Set Log=..Logger.Debug("PrintLabel", "ZaagID:"_ZaagID_", Device:"_Device)
+	Set Log=..Logger.Debug("PrintLabel", "ZaagID:"_ZaagID_", Output2Lijn:"_Output2Lijn_",Device:"_Device)
 	Set ZaagOpdracht=##class(APPS.Halux.PPS.TBXZaag.Opdrachten).%OpenId(ZaagID)
 	If '$isObject(ZaagOpdracht) $$$ThrowError($$$errObjectExpected,"Zaagopdracht wrong ID:"_ZaagID)
-	Do ##class(APPS.Halux.PPS.TBXZaag.impl.EtiketHelper).AfdrukkenZaagEtiket(ZaagOpdracht,..GeefLabelPrinter(Device))
+	Do ##class(APPS.Halux.PPS.TBXZaag.impl.EtiketHelper).AfdrukkenOpdracht(ZaagOpdracht,Output2Lijn,Device)
 ]]></Implementation>
 </Method>
 
-<Method name="GeefLabelPrinter">
-<FormalSpec>Device:APPS.Halux.PPS.TBXZaag.enu.PrintDevice</FormalSpec>
-<Private>1</Private>
-<ReturnType>%String</ReturnType>
+<Method name="PrintLabelManueel">
+<FormalSpec>Titel:%String,BodemKleur:%String,BodemHoogte:%Integer,BodemLengte:%Float,BodemBewerking:DOM.PM.enu.TBXBodemBewerking,RugKleur:%String,RugHoogte:%Integer,RugLengte:%Float,Output2Lijn:APPS.Halux.PPS.TBXZaag.enu.Output2Lijn,Device:APPS.Halux.PPS.TBXZaag.enu.PrintDevice</FormalSpec>
 <Implementation><![CDATA[
-	If Device = ##class(APPS.Halux.PPS.TBXZaag.enu.PrintDevice).LabelApplicator() 
-	{
-		Set Printer = ..#DeviceLabelApplicator
-	}
-	ElseIf Device = ##class(APPS.Halux.PPS.TBXZaag.enu.PrintDevice).LabelBackup() 
-	{
-		Set Printer = ..#DeviceLabelBackup
-	}
-	
-	Quit $G(Printer)
+	Set Log=..Logger.Debug("PrintLabelManueel", "Details:"_Titel_", Bodem:"_BodemKleur_";"_BodemHoogte_";"_BodemLengte_";"_BodemBewerking_", Rug:"_RugKleur_";"_RugHoogte_";"_RugLengte_", Output2Lijn:"_Output2Lijn_", Device:"_Device)
+	Do ##class(APPS.Halux.PPS.TBXZaag.impl.EtiketHelper).AfdrukkenManueel(Titel,BodemKleur,BodemHoogte,BodemLengte,BodemBewerking,RugKleur,RugHoogte,RugLengte,Output2Lijn,Device)
 ]]></Implementation>
 </Method>
 
-<Method name="PrintLabelManueel">
-<FormalSpec>Titel:%String,BodemHoogte:%Integer,BodemLengte:%Float,RugHoogte:%Integer,RugLengte:%Float,Device:APPS.Halux.PPS.TBXZaag.enu.PrintDevice</FormalSpec>
-<Implementation><![CDATA[	Set Log=..Logger.Debug("PrintLabelManueel", "Device:"_Device)
-]]></Implementation>
-</Method>
-
 <Method name="RegistreerStilstand">
 <FormalSpec>Reden:%String,Duur:%Integer,ZaagID:%String=""</FormalSpec>
 <Implementation><![CDATA[
@@ -168,7 +144,7 @@
 
 <Method name="ZetStatus">
 <Description>
-d ##class(APPS.Halux.PPS.TBXZaag.impl.WerkpostZaag).%New().ZetStatus("Z1",518,"F","L1")</Description>
+d ##class(APPS.Halux.PPS.TBXZaag.impl.WerkpostZaag).%New().ZetStatus("Z1",711,"F","L1")</Description>
 <FormalSpec>WerkPost:APPS.Halux.enu.Werkpost,ZaagID:%Integer,NewStatus:APPS.Halux.PPS.TBXZaag.enu.Status,ProductieLijn:APPS.Halux.PPS.TBXZaag.enu.Output2Lijn</FormalSpec>
 <Implementation><![CDATA[
 	Set Log=..Logger.Debug("ZetStatus", "ZaagID:"_ZaagID_", NewStatus:"_NewStatus_", Lijn:"_ProductieLijn)