Index: APPS/Halux/TBX/impl/ZaagBatches.cls.xml
===================================================================
diff -u -r1019 -r1189
--- APPS/Halux/TBX/impl/ZaagBatches.cls.xml	(.../ZaagBatches.cls.xml)	(revision 1019)
+++ APPS/Halux/TBX/impl/ZaagBatches.cls.xml	(.../ZaagBatches.cls.xml)	(revision 1189)
@@ -1,4 +1,398 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-04-19 16:14:13">
-<Checksum value="3255171636"/>
+<Export generator="Cache" version="9">
+<Class name="APPS.Halux.TBX.impl.ZaagBatches">
+<IncludeCode>TECH.Error</IncludeCode>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%RegisteredObject,DOM.PM.TBXProduct.TBXProductVisitor</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="Batch">
+<Type>APPS.Halux.common.Batch</Type>
+</Property>
+
+<Property name="ProductAPI">
+<Type>%RegisteredObject</Type>
+</Property>
+
+<Property name="Queue">
+<Type>DS.PPS.TBX.Queue</Type>
+</Property>
+
+<Property name="ZaagList">
+<Type>%SerialObject</Type>
+</Property>
+
+<Property name="MaxPosList">
+<Type>%Integer</Type>
+</Property>
+
+<Property name="IndexBodemChanges">
+<Type>%String</Type>
+<MultiDimensional>1</MultiDimensional>
+</Property>
+
+<Property name="IndexRugChanges">
+<Type>%String</Type>
+<MultiDimensional>1</MultiDimensional>
+</Property>
+
+<Method name="Test">
+<Description>
+Do ##class(APPS.Halux.TBX.impl.ZaagBatches).Test(8728,"TipOn")</Description>
+<ClassMethod>1</ClassMethod>
+<FormalSpec>BatchID,SubBatch</FormalSpec>
+<Implementation><![CDATA[
+	;Set BatchID=8728
+	Set bl=..%New(BatchID)
+	Do bl.RemoveBatches()
+	Do bl.BuildBatchesFromQueue()
+	Set rs=##class(%ResultSet).%New(..%ClassName(1)_":qActiveBatchList")
+	Set sc=rs.Execute()
+	While (rs.Next()){
+	 Write rs.Data("BatchKey")
+	 Write !
+	}
+	q
+	w !
+	Set rs=##class(%ResultSet).%New(..%ClassName(1)_":qZaagList")
+	Set sc=rs.Execute(BatchID,SubBatch)
+	While (rs.Next()){
+	 Write $G(rs.Data("ID"))
+	 k %d m %d=rs.Data zw %d
+	 Write !
+	}
+]]></Implementation>
+</Method>
+
+<Method name="%OnNew">
+<FormalSpec>BatchID</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set:$G(BatchID) ..Batch=##class(DS.PPS.TBX.Batch).%OpenId(BatchID)
+	Set ..ProductAPI = ##class(DOM.DomeinContext).Instance().GeefProductAPI() ; extends DOM.PM.TBXProduct.TBXLade
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Query name="qActiveBatchList">
+<Type>%SQLQuery</Type>
+<FormalSpec>LijnNr</FormalSpec>
+<SqlQuery><![CDATA[	Select DISTINCT Batch || isnull(SubBatch,"") as BatchKey, Batch, SubBatch from APPS_Halux_TBX.ZaagOpdrachten where isnull(Batch->NotActive,0)=0
+	order by Batch,SubBatch]]></SqlQuery>
+<Parameter name="CONTAINID" value="0"/>
+</Query>
+
+<Query name="qZaagList">
+<Description>
+ZaagID:%Integer,PRNr:%Integer,KortTekst:%String,BatchID:%Integer,SubBatch:%String,KlantNaam:%String,TOENr:%Integer,DossierCode:%String,VolgNr:%Integer,SubNr:%Integer,Totaal:%Integer,Status:%String,Transferlijn:%String,Mode:%String,ModeTitel:%String,Opmerking1:%String,Opmerking2:%String,PrintXML:%String,OpmetenBodem:%Boolean,
+BodemAanslagSensor:%Boolean,BodemBewerking:%String,BodemChangeAfter:%Integer,BodemLengteUntilChange:%Integer,BodemChangeHoogte:%Boolean,BodemChangeKleur:%Boolean,BodemHoogte:%Integer,BodemHoogteOms:%String,BodemHoogteSensor:%Boolean,BodemKleur2de:%String,BodemKleurZichtbaar:%String,BodemReturnsAfter:%Integer,
+RugAanslagSensor:%Boolean,RugBewerking:%String,RugChangeAfter:%Integer,RugLengteUntilChange:%Integer,RugChangeHoogte:%Boolean,RugChangeKleur:%Boolean,RugHoogte:%Integer,RugHoogteOms:%String,RugHoogteSensor:%Boolean,RugKleur2de:%String,RugKleurZichtbaar:%String,RugReturnsAfter:%Integer,</Description>
+<Type>%Query</Type>
+<FormalSpec>BatchID:%Integer,SubBatch:APPS.Halux.TBX.enu.SubBatch</FormalSpec>
+<SqlProc>1</SqlProc>
+<Parameter name="CONTAINID" value="1"/>
+<Parameter name="ROWSPEC" value="ZaagID:%Integer,PRNr:%Integer,KortTekst:%String,BatchID:%Integer,SubBatch:%String,KlantNaam:%String,TOENr:%Integer,DossierCode:%String,VolgNr:%Integer,SubNr:%Integer,Totaal:%Integer,Status:%String,Transferlijn:%String,Mode:%String,ModeTitel:%String,Opmerking1:%String,Opmerking2:%String,PrintXML:%String,OpmetenBodem:%Boolean,BodemAanslagSensor:%Boolean,BodemBewerking:%String,BodemChangeAfter:%Integer,BodemLengteUntilChange:%Integer,BodemChangeHoogte:%Boolean,BodemChangeKleur:%Boolean,BodemBreedte:%Integer,BodemHoogte:%Integer,BodemHoogteOms:%String,BodemHoogteSensor:%Boolean,BodemKleur2de:%String,BodemKleurZichtbaar:%String,BodemReturnsAfter:%Integer,RugAanslagSensor:%Boolean,RugBewerking:%String,RugChangeAfter:%Integer,RugLengteUntilChange:%Integer,RugChangeHoogte:%Boolean,RugChangeKleur:%Boolean,RugBreedte:%Integer,RugHoogte:%Integer,RugHoogteOms:%String,RugHoogteSensor:%Boolean,RugKleur2de:%String,RugKleurZichtbaar:%String,RugReturnsAfter:%Integer"/>
+</Query>
+
+<Method name="qZaagListExecute">
+<ClassMethod>1</ClassMethod>
+<FormalSpec><![CDATA[&qHandle:%Binary,BatchID:%Integer,SubBatch:APPS.Halux.TBX.enu.SubBatch]]></FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set bl=..%New()
+	Set %ZaagList=bl.GetZaagList(BatchID,SubBatch)
+	Set %ZaagListPos=""
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="qZaagListFetch">
+<ClassMethod>1</ClassMethod>
+<FormalSpec><![CDATA[&qHandle:%Binary,&Row:%List,&AtEnd:%Integer=0]]></FormalSpec>
+<PlaceAfter>qZaagListExecute</PlaceAfter>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	
+	Set Opdracht=%ZaagList.GetNext(.%ZaagListPos)
+	If $isObject(Opdracht)
+	{
+		Set Row=Opdracht.BuildList()
+	}
+	Else 
+	{
+		Set Row=""
+		Set AtEnd=1
+	}
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="qZaagListClose">
+<ClassMethod>1</ClassMethod>
+<FormalSpec><![CDATA[&qHandle:%Binary]]></FormalSpec>
+<PlaceAfter>qZaagListExecute</PlaceAfter>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Kill %ZaagList,%ZaagListPos
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="GetZaagList">
+<FormalSpec>BatchID:%Integer,SubBatch:APPS.Halux.TBX.enu.SubBatch</FormalSpec>
+<ReturnType>%ListOfObjects</ReturnType>
+<Implementation><![CDATA[
+	Set rsZaagList=##class(%ResultSet).%New(..%ClassName(1)_":qZaagListHelper")
+	Set sc=rsZaagList.Execute(BatchID,SubBatch)
+	w "execute:",$$ParseStatus^vhLib(sc),!
+	Set ..ZaagList=##class(%ListOfObjects).%New()
+	While rsZaagList.Next() 
+	{	
+		Set Opdracht=##class(APPS.Halux.TBX.dto.ZaagOpdracht).GetOpdracht(rsZaagList.Data("ID"))
+		Do ..Add2List(Opdracht)
+	}
+	
+	Do ..AddPlaatVerschil()
+	Quit ..ZaagList
+]]></Implementation>
+</Method>
+
+<Method name="Add2List">
+<FormalSpec>Opdracht</FormalSpec>
+<Implementation><![CDATA[
+	Quit:'$isObject(Opdracht)
+	Do ..ZaagList.Insert(Opdracht)
+	
+	; index voorbereiden
+	Set ListPos=..ZaagList.Count()
+	Set ..IndexBodemChanges(ListPos)=$S($isObject(Opdracht.Bodem):$LB(Opdracht.Bodem.GetPlaatKey(),Opdracht.Bodem.Breedte),1:"")
+	Set ..IndexRugChanges(ListPos)=$S($isObject(Opdracht.Rug):$LB(Opdracht.Rug.GetPlaatKey(),Opdracht.Rug.Breedte),1:"")
+]]></Implementation>
+</Method>
+
+<Method name="AddPlaatVerschil">
+<Implementation><![CDATA[
+	Set ..MaxPosList=..ZaagList.Count()
+	Set ListPos=""
+	Do 
+	{ 
+		Set Opdracht=..ZaagList.GetNext(.ListPos)
+		Continue:'ListPos
+		
+		If ..ChangesNextRug(ListPos)
+		{
+			Do ..AddRugChange(ListPos,Opdracht)
+		}
+		Do ..AddRugLength(ListPos,Opdracht)
+
+		
+		If ..ChangesNextBodem(ListPos)
+		{
+			Do ..AddBodemChange(ListPos,Opdracht)
+		}
+		Do ..AddBodemLength(ListPos,Opdracht)
+		
+	} While ListPos
+]]></Implementation>
+</Method>
+
+<Method name="AddBodemChange">
+<FormalSpec>ListPos,Opdracht</FormalSpec>
+<Implementation><![CDATA[
+	Set NextOpdracht=..ZaagList.GetAt(ListPos+1)
+	Do ..AddChange(Opdracht.Bodem,NextOpdracht.Bodem)
+]]></Implementation>
+</Method>
+
+<Method name="AddRugChange">
+<FormalSpec>ListPos,Opdracht</FormalSpec>
+<Implementation><![CDATA[
+	Set NextOpdracht=..ZaagList.GetAt(ListPos+1)
+	Do ..AddChange(Opdracht.Rug,NextOpdracht.Rug)
+]]></Implementation>
+</Method>
+
+<Method name="AddChange">
+<Description>
+Wijziging wordt aangebracht bij de NextPlaat</Description>
+<FormalSpec>Plaat,NextPlaat</FormalSpec>
+<Implementation><![CDATA[
+	Quit:'$isObject(NextPlaat)
+	
+	If '$isObject(Plaat)||(Plaat.KleurZichtbaar'=NextPlaat.KleurZichtbaar)||(Plaat.Kleur2de'=NextPlaat.Kleur2de)
+	{
+	 	Set NextPlaat.ChangeKleur=1
+	}
+	If '$isObject(Plaat)||(Plaat.Hoogte'=NextPlaat.Hoogte)
+	{
+		Set NextPlaat.ChangeHoogte=1
+	}
+]]></Implementation>
+</Method>
+
+<Method name="AddRugLength">
+<FormalSpec>ListPos,Opdracht</FormalSpec>
+<Implementation><![CDATA[
+	Quit:'$isObject(Opdracht.Rug)
+	Set (Cnt,Lengte)=0
+	Set NextListPos=ListPos
+	Do { 
+		Set Cnt=Cnt+1
+		Set Lengte=Lengte+$LG(..IndexRugChanges(NextListPos),2)
+		Quit:..ChangesNextRug(NextListPos)
+		Set NextListPos=NextListPos+1
+	} While NextListPos<..MaxPosList
+	
+	Set Opdracht.Rug.ChangeAfter=Cnt
+	Set Opdracht.Rug.LengteUntilChange=Lengte*1.05
+]]></Implementation>
+</Method>
+
+<Method name="AddBodemLength">
+<FormalSpec>ListPos,Opdracht</FormalSpec>
+<Implementation><![CDATA[
+	Quit:'$isObject(Opdracht.Bodem)
+	Set (Cnt,Lengte)=0
+	Set NextListPos=ListPos
+	Do { 
+		Set Cnt=Cnt+1
+		Set Lengte=Lengte+$LG(..IndexBodemChanges(NextListPos),2)
+		Quit:..ChangesNextBodem(NextListPos)
+		Set NextListPos=NextListPos+1
+	} While NextListPos<..MaxPosList
+	
+	Set Opdracht.Bodem.ChangeAfter=Cnt
+	Set Opdracht.Bodem.LengteUntilChange=Lengte*1.05
+]]></Implementation>
+</Method>
+
+<Method name="ZoekPlaatVerschil">
+<FormalSpec>ListPos</FormalSpec>
+<Implementation><![CDATA[
+	Set NextListPos=ListPos
+	Do { 
+		Quit:..ChangesNextRug(NextListPos)||..ChangesNextBodem(NextListPos)
+		Set NextListPos=NextListPos+1
+	} While NextListPos<..MaxPosList
+]]></Implementation>
+</Method>
+
+<Method name="ChangesNextRug">
+<CodeMode>expression</CodeMode>
+<FormalSpec>ListPos</FormalSpec>
+<Implementation><![CDATA[(ListPos<..MaxPosList)&&($LG(..IndexRugChanges(ListPos))'=$LG(..IndexRugChanges(ListPos+1)))
+]]></Implementation>
+</Method>
+
+<Method name="ChangesNextBodem">
+<CodeMode>expression</CodeMode>
+<FormalSpec>ListPos</FormalSpec>
+<Implementation><![CDATA[(ListPos<..MaxPosList)&&($LG(..IndexBodemChanges(ListPos))'=$LG(..IndexBodemChanges(ListPos+1)))
+]]></Implementation>
+</Method>
+
+<Query name="qZaagListHelper">
+<Type>%SQLQuery</Type>
+<FormalSpec>BatchID:%Integer,SubBatch:APPS.Halux.TBX.enu.SubBatch</FormalSpec>
+<Private>1</Private>
+<SqlQuery>	Select ID from APPS_Halux_TBX.ZaagOpdrachten where Batch = :BatchID and isnull(SubBatch,"*")=isnull(:SubBatch,"*")</SqlQuery>
+<Parameter name="CONTAINID" value="1"/>
+</Query>
+
+<Query name="qBatchQueue">
+<Type>%SQLQuery</Type>
+<FormalSpec>BatchID:%Integer</FormalSpec>
+<Private>1</Private>
+<SqlQuery>	Select %ID from PPS.TBX_Queue where BatchId = :BatchID
+	order by Sequence</SqlQuery>
+<Parameter name="CONTAINID" value="1"/>
+</Query>
+
+<Method name="BuildBatchesFromQueue">
+<Description>
+</Description>
+<Implementation><![CDATA[
+	Set rsQueue=##class(%ResultSet).%New(..%ClassName(1)_":qBatchQueue")
+	Set sc=rsQueue.Execute(..Batch.%Id())
+	While (rsQueue.Next()) 
+	{	
+		Set ..Queue=##class(DS.PPS.TBX.Queue).%OpenId(rsQueue.Data("ID"))
+		Continue:'$isObject(..Queue)
+		
+		Set Product = ..ProductAPI.GeefProduct(..Queue.Product.%Id())
+		Continue:'$isObject(Product)
+		w !,..Queue.Product.%Id()," ",..Queue.Product.KortTekst," ",Product.%ClassName(1)		
+		Do Product.Accept(##this) ; trigger visitor
+    }
+ 
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkTBXSifonlade">
+<Description>
+Triggered by visitor</Description>
+<FormalSpec>Sifonlade:DOM.PM.TBXProduct.TBXSifonlade</FormalSpec>
+<Implementation><![CDATA[
+  w " visitor si"
+	Do ..AddZaagOpdracht(Sifonlade,##class(APPS.Halux.TBX.enu.SubBatch).SpoelbakSifon())
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkTBXSpoelbaklade">
+<Description>
+Triggered by visitor</Description>
+<FormalSpec>Spoelbaklade:DOM.PM.TBXProduct.TBXSpoelbaklade</FormalSpec>
+<Implementation><![CDATA[
+  w " visitor sp"
+	Do ..AddZaagOpdracht(Spoelbaklade,##class(APPS.Halux.TBX.enu.SubBatch).SpoelbakSifon())
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkTBXLade">
+<Description>
+Triggered by visitor</Description>
+<FormalSpec>Lade:DOM.PM.TBXProduct.TBXLade</FormalSpec>
+<Implementation><![CDATA[
+	w " visitor L"
+	If Lade.BevatTipOn()
+	{
+		Do ..AddZaagOpdracht(Lade, ##class(APPS.Halux.TBX.enu.SubBatch).TipOn())
+	}
+	Else  ; standaard laden
+	{
+		Do ..AddZaagOpdracht(Lade, ##class(APPS.Halux.TBX.enu.SubBatch).Main())
+	}
+]]></Implementation>
+</Method>
+
+<Method name="AddZaagOpdracht">
+<FormalSpec>Lade:DOM.PM.TBXProduct.TBXLade,SubBatch:APPS.Halux.TBX.enu.SubBatch</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set BodemRug=##class(APPS.Halux.TBX.ZaagOpdrachten).GetBodemRug(SubBatch,Lade)
+	Quit:BodemRug="" ;niets te zagen
+	Do ##class(APPS.Halux.TBX.ZaagOpdrachten).CreateFromQueue(..Batch,SubBatch,BodemRug,..Queue,Lade)
+]]></Implementation>
+</Method>
+
+<Method name="RemoveBatches">
+<Implementation><![CDATA[
+	Set BatchID=..Batch.%Id()
+	&sql(DECLARE DelBatch CURSOR FOR
+	SELECT ID into :ZaagID
+	FROM APPS_Halux_TBX.ZaagOpdrachten
+	WHERE Batch=:BatchID)
+   
+ 	&sql(OPEN DelBatch)
+ 	For  &sql(FETCH DelBatch) Quit:SQLCODE  Do
+  	. Set sc=##class(APPS.Halux.TBX.ZaagOpdrachten).%DeleteId(ZaagID)
+  	. If $$$ISERR(sc)  $$$ThrowErrorStatus($$$errSaveFailed,"RemoveBatches",sc) 
+
+  	&sql(CLOSE DelBatch)
+]]></Implementation>
+</Method>
+</Class>
 </Export>