Index: APPS/Verpakking/Vulstuk.cls.xml
===================================================================
diff -u
--- APPS/Verpakking/Vulstuk.cls.xml	(revision 0)
+++ APPS/Verpakking/Vulstuk.cls.xml	(revision 69601)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.Verpakking.Vulstuk">
+<Super>APPS.Verpakking.Doos</Super>
+
+<Parameter name="XMLTYPE">
+<Default>APPS.Verpakking.Vulstuk</Default>
+</Parameter>
+
+<Property name="Recipe">
+<Type>%Integer</Type>
+<InitialExpression>3</InitialExpression>
+<Parameter name="XMLNAME" value="RECIPE"/>
+</Property>
+
+<Property name="LogoPrint">
+<Type>%String</Type>
+<InitialExpression>"ORGALUX WHITE"</InitialExpression>
+<Parameter name="XMLNAME" value="LOGOPRINT"/>
+<Parameter name="XMLPROJECTION" value="NONE"/>
+</Property>
+
+<Property name="CardBoardThickness">
+<Type>%Decimal</Type>
+<InitialExpression>4.2</InitialExpression>
+<Parameter name="XMLNAME" value="CARDBOARDTHICKNESS"/>
+</Property>
+
+<Property name="Swap">
+<Type>%Decimal</Type>
+<InitialExpression>0</InitialExpression>
+<Parameter name="XMLNAME" value="SWAP"/>
+</Property>
+
+<Property name="QO">
+<Type>%Decimal</Type>
+<InitialExpression>1</InitialExpression>
+<Parameter name="XMLNAME" value="QO"/>
+<Parameter name="XMLPROJECTION" value="NONE"/>
+</Property>
+</Class>
+
+
+</Export>
Index: APPS/Verpakking/Optimizer.cls.xml
===================================================================
diff -u -r69241 -r69601
--- APPS/Verpakking/Optimizer.cls.xml	(.../Optimizer.cls.xml)	(revision 69241)
+++ APPS/Verpakking/Optimizer.cls.xml	(.../Optimizer.cls.xml)	(revision 69601)
@@ -29,7 +29,7 @@
 </Property>
 
 <Method name="Optimize">
-<FormalSpec><![CDATA[&BasisDoos:APPS.Verpakking.Doos,ProductGroep:%String]]></FormalSpec>
+<FormalSpec><![CDATA[&BasisDoos:APPS.Verpakking.Doos,ProductGroep:%String,MachineTechnologie:APPS.Verpakking.enu.MachineTechnologie]]></FormalSpec>
 <Implementation><![CDATA[
 	Set ..btCardboardRepository = ##class(DS.Prod.OptiBox.sub.btCardboardRepository).%New()
 		
@@ -47,9 +47,21 @@
 		Do ..OptmizeV1Flatpack(.BasisDoos)
 	} ElseIf (BasisDoos.%Extends("APPS.Verpakking.ComplexeScheiding")) {
 		Do ..OptmizeComplexeScheiding(.BasisDoos)
+	} /*ElseIf (BasisDoos.%Extends("APPS.Verpakking.Vulstuk")) {
+		Do ..OptmizeVulstuk(.BasisDoos)
+	} ElseIf (BasisDoos.%Extends("APPS.Verpakking.VulstukKlein")) {
+		//Do ..OptmizeVulstukKlein(.BasisDoos)
+	} */ElseIf (BasisDoos.%Extends("APPS.Verpakking.VouwErrondDoosBuffer")) {
+		Do ..OptmizeVouwErrondDoosBuffer(.BasisDoos)
 	}
 	
 	Set BasisDoos.CardBoardID = ..btCardboardRepository.GeefKartonID(BasisDoos.CardBoardThickness, ..BreedtePlano, BasisDoos.LogoPrint)
+	
+	If (MachineTechnologie = ##class(APPS.Verpakking.enu.MachineTechnologie).Kraft()) && (BasisDoos.Swap = 1) {
+		#dim OrigineleWidth As %Decimal = BasisDoos.Width
+		Set BasisDoos.Width = BasisDoos.Depth
+		Set BasisDoos.Depth = OrigineleWidth
+	}
 ]]></Implementation>
 </Method>
 
@@ -192,6 +204,79 @@
 ]]></Implementation>
 </Method>
 
+<Method name="OptmizeVouwErrondDoosBuffer">
+<FormalSpec><![CDATA[&BasisDoos:APPS.Verpakking.VouwErrondDoosBuffer]]></FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim SwapRecept220IsBeter, SwapRecept210IsBeter As %Boolean = $$$False
+	
+	#dim BreedtePlanoVoorSwapRecept220 As %Decimal = BasisDoos.Width + BasisDoos.Height + BasisDoos.Width + BasisDoos.Height + BasisDoos.FS + ..#MachineKant
+	#dim DieptePlanoVoorSwapRecept220 As %Decimal = BasisDoos.RS + BasisDoos.Height + BasisDoos.RS + BasisDoos.Height + BasisDoos.RS + BasisDoos.Depth + BasisDoos.LS + BasisDoos.Height + BasisDoos.LS + BasisDoos.Height + BasisDoos.LS
+	
+	#dim BreedtePlanoNaSwapRecept220 As %Decimal = BasisDoos.Depth + BasisDoos.Height + BasisDoos.Depth + BasisDoos.Height + BasisDoos.FS + ..#MachineKant
+	#dim DieptePlanoNaSwapRecept220 As %Decimal = BasisDoos.RS + BasisDoos.Height + BasisDoos.RS + BasisDoos.Height + BasisDoos.RS + BasisDoos.Width + BasisDoos.LS + BasisDoos.Height + BasisDoos.LS + BasisDoos.Height + BasisDoos.LS
+	
+	#dim NodigeKartonBreedteVoorSwapRecept220 = $Select(BreedtePlanoVoorSwapRecept220 <= ..#AfmetingBreedsteKarton: ..btCardboardRepository.GeefKartonBreedte(BasisDoos.CardBoardThickness, BreedtePlanoVoorSwapRecept220, BasisDoos.LogoPrint), 1: 9999999)
+	#dim NodigeKartonBreedteNaSwapRecept220 = $Select(BreedtePlanoNaSwapRecept220 <= ..#AfmetingBreedsteKarton: ..btCardboardRepository.GeefKartonBreedte(BasisDoos.CardBoardThickness, BreedtePlanoNaSwapRecept220, BasisDoos.LogoPrint), 1: 9999999)
+	
+	#dim OppTotaleKartonVoorSwapRecept220 As %Decimal = DieptePlanoVoorSwapRecept220 * NodigeKartonBreedteVoorSwapRecept220
+	#dim OppTotaleKartonNaSwapRecept220 As %Decimal = DieptePlanoNaSwapRecept220 * NodigeKartonBreedteNaSwapRecept220
+	
+	If ((OppTotaleKartonNaSwapRecept220 < OppTotaleKartonVoorSwapRecept220)) {
+		Set SwapRecept220IsBeter = $$$True
+	}
+	
+	#dim BreedtePlanoVoorSwapRecept210 As %Decimal = BasisDoos.LS + BasisDoos.Height + BasisDoos.LS + BasisDoos.Height + BasisDoos.LS + BasisDoos.Width + BasisDoos.RS + BasisDoos.Height + BasisDoos.RS + BasisDoos.Height + BasisDoos.RS + ..#MachineKant
+	#dim DieptePlanoVoorSwapRecept210 As %Decimal = BasisDoos.Depth + BasisDoos.Height + BasisDoos.Depth + BasisDoos.Height + BasisDoos.FS
+	
+	#dim BreedtePlanoNaSwapRecept210 As %Decimal = BasisDoos.LS + BasisDoos.Height + BasisDoos.LS + BasisDoos.Height + BasisDoos.LS + BasisDoos.Depth + BasisDoos.RS + BasisDoos.Height + BasisDoos.RS + BasisDoos.Height + BasisDoos.RS + ..#MachineKant
+	#dim DieptePlanoNaSwapRecept210 As %Decimal = BasisDoos.Width + BasisDoos.Height + BasisDoos.Width + BasisDoos.Height + BasisDoos.FS
+	
+	#dim NodigeKartonBreedteVoorSwapRecept210 = $Select(BreedtePlanoVoorSwapRecept210 <= ..#AfmetingBreedsteKarton: ..btCardboardRepository.GeefKartonBreedte(BasisDoos.CardBoardThickness, BreedtePlanoVoorSwapRecept210, BasisDoos.LogoPrint), 1: 9999999)
+	#dim NodigeKartonBreedteNaSwapRecept210 = $Select(BreedtePlanoNaSwapRecept210 <= ..#AfmetingBreedsteKarton: ..btCardboardRepository.GeefKartonBreedte(BasisDoos.CardBoardThickness, BreedtePlanoNaSwapRecept210, BasisDoos.LogoPrint), 1: 9999999)
+	
+	#dim OppTotaleKartonVoorSwapRecept210 As %Decimal = DieptePlanoVoorSwapRecept210 * NodigeKartonBreedteVoorSwapRecept210
+	#dim OppTotaleKartonNaSwapRecept210 As %Decimal = DieptePlanoNaSwapRecept210 * NodigeKartonBreedteNaSwapRecept210
+	
+	If ((OppTotaleKartonNaSwapRecept210 < OppTotaleKartonVoorSwapRecept210)) {
+		Set SwapRecept210IsBeter = $$$True
+	}
+	
+	If (SwapRecept220IsBeter && SwapRecept210IsBeter) {
+		Set ..BreedtePlano = BreedtePlanoNaSwapRecept220
+		Set BasisDoos.Swap = 1
+		If (OppTotaleKartonNaSwapRecept210 < OppTotaleKartonNaSwapRecept220) {
+			Set ..BreedtePlano = BreedtePlanoNaSwapRecept210
+			Set BasisDoos.Recipe = 210
+		}			
+	} ElseIf (SwapRecept220IsBeter && $$$Not(SwapRecept210IsBeter)) {
+		If (OppTotaleKartonVoorSwapRecept210 < OppTotaleKartonNaSwapRecept220) {
+			Set ..BreedtePlano = BreedtePlanoVoorSwapRecept210
+			Set BasisDoos.Recipe = 210
+			Set BasisDoos.Swap = 0
+		} Else {
+			Set BasisDoos.Swap = 1
+			Set ..BreedtePlano = BreedtePlanoNaSwapRecept220
+		}
+	} ElseIf ($$$Not(SwapRecept220IsBeter) && SwapRecept210IsBeter) {
+		Set ..BreedtePlano = BreedtePlanoVoorSwapRecept220
+		Set BasisDoos.Swap = 0
+		If (OppTotaleKartonNaSwapRecept210 < OppTotaleKartonVoorSwapRecept220) {
+			Set ..BreedtePlano = BreedtePlanoNaSwapRecept210
+			Set BasisDoos.Recipe = 210
+			Set BasisDoos.Swap = 1
+		}
+	} ElseIf ($$$Not(SwapRecept220IsBeter) && $$$Not(SwapRecept210IsBeter)) {
+		Set ..BreedtePlano = BreedtePlanoVoorSwapRecept220
+		Set BasisDoos.Swap = 0
+		If (OppTotaleKartonVoorSwapRecept210 < OppTotaleKartonVoorSwapRecept220) {
+			Set ..BreedtePlano = BreedtePlanoVoorSwapRecept210
+			Set BasisDoos.Recipe = 210
+		}
+	}
+]]></Implementation>
+</Method>
+
 <Method name="OptmizeV1DoosMetDeksel">
 <FormalSpec><![CDATA[&BasisDoos:APPS.Verpakking.V1DoosMetDeksel]]></FormalSpec>
 <Private>1</Private>
Index: APPS/Verpakking/DoosService.cls.xml
===================================================================
diff -u -r69388 -r69601
--- APPS/Verpakking/DoosService.cls.xml	(.../DoosService.cls.xml)	(revision 69388)
+++ APPS/Verpakking/DoosService.cls.xml	(.../DoosService.cls.xml)	(revision 69601)
@@ -70,7 +70,7 @@
 </Method>
 
 <Method name="GeefDoos">
-<FormalSpec><![CDATA[ProductGroep:%String,ReceptNaam:%String,MachineID:APPS.Verpakking.enu.MachineID,Aantal:%Integer,&Params:%String,ProductId:%String,Prioriteit:%String="-1",BaseRef:%String,&CallBack:%List=""]]></FormalSpec>
+<FormalSpec><![CDATA[ProductGroep:%String,ReceptNaam:%String,MachineID:APPS.Verpakking.enu.MachineID,Aantal:%Integer,&Params:%String,ProductId:%String,Prioriteit:%String="-1",BaseRef:%String,&CallBack:%List="",BoxDataID:%String=""]]></FormalSpec>
 <Implementation><![CDATA[
 	If $$$Not(MachineID = ##class(APPS.Verpakking.enu.MachineID).VH()) {
 		If $$$Not($$$Server = "CACHE01") {
@@ -82,8 +82,8 @@
 		Set BaseRef = $Piece(BaseRef,".",1,2) //Bij TAOR komt er nog een 3e piece achter, dit zou verder in de flow anders voor fouten zorgen
 		#dim MachineTechnologie As APPS.Verpakking.enu.MachineTechnologie = ..GeefMachineTechnologie(MachineID)
 		#dim Doos As APPS.Verpakking.Doos = ..DoosFactory.MaakDoos(ProductGroep, ReceptNaam)
-		Do ..DoosAanvuller.VulAanBasisInformatieDoos(.Doos, .Params, ProductGroep, Prioriteit, MachineTechnologie)
-		Do ..Optimizer.Optimize(.Doos, ProductGroep)
+		Do ..DoosAanvuller.VulAanBasisInformatieDoos(.Doos, .Params, ProductGroep, Prioriteit, MachineTechnologie, BoxDataID)
+		Do ..Optimizer.Optimize(.Doos, ProductGroep, MachineTechnologie)
 		
 		#dim SnijData As DS.Prod.OptiBox.SnijData = ""
 		#dim OptiData As DS.Prod.OptiBox.OptiData
Index: APPS/Verpakking/VouwErrondDoosBuffer.cls.xml
===================================================================
diff -u
--- APPS/Verpakking/VouwErrondDoosBuffer.cls.xml	(revision 0)
+++ APPS/Verpakking/VouwErrondDoosBuffer.cls.xml	(revision 69601)
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.Verpakking.VouwErrondDoosBuffer">
+<Super>APPS.Verpakking.Doos</Super>
+
+<Parameter name="XMLTYPE">
+<Default>APPS.Verpakking.VouwErrondDoosBuffer</Default>
+</Parameter>
+
+<Property name="Recipe">
+<Type>%Integer</Type>
+<InitialExpression>220</InitialExpression>
+<Parameter name="XMLNAME" value="RECIPE"/>
+</Property>
+
+<Property name="AllowMultiple">
+<Type>%Decimal</Type>
+<InitialExpression>10</InitialExpression>
+<Parameter name="XMLNAME" value="ALLOWMULTIPLE"/>
+<Parameter name="XMLPROJECTION" value="NONE"/>
+</Property>
+
+<Property name="CardBoardThickness">
+<Type>%Decimal</Type>
+<InitialExpression>4.2</InitialExpression>
+<Parameter name="XMLNAME" value="CARDBOARDTHICKNESS"/>
+</Property>
+
+<Property name="LogoPrint">
+<Type>%String</Type>
+<InitialExpression>"ORGALUX WHITE"</InitialExpression>
+<Parameter name="XMLNAME" value="LOGOPRINT"/>
+<Parameter name="XMLPROJECTION" value="NONE"/>
+</Property>
+
+<Property name="Swap">
+<Type>%Decimal</Type>
+<Parameter name="XMLNAME" value="SWAP"/>
+</Property>
+
+<Property name="AltRecipe">
+<Type>%Decimal</Type>
+<InitialExpression>210</InitialExpression>
+<Parameter name="XMLNAME" value="ALTRECIPE"/>
+<Parameter name="XMLPROJECTION" value="NONE"/>
+</Property>
+
+<Property name="AltSwap">
+<Type>%Decimal</Type>
+<Parameter name="XMLNAME" value="ALTSWAP"/>
+<Parameter name="XMLPROJECTION" value="NONE"/>
+</Property>
+
+<Property name="LT">
+<Type>%Decimal</Type>
+<InitialExpression>0</InitialExpression>
+<Parameter name="XMLNAME" value="LT"/>
+<Parameter name="XMLPROJECTION" value="NONE"/>
+</Property>
+
+<Property name="LS">
+<Type>%Decimal</Type>
+<InitialExpression>60</InitialExpression>
+<Parameter name="XMLNAME" value="LS"/>
+<Parameter name="XMLPROJECTION" value="NONE"/>
+</Property>
+
+<Property name="RT">
+<Type>%Decimal</Type>
+<InitialExpression>0</InitialExpression>
+<Parameter name="XMLNAME" value="RT"/>
+<Parameter name="XMLPROJECTION" value="NONE"/>
+</Property>
+
+<Property name="RS">
+<Type>%Decimal</Type>
+<InitialExpression>60</InitialExpression>
+<Parameter name="XMLNAME" value="RS"/>
+<Parameter name="XMLPROJECTION" value="NONE"/>
+</Property>
+
+<Property name="FS">
+<Type>%Decimal</Type>
+<InitialExpression>100</InitialExpression>
+<Parameter name="XMLNAME" value="FS"/>
+<Parameter name="XMLPROJECTION" value="NONE"/>
+</Property>
+</Class>
+
+
+</Export>
Index: vhUnitTest/APPS/Verpakking/DoosService/Test.cls.xml
===================================================================
diff -u -r69288 -r69601
--- vhUnitTest/APPS/Verpakking/DoosService/Test.cls.xml	(.../Test.cls.xml)	(revision 69288)
+++ vhUnitTest/APPS/Verpakking/DoosService/Test.cls.xml	(.../Test.cls.xml)	(revision 69601)
@@ -36,8 +36,8 @@
 	Set DummyRequest.Box = DummyDoos
 	
 	Do DoosFactoryMock.VerwachtMethodCall("MaakDoos", ProductGroep, ReceptNaam).DanReturn(DummyDoos).ExactAantalKeer(1)
-	Do DoosAanvullerMock.VerwachtMethodCall("VulAanBasisInformatieDoos", DummyDoos, .Params, ProductGroep, Prioriteit, MachineTechnologie).DanDoeNiks().ExactAantalKeer(1)
-	Do OptimizerMock.VerwachtMethodCall("Optimize", DummyDoos, ProductGroep).DanReturn(DummyDoos).ExactAantalKeer(1)
+	Do DoosAanvullerMock.VerwachtMethodCall("VulAanBasisInformatieDoos", DummyDoos, .Params, ProductGroep, Prioriteit, MachineTechnologie, "").DanDoeNiks().ExactAantalKeer(1)
+	Do OptimizerMock.VerwachtMethodCall("Optimize", DummyDoos, ProductGroep, MachineTechnologie).DanReturn(DummyDoos).ExactAantalKeer(1)
 	Do SnijRequestMakerMock.VerwachtMethodCall("MaakSnijRequest", DummyDoos, MachineTechnologie, MachineID, Prioriteit, Aantal, BaseRef).DanReturn(DummyRequest).ExactAantalKeer(1)
 	Do SnijDoosServiceMock.VerwachtMethodCall("SnijDoos", DummyRequest).DanDoeNiks().ExactAantalKeer(1)
 	Do ProductApiMock.VerwachtMethodCall("GeefProduct", PRNr).DanDoeNiks().ExactAantalKeer(0)
Index: APPS/Verpakking/DoosFactory.cls.xml
===================================================================
diff -u -r68738 -r69601
--- APPS/Verpakking/DoosFactory.cls.xml	(.../DoosFactory.cls.xml)	(revision 68738)
+++ APPS/Verpakking/DoosFactory.cls.xml	(.../DoosFactory.cls.xml)	(revision 69601)
@@ -28,9 +28,11 @@
 		ElseIf (ReceptNaam = "Vouw errond doos") { Set Doos = ##class(APPS.Verpakking.VouwErrondDoos).%New() }
 	
 	} ElseIf (ProductGroep = "OL") {
-		If (##class(TECH.StringUtils).Equals(ReceptNaam, "Afval los groep", "Antislipmat groep", "Kruidenrek groep", "Zilverbestekhouder groep")) {
-			Set Doos = ##class(APPS.Verpakking.VouwErrondDoos).%New()
-		} /*ElseIf (ReceptNaam = "?????") {
+		If (##class(TECH.StringUtils).Equals(ReceptNaam, "Afval los groep", "Antislipmat groep", "Kruidenrek groep", "Zilverbestekhouder groep")) { Set Doos = ##class(APPS.Verpakking.VouwErrondDoos).%New() } 
+		ElseIf (ReceptNaam = "FILLER") { Set Doos = ##class(APPS.Verpakking.Vulstuk).%New() }
+		ElseIf (ReceptNaam = "FILLER SMALL") { Set Doos = ##class(APPS.Verpakking.VulstukKlein).%New() }
+		ElseIf (ReceptNaam = "WRAPAROUND BUFFER") { Set Doos = ##class(APPS.Verpakking.VouwErrondDoosBuffer).%New() }
+		 /*ElseIf (ReceptNaam = "?????") {
 			Set Doos = ##class(APPS.Verpakking.ComplexeScheiding).%New()
 		}*/
 	
Index: vhUnitTest/APPS/Verpakking/Optimizer/Test.cls.xml
===================================================================
diff -u -r68515 -r69601
--- vhUnitTest/APPS/Verpakking/Optimizer/Test.cls.xml	(.../Test.cls.xml)	(revision 68515)
+++ vhUnitTest/APPS/Verpakking/Optimizer/Test.cls.xml	(.../Test.cls.xml)	(revision 69601)
@@ -67,7 +67,7 @@
 <FormalSpec>Doos:APPS.Verpakking.Doos,ProductGroep:%String,VerwachteRecipe:%String,VerwachteSwap:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	Do ..Optimizer.Optimize(.Doos, ProductGroep)
+	Do ..Optimizer.Optimize(.Doos, ProductGroep, ##class(APPS.Verpakking.enu.MachineTechnologie).Panotec())
 	
 	Do $$$AssertEquals(Doos.Recipe, VerwachteRecipe)
 	Do $$$AssertEquals(Doos.Swap, VerwachteSwap)
Index: vhTest/Mock/APPS/Verpakking/DoosAanvuller.cls.xml
===================================================================
diff -u -r68405 -r69601
--- vhTest/Mock/APPS/Verpakking/DoosAanvuller.cls.xml	(.../DoosAanvuller.cls.xml)	(revision 68405)
+++ vhTest/Mock/APPS/Verpakking/DoosAanvuller.cls.xml	(.../DoosAanvuller.cls.xml)	(revision 69601)
@@ -9,8 +9,8 @@
 <Inheritance>right</Inheritance>
 
 <Method name="VulAanBasisInformatieDoos">
-<FormalSpec><![CDATA[&BasisDoos:APPS.Verpakking.Doos,&Params:%String,ProductGroep:%String,Prioriteit:%String,MachineTechnologie:APPS.Verpakking.enu.MachineTechnologie]]></FormalSpec>
-<Implementation><![CDATA[	do ..VerwerkMethodCall("VulAanBasisInformatieDoos",.BasisDoos,.Params,ProductGroep,Prioriteit,MachineTechnologie)
+<FormalSpec><![CDATA[&BasisDoos:APPS.Verpakking.Doos,&Params:%String,ProductGroep:%String,Prioriteit:%String,MachineTechnologie:APPS.Verpakking.enu.MachineTechnologie,BoxDataID:%String=""]]></FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VulAanBasisInformatieDoos",.BasisDoos,.Params,ProductGroep,Prioriteit,MachineTechnologie,BoxDataID)
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/Verpakking/VulstukKlein.cls.xml
===================================================================
diff -u
--- APPS/Verpakking/VulstukKlein.cls.xml	(revision 0)
+++ APPS/Verpakking/VulstukKlein.cls.xml	(revision 69601)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.Verpakking.VulstukKlein">
+<Super>APPS.Verpakking.Doos</Super>
+
+<Parameter name="XMLTYPE">
+<Default>APPS.Verpakking.VulstukKlein</Default>
+</Parameter>
+
+<Property name="Recipe">
+<Type>%Integer</Type>
+<InitialExpression>2</InitialExpression>
+<Parameter name="XMLNAME" value="RECIPE"/>
+</Property>
+
+<Property name="LogoPrint">
+<Type>%String</Type>
+<InitialExpression>"ORGALUX WHITE"</InitialExpression>
+<Parameter name="XMLNAME" value="LOGOPRINT"/>
+<Parameter name="XMLPROJECTION" value="NONE"/>
+</Property>
+
+<Property name="CardBoardThickness">
+<Type>%Decimal</Type>
+<InitialExpression>4.2</InitialExpression>
+<Parameter name="XMLNAME" value="CARDBOARDTHICKNESS"/>
+</Property>
+
+<Property name="Swap">
+<Type>%Decimal</Type>
+<InitialExpression>0</InitialExpression>
+<Parameter name="XMLNAME" value="SWAP"/>
+</Property>
+</Class>
+
+
+</Export>
Index: APPS/Verpakking/DoosAanvuller.cls.xml
===================================================================
diff -u -r69591 -r69601
--- APPS/Verpakking/DoosAanvuller.cls.xml	(.../DoosAanvuller.cls.xml)	(revision 69591)
+++ APPS/Verpakking/DoosAanvuller.cls.xml	(.../DoosAanvuller.cls.xml)	(revision 69601)
@@ -9,7 +9,7 @@
 </Property>
 
 <Method name="VulAanBasisInformatieDoos">
-<FormalSpec><![CDATA[&BasisDoos:APPS.Verpakking.Doos,&Params:%String,ProductGroep:%String,Prioriteit:%String,MachineTechnologie:APPS.Verpakking.enu.MachineTechnologie]]></FormalSpec>
+<FormalSpec><![CDATA[&BasisDoos:APPS.Verpakking.Doos,&Params:%String,ProductGroep:%String,Prioriteit:%String,MachineTechnologie:APPS.Verpakking.enu.MachineTechnologie,BoxDataID:%String=""]]></FormalSpec>
 <Implementation><![CDATA[
 	Set ..MachineTechnologie = MachineTechnologie
 	
@@ -27,6 +27,12 @@
 		Do ..VulAanV1Flatpack(.BasisDoos, .Params)
 	} ElseIf (BasisDoos.%Extends("APPS.Verpakking.ComplexeScheiding")) {
 		Do ..VulAanComplexeScheiding(.BasisDoos, .Params, ProductGroep)
+	} ElseIf (BasisDoos.%Extends("APPS.Verpakking.Vulstuk")) {
+		Do ..VulAanVulstuk(.BasisDoos, BoxDataID)
+	} ElseIf (BasisDoos.%Extends("APPS.Verpakking.VulstukKlein")) {
+		Do ..VulAanVulstukKlein(.BasisDoos, BoxDataID)
+	} ElseIf (BasisDoos.%Extends("APPS.Verpakking.VouwErrondDoosBuffer")) {
+		Do ..VulAanVouwErrondDoosBuffer(.BasisDoos, BoxDataID)
 	}
 	
 	Set BasisDoos.Depth = ##class(TECH.Math).Round(BasisDoos.Depth,0)
@@ -296,7 +302,7 @@
 		Set BasisDoos.NBR = $S(Params("BKQTY")>4:4,1:Params("BKQTY"))
 		
 	}/* ElseIf (ProductGroep = "OL") {
-		Set BasisDoos.RecipeName = "OL COMPLEX SEPARATOR"		//Meta 483
+		Set BasisDoos.RecipeName = "OL COMPLEX SEPARATOR"		//Meta 483 - Gebruikt deze wel meer dan 1 flap? Voor de rest is deze wel al bruikbaar?
 		Set BasisDoos.LogoPrint = "ORGALUX WHITE"
 		;Set BasisDoos.Depth = ?
 		;Set BasisDoos.Height = ?
@@ -349,6 +355,98 @@
 	Do BasisDoos.Params.Insert(Param)
 ]]></Implementation>
 </Method>
+
+<Method name="VulAanVulstuk">
+<FormalSpec><![CDATA[&BasisDoos:APPS.Verpakking.Vulstuk,BoxDataID:%String]]></FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	//Meta 466
+	
+	If (##class(DS.Prod.OptiBox.BoxData).%ExistsId(BoxDataID)) {
+		Set BoxData = ##class(DS.Prod.OptiBox.BoxData).%OpenId(BoxDataID)
+	} Else {
+		#dim Logger = ##class(vhLib.Logger).%New("VH doos service").ErrorMail("Geen boxdata gevonden voor boxdataID: '"_BoxDataID_"'.")
+	}
+	
+	Set BasisDoos.Depth = BoxData.DiepteExec
+	Set BasisDoos.Height = BoxData.HoogteExec
+	Set BasisDoos.Width = BoxData.BreedteExec
+	
+	Set BasisDoos.QO = $Select($D(BoxData.Params.GetAt("QO")): BoxData.Params.GetAt("QO").WaardeExec, 1: BasisDoos.QO)
+	
+	Set Param = ##class(APPS.Verpakking.Doos.Param).%New()
+	Set Param.Key = $Select(..MachineTechnologie = ##class(APPS.Verpakking.enu.MachineTechnologie).Panotec():"1", 1: "QO")
+	Set Param.Value = BasisDoos.QO
+	Do BasisDoos.Params.Insert(Param)
+]]></Implementation>
+</Method>
+
+<Method name="VulAanVulstukKlein">
+<FormalSpec><![CDATA[&BasisDoos:APPS.Verpakking.VulstukKlein,BoxDataID:%String]]></FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	//Meta 486
+	
+	If (##class(DS.Prod.OptiBox.BoxData).%ExistsId(BoxDataID)) {
+		Set BoxData = ##class(DS.Prod.OptiBox.BoxData).%OpenId(BoxDataID)
+	} Else {
+		#dim Logger = ##class(vhLib.Logger).%New("VH doos service").ErrorMail("Geen boxdata gevonden voor boxdataID: '"_BoxDataID_"'.")
+	}
+	
+	Set BasisDoos.Depth = BoxData.DiepteExec
+	Set BasisDoos.Height = BoxData.HoogteExec
+	Set BasisDoos.Width = BoxData.BreedteExec
+]]></Implementation>
+</Method>
+
+<Method name="VulAanVouwErrondDoosBuffer">
+<FormalSpec><![CDATA[&BasisDoos:APPS.Verpakking.VouwErrondDoosBuffer,BoxDataID:%String]]></FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	//Meta 485
+	
+	If (##class(DS.Prod.OptiBox.BoxData).%ExistsId(BoxDataID)) {
+		Set BoxData = ##class(DS.Prod.OptiBox.BoxData).%OpenId(BoxDataID)
+	} Else {
+		#dim Logger = ##class(vhLib.Logger).%New("VH doos service").ErrorMail("Geen boxdata gevonden voor boxdataID: '"_BoxDataID_"'.")
+	}
+	
+	Set BasisDoos.Depth = BoxData.DiepteExec
+	Set BasisDoos.Height = BoxData.HoogteExec
+	Set BasisDoos.Width = BoxData.BreedteExec
+	
+	Set BasisDoos.FS = $Select($D(BoxData.Params.GetAt("FS")): BoxData.Params.GetAt("FS").WaardeExec, 1: BasisDoos.FS)
+	Set BasisDoos.LS = $Select($D(BoxData.Params.GetAt("LS")): BoxData.Params.GetAt("LS").WaardeExec, 1: BasisDoos.LS)
+	Set BasisDoos.LT = $Select($D(BoxData.Params.GetAt("LT")): BoxData.Params.GetAt("LT").WaardeExec, 1: BasisDoos.LT)
+	Set BasisDoos.RS = $Select($D(BoxData.Params.GetAt("RS")): BoxData.Params.GetAt("RS").WaardeExec, 1: BasisDoos.RS)
+	Set BasisDoos.RT = $Select($D(BoxData.Params.GetAt("RT")): BoxData.Params.GetAt("RT").WaardeExec, 1: BasisDoos.RT)
+	
+	Set Param = ##class(APPS.Verpakking.Doos.Param).%New()
+	Set Param.Key = $Select(..MachineTechnologie = ##class(APPS.Verpakking.enu.MachineTechnologie).Panotec():"1", 1: "LT")
+	Set Param.Value = BasisDoos.LT
+	Do BasisDoos.Params.Insert(Param)
+	
+	Set Param = ##class(APPS.Verpakking.Doos.Param).%New()
+	Set Param.Key = $Select(..MachineTechnologie = ##class(APPS.Verpakking.enu.MachineTechnologie).Panotec():"2", 1: "LS")
+	Set Param.Value = BasisDoos.LS
+	Do BasisDoos.Params.Insert(Param)
+	
+	Set Param = ##class(APPS.Verpakking.Doos.Param).%New()
+	Set Param.Key = $Select(..MachineTechnologie = ##class(APPS.Verpakking.enu.MachineTechnologie).Panotec():"3", 1: "RT")
+	Set Param.Value = BasisDoos.RT
+	Do BasisDoos.Params.Insert(Param)
+	
+	Set Param = ##class(APPS.Verpakking.Doos.Param).%New()
+	Set Param.Key = $Select(..MachineTechnologie = ##class(APPS.Verpakking.enu.MachineTechnologie).Panotec():"4", 1: "RS")
+	Set Param.Value = BasisDoos.RS
+	Do BasisDoos.Params.Insert(Param)
+	
+	Set Param = ##class(APPS.Verpakking.Doos.Param).%New()
+	Set Param.Key = $Select(..MachineTechnologie = ##class(APPS.Verpakking.enu.MachineTechnologie).Panotec():"5", 1: "FS")
+	Set Param.Value = BasisDoos.FS
+	Do BasisDoos.Params.Insert(Param)
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhTest/Mock/APPS/Verpakking/Optimizer.cls.xml
===================================================================
diff -u -r68405 -r69601
--- vhTest/Mock/APPS/Verpakking/Optimizer.cls.xml	(.../Optimizer.cls.xml)	(revision 68405)
+++ vhTest/Mock/APPS/Verpakking/Optimizer.cls.xml	(.../Optimizer.cls.xml)	(revision 69601)
@@ -9,8 +9,8 @@
 <Inheritance>right</Inheritance>
 
 <Method name="Optimize">
-<FormalSpec><![CDATA[&BasisDoos:APPS.Verpakking.Doos,ProductGroep:%String]]></FormalSpec>
-<Implementation><![CDATA[	do ..VerwerkMethodCall("Optimize",.BasisDoos,ProductGroep)
+<FormalSpec><![CDATA[&BasisDoos:APPS.Verpakking.Doos,ProductGroep:%String,MachineTechnologie:APPS.Verpakking.enu.MachineTechnologie]]></FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("Optimize",.BasisDoos,ProductGroep,MachineTechnologie)
 ]]></Implementation>
 </Method>
 </Class>