Index: BL/PPS/TBX/DocsV1.cls.xml
===================================================================
diff -u -r45384 -r51780
--- BL/PPS/TBX/DocsV1.cls.xml	(.../DocsV1.cls.xml)	(revision 45384)
+++ BL/PPS/TBX/DocsV1.cls.xml	(.../DocsV1.cls.xml)	(revision 51780)
@@ -791,29 +791,124 @@
 	Set Count=0
 	For  Quit:'rs.Next()  Do
 	. Set oQ=..ProductieSequentieRepository.GeefSequentieItem(rs.Data("ID"))
-	. Quit:oQ.Status="PB" ; sequencelijnen met status "PB" worden overgeslagen
+	. ;Quit:oQ.Status="PB" ; sequencelijnen met status "PB" worden overgeslagen
 	. Quit:'..ZaagChk(oQ)
 	. Set Rec=..ZaagOne(..BldBasisFromQueue(oQ))
-	. Set:$L(Rec) ^HULP(..%J,Label,$I(Count))=Rec
-	; Basis + 10: Kleurbodem, 11:InterneBreedte, 12:LadeDiepte, 13:RugHoogte, 14:NettoBreedteRug, 15:NettoBreedteBodem, 16:NettoHoBodem, 17:NettoHoRug 18:Opmerking
-	; Output
+	. If $L(Rec) Do
+	. . Set $P(Rec,"\",9)=$I(Count)
+	. . Set ^HULP(..%J,Label,Count)=Rec
+	
+	; Basis + 10: Kleurbodem, 11:InterneBreedte, 12:LadeDiepte, 13:RugHoogte, 14:NettoBreedteRug, 15:NettoBreedteBodem, 16:NettoHoBodem, 17:NettoHoRug,
+	;  18:Opmerking, 19:Kleurbodem2de, 20:BodemPRNr, 21:RugPRNr, 22:IsStalenRug, 23:IsVerlaagdeRug, 25:Opmerking
+	;  30:AantalPlatenBodem, 31:RestLengteBodem, 32:AantalDezelfdeBodem, 33:IsBodemChanged 35:AantalPlatenRug, 36:RestLengteRug, 37:AantalDezelfdeBodem, 38:IsRugChanged
 	Quit:'$D(^HULP(..%J,Label)) 0
- 	Do INIT^vhLISTO("HATBXLEAN","ZAAG",.PLD)
+	; Postprocessing om aantal platen en lopende meter te bepalen
+	Do ..ZaagTotaleLengteBepaling($Name(^HULP(..%J,Label)))
+	;zw ^HULP(..%J,Label)
+	; Output
+ 	Do INIT^vhLISTO("HATBXLEAN","ZAAGPLATEN",.PLD)
 	Set PLD("HALUX")=""
 	Set PLD(1)=$NA(^HULP(..%J,Label))
-	Set PLD(5)=76
-	Set PLD(10)="Class("_..%ClassName(1)_").ZaagCB"
+	Set PLD(5)=80
+	;Set PLD(10)="Class("_..%ClassName(1)_").ZaagCB"
 	Set PLD(11)="TBX ZAAG\Lijn:"_..Batch.GeefLijn()_"  Batch:"_..BatchID
 	Set %MemTOENr=""
-	if $length(..Printer) set Optie("AUTOSEL")=..Printer
+	If $length(..Printer) set Optie("AUTOSEL")=..Printer
 	Do PRINT^OUTPUT(.PLD,"P","S","BL",.Optie)
 	Kill %MemTOENr
 	Quit Count
 ]]></Implementation>
 </Method>
 
+<Method name="ZaagTotaleLengteBepaling">
+<FormalSpec>GlobalRef:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set MaxCount=$O(@GlobalRef@(""),-1)
+		
+	Set MemBodemPRNr="",MemRugPRNr=""
+	Set LengteBodem=0, LengteRug=0
+	Set PlatenBodem=0, PlatenRug=0
+	Set AantalDezelfdeBodem=0, AantalDezelfdeRug=0
+	For Count=MaxCount:-1:1
+	{
+		Set Rec=@GlobalRef@(Count)
+		Set BodemPRNr=$P(Rec,"\",20)
+		If BodemPRNr
+		{
+			If BodemPRNr'=MemBodemPRNr
+			{
+				Set:MemBodemPRNr $P(@GlobalRef@(Count+1),"\",33)=1 ; Is changed
+				Set LengteBodem=0
+				Set AantalDezelfdeBodem=0
+				Set MemBodemPRNr=BodemPRNr
+			}
+			Set NettoBreedteBodem=$P(Rec,"\",15)
+			Set LengteBodem=LengteBodem+(NettoBreedteBodem*1.2) ; 20% extra
+			Set LengtePlaat=$$$ProductGet(BodemPRNr,$$$WerkvloerGrootteNetto)
+			Set $P(Rec,"\",30)=..BerekenPlaten(LengteBodem,LengtePlaat)
+			Set $P(Rec,"\",31)=..BerekenRest(LengteBodem,LengtePlaat)
+			Set $P(Rec,"\",32)=$I(AantalDezelfdeBodem)
+		}
+		
+		Set IsStalenRug=$P(Rec,"\",22)
+		If 'IsStalenRug
+		{	
+			Set RugPRNr=$P(Rec,"\",21)
+			If RugPRNr
+			{
+				If RugPRNr'=MemRugPRNr
+				{
+				Set:MemRugPRNr $P(@GlobalRef@(Count+1),"\",38)=1 ; Is Changed
+				Set LengteRug=0
+				Set AantalDezelfdeRug=0
+				Set MemRugPRNr=RugPRNr
+				}
+				Set NettoBreedteRug=$P(Rec,"\",14)
+				Set LengteRug=LengteRug+(NettoBreedteRug*1.2) ; 20 %extra
+				Set LengtePlaat=$$$ProductGet(RugPRNr,$$$WerkvloerGrootteNetto)
+				Set $P(Rec,"\",35)=..BerekenPlaten(LengteRug,LengtePlaat)
+				Set $P(Rec,"\",36)=..BerekenRest(LengteRug,LengtePlaat)
+				Set $P(Rec,"\",37)=$I(AantalDezelfdeRug)
+				Set IsVerlaagdeRug=$P(Rec,"\",23)
+				If IsVerlaagdeRug
+				{
+					Set $P(Rec,"\",25)="Lage rug"						
+				}
+			}
+		}
+		Else
+		{
+			Set $P(Rec,"\",25)="Stalen rug"						
+		}
+		Set @GlobalRef@(Count)=Rec
+	}
+]]></Implementation>
+</Method>
+
+<Method name="BerekenPlaten">
+<FormalSpec>Lengte:%Decimal,LengtePlaat:%Decimal</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set Platen=Lengte\LengtePlaat
+	If (Lengte-(Platen*LengtePlaat))/LengtePlaat>.9 Set Platen=Platen+1
+	Quit Platen
+]]></Implementation>
+</Method>
+
+<Method name="BerekenRest">
+<FormalSpec>Lengte:%Decimal,LengtePlaat:%Decimal</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set Lengte=Lengte-(..BerekenPlaten(Lengte,LengtePlaat)*LengtePlaat)
+	If Lengte<0 Set Lengte=0
+	Quit Lengte/1000
+]]></Implementation>
+</Method>
+
 <Method name="ZaagOne">
 <FormalSpec>Basis:%String</FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[
 	Set PRNr=$P(Basis,"\",1)
 	Set IB=$LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",PRNr,"IB")) ; Interne breedte
@@ -853,34 +948,35 @@
 	Set Opmerking=""
 	Set:PlaatMat?1(1"HZ",1"HA",1"KS",1"KZ",1"KA") Opmerking=Opmerking_", "_$Case(PlaatMat,"HZ":"Verzaagd","HA":"Verzaagd","KS":"Klant",:"Klant verzaagd") ; plaatmateriaal is reeds gezaagd
 	Set:..MetInkeeping(PRNr) Opmerking=Opmerking_", "_"INKEPING" ; controle of de bodem een inkeping heeft (Keller)
-	Set:DK=80 Opmerking=Opmerking_", "_"80kg"
-	Set:BM="T" Opmerking=Opmerking_", "_"TIP-ON"_$S(TipOnSyncPRNr?4.7N:"+"_$E($P(^KPR(TipOnSyncPRNr,0),"\",1),5,7),1:"") ;TIPON + stanglengte
-	Set:DS="BA" Opmerking=Opmerking_", "_"Baliko"
+	;Set:DK=80 Opmerking=Opmerking_", "_"80kg"
+	;Set:BM="T" Opmerking=Opmerking_", "_"TIP-ON"_$S(TipOnSyncPRNr?4.7N:"+"_$E($P(^KPR(TipOnSyncPRNr,0),"\",1),5,7),1:"") ;TIPON + stanglengte
+	;Set:DS="BA" Opmerking=Opmerking_", "_"Baliko"
 	Set:IsSR RH="",BreedteR="", Opmerking=Opmerking_", "_"Staalrug"
 	Set:KLAS["SP" Opmerking=Opmerking_", "_$CASE(KLAS,"SP":"SP 1","SP2":"SP 2",:"")_" "_$CASE(SPZK,"S":"Smal",:"Breed"), BreedteR=""
 	Set:KLAS["SY" Opmerking=Opmerking_", "_"Sifon", BreedteR=""
 	Set:KLAS="B" Opmerking=Opmerking_", "_"Buro"
 	Set:ODSP'="" Opmerking=Opmerking_", "_"**SPECIAL:"_ODSP_"**"
-	Set:RSTL'="" Opmerking=Opmerking_", "_"VERLAAGDE RUG "_RSTL
+	Set IsVerlaagdeRug=""
+	Set:RSTL'="" Opmerking=Opmerking_", "_"VERLAAGDE RUG "_RSTL,IsVerlaagdeRug=1
 	Set $E(Opmerking,1,2)=""
 	
 	Set LDnet=LD-24
 	If $L(KB)=3,$E(KB,3)="S" Set LDnet=LDnet+2 ; Bodem geschikt voor staalrug +2mm
 	Set RHnet=$Case(RH,"N":69,"M":84,"K":116,"B":135,"C":167,"D":199,:"")
 	
-	Set Rec=KB_"\"_IB_"\"_LD_"\"_RH_"\"_BreedteR_"\"_BreedteB_"\"_LDnet_"\"_RHnet_"\"_Opmerking_"\"_KB2
+	Set Rec=KB_"\"_IB_"\"_LD_"\"_RH_"\"_BreedteR_"\"_BreedteB_"\"_LDnet_"\"_RHnet_"\"_Opmerking_"\"_KB2_"\"_BodemPRNr_"\"_RugPRNr_"\"_IsSR_"\"_IsVerlaagdeRug
 	Set $P(Basis,"\",10)=Rec
-
 	Quit Basis
 ]]></Implementation>
 </Method>
 
 <Method name="ZaagChk">
 <FormalSpec>oQ:DS.PPS.TBX.Queue</FormalSpec>
 <Implementation><![CDATA[
-	Quit:oQ.DeelAantal>1 0 ; Slechts 1 keer voorkomen
 	Set PRNr=oQ.ProductGetObjectId()
-	Quit:..IsSpoel(PRNr) 0
+	Set KLAS=$LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",PRNr,"KLAS"))
+	Quit:KLAS["SP" 0
+	Quit:KLAS["SY" 0
 	Set ODSP=$LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",PRNr,"ODSP")) ; Onderdelen Special
 	Quit ODSP'="F"
 ]]></Implementation>
Index: vhTest/Mock/BL/PPS/TBX/DocsV1.cls.xml
===================================================================
diff -u -r34172 -r51780
--- vhTest/Mock/BL/PPS/TBX/DocsV1.cls.xml	(.../DocsV1.cls.xml)	(revision 34172)
+++ vhTest/Mock/BL/PPS/TBX/DocsV1.cls.xml	(.../DocsV1.cls.xml)	(revision 51780)
@@ -3,8 +3,7 @@
 <Class name="vhTest.Mock.BL.PPS.TBX.DocsV1">
 <Description>
 Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
-Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
-Inheritance van meerdere TECH.Interface interfaces resulteert nog niet in een mockklasse met overeenkomstige inheritance-structuur.</Description>
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>BL.PPS.TBX.DocsV1,Tools.Mock.MockClassBase</Super>
 <Inheritance>right</Inheritance>
@@ -267,12 +266,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="ZaagOne">
-<FormalSpec>Basis:%String</FormalSpec>
-<Implementation><![CDATA[	do ..VerwerkMethodCall("ZaagOne",Basis)
-]]></Implementation>
-</Method>
-
 <Method name="ZetExtraLabelInfo">
 <FormalSpec>Info:%String</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("ZetExtraLabelInfo",Info)
Index: vhDeploy/Deploy20180606xTbxZaagLijst.cls.xml
===================================================================
diff -u
--- vhDeploy/Deploy20180606xTbxZaagLijst.cls.xml	(revision 0)
+++ vhDeploy/Deploy20180606xTbxZaagLijst.cls.xml	(revision 51780)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhDeploy.Deploy20180606xTbxZaagLijst">
+<Super>vhDeploy.Deploy</Super>
+
+<Parameter name="Omschrijving">
+<Type>%String</Type>
+<Default>TBX Zaaglijst met plaataantallen</Default>
+</Parameter>
+
+<Method name="ExecCode">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	s ^RES("HATBXLEAN","LD","ZAAGPLATEN")	=	"Halux TBX zaag lijst met plaat aantallen`58225,34557```5;1;24`92`P``BU`1`1"
+	s ^RES("HATBXLEAN","LD","ZAAGPLATEN","F")	=	"@`$NA(^HULP(%J,""Z""))"
+ 	s ^RES("HATBXLEAN","LD","ZAAGPLATEN","HO",1)	=	"T`I`   | B kl | B H | B B | Bodemwissel | R kl | R H | R B |  Rugwissel  | Opmerking"
+ 	s ^RES("HATBXLEAN","LD","ZAAGPLATEN","L",1)	=	"HATBXLEAN`ZAAGPLATEN"
+ 	s ^RES("HATBXLEAN","LD","ZAAGPLATEN","L","PRINT")	=	"HATBXLEAN`ZAAGPLATEN"
+ 	s ^RES("HATBXLEAN","LK","ZAAGPLATEN")	=	"Halux TBX zaag`58225,34557"
+ 	s ^RES("HATBXLEAN","LK","ZAAGPLATEN",1)	=	"Nr`Nr`9`N+`L`3``|```"
+ 	s ^RES("HATBXLEAN","LK","ZAAGPLATEN",2)	=	"B K1`B K1`10`C`R`2``/```"
+	s ^RES("HATBXLEAN","LK","ZAAGPLATEN",3)	=	"B K2`B K2`19`C`L`2`` |```"
+ 	s ^RES("HATBXLEAN","LK","ZAAGPLATEN",4)	=	"B H`B H`16`N+`R`4`0` |``"
+	s ^RES("HATBXLEAN","LK","ZAAGPLATEN",5)	=	"B B`B B`15`N+.`R`4`0` |``"
+	s ^RES("HATBXLEAN","LK","ZAAGPLATEN",6)	=	"BW1`BW1`33`C`L`1````$S(X:""*"",1:"""")`"
+	s ^RES("HATBXLEAN","LK","ZAAGPLATEN",7)	=	"BW2`BW2`32`N+`R`2`0` ``"
+	s ^RES("HATBXLEAN","LK","ZAAGPLATEN",8)	=	"BW3`BW3`30`C`R`4`` ``$S(X:X_""pl"",1:"""")`"
+ 	s ^RES("HATBXLEAN","LK","ZAAGPLATEN",9)	=	"BW4`BW4`31`C`R`3`` |``$S(X:$P(X,""."")_""m""_$E($P(X,""."",2),1),1:"""")`"
+ 	s ^RES("HATBXLEAN","LK","ZAAGPLATEN",10)	=	"R K1`R K1`10`C`R`2``/```"""
+ 	s ^RES("HATBXLEAN","LK","ZAAGPLATEN",11)	=	"R K2`R K2`19`C`L`2`` |```"
+ 	s ^RES("HATBXLEAN","LK","ZAAGPLATEN",12)	=	"R H`R H`17`N+`R`4`0` |``"
+ 	s ^RES("HATBXLEAN","LK","ZAAGPLATEN",13)	=	"R B`R B`14`N+.`R`4`0` |``"
+ 	s ^RES("HATBXLEAN","LK","ZAAGPLATEN",14)	=	"RW1`RW1`38`C`L`1````$S(X:""*"",1:"""")`"
+ 	s ^RES("HATBXLEAN","LK","ZAAGPLATEN",15)	=	"RW2`RW2`37`N+`R`2`0` ``"
+ 	s ^RES("HATBXLEAN","LK","ZAAGPLATEN",16)	=	"RW3`RW3`35`C`R`4`` ``$S(X:X_""pl"",1:"""")`"
+ 	s ^RES("HATBXLEAN","LK","ZAAGPLATEN",17)	=	"RW4`RW4`36`C`R`3`` |``$S(X:$P(X,""."")_""m""_$E($P(X,""."",2),1),1:"""")`"
+ 	s ^RES("HATBXLEAN","LK","ZAAGPLATEN",18)	=	"Opm`Opm`25`C`R`10`````"
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>