Index: WS/Prod/PanOpti/OptimizerBindingPanOptimizerWS.cls.xml
===================================================================
diff -u -r29059 -r29980
--- WS/Prod/PanOpti/OptimizerBindingPanOptimizerWS.cls.xml	(.../OptimizerBindingPanOptimizerWS.cls.xml)	(revision 29059)
+++ WS/Prod/PanOpti/OptimizerBindingPanOptimizerWS.cls.xml	(.../OptimizerBindingPanOptimizerWS.cls.xml)	(revision 29980)
@@ -3,7 +3,7 @@
 <Class name="WS.Prod.PanOpti.OptimizerBindingPanOptimizerWS">
 <ClassType/>
 <ProcedureBlock>0</ProcedureBlock>
-<Super>%SOAP.WebClient,WS.SOAPClientExt</Super>
+<Super>%SOAP.WebClient,WS.SOAPClientExt,APPS.Halux.PPS.Verpakking.OptimizeService</Super>
 <Inheritance>right</Inheritance>
 
 <Parameter name="LOCATION">
Index: APPS/Halux/PPS/Verpakking/impl/VerpakkingAPI.cls.xml
===================================================================
diff -u
--- APPS/Halux/PPS/Verpakking/impl/VerpakkingAPI.cls.xml	(revision 0)
+++ APPS/Halux/PPS/Verpakking/impl/VerpakkingAPI.cls.xml	(revision 29980)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.Halux.PPS.Verpakking.impl.VerpakkingAPI">
+<Super>TECH.RegisteredObject,APPS.Halux.PPS.Verpakking.VerpakkingAPI</Super>
+
+<Method name="GeefOptimizeService">
+<ReturnType>APPS.Halux.PPS.Verpakking.OptimizeService</ReturnType>
+<Implementation><![CDATA[	Quit ##class(WS.Prod.PanOpti.OptimizerBindingPanOptimizerWS).%New()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/ApplicatieContext.cls.xml
===================================================================
diff -u -r29059 -r29980
--- APPS/ApplicatieContext.cls.xml	(.../ApplicatieContext.cls.xml)	(revision 29059)
+++ APPS/ApplicatieContext.cls.xml	(.../ApplicatieContext.cls.xml)	(revision 29980)
@@ -97,6 +97,11 @@
 <Default>IngegevenKenmerkenTypeAPI</Default>
 </Parameter>
 
+<Parameter name="VerpakkingAPI">
+<Type>%String</Type>
+<Default>VerpakkingAPI</Default>
+</Parameter>
+
 <Method name="Instance">
 <ClassMethod>1</ClassMethod>
 <ReturnType>APPS.ApplicatieContext</ReturnType>
@@ -390,6 +395,23 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefVerpakkingAPI">
+<ReturnType>APPS.Halux.PPS.Verpakking.VerpakkingAPI</ReturnType>
+<Implementation><![CDATA[	Quit ..GeefAPIObject(..#IngegevenKenmerkenTypeAPI)
+]]></Implementation>
+</Method>
+
+<Method name="PushVerpakkingAPIClassName">
+<FormalSpec>Naam:%String</FormalSpec>
+<Implementation><![CDATA[	Do ..PushAPINaam(..#IngegevenKenmerkenTypeAPI,Naam)
+]]></Implementation>
+</Method>
+
+<Method name="PopVerpakkingAPIClassName">
+<Implementation><![CDATA[	Do ..PopAPINaam(..#IngegevenKenmerkenTypeAPI)
+]]></Implementation>
+</Method>
+
 <Method name="Reset">
 <Implementation><![CDATA[
 	Set APINamenIterator = ##class(TECH.ListIterator).%New(..APINamen)
@@ -412,6 +434,7 @@
 	Do ..PushKenmerkAPIClassName(##class(APPS.PM.impl.KenmerkAPI).%ClassName(1))
 	Do ..PushProductAPIClassName(##class(APPS.PM.impl.ProductAPI).%ClassName(1))
 	Do ..PushIngegevenKenmerkenTypeAPIClassName(##class(APPS.PM.Maatwerk.impl.IngegevenKenmerkenTypeAPI).%ClassName(1))
+	Do ..PushVerpakkingAPIClassName(##class(APPS.Halux.PPS.Verpakking.impl.VerpakkingAPI).%ClassName(1))
 ]]></Implementation>
 </Method>
 
Index: APPS/Halux/PPS/Verpakking/VerpakkingAPI.cls.xml
===================================================================
diff -u
--- APPS/Halux/PPS/Verpakking/VerpakkingAPI.cls.xml	(revision 0)
+++ APPS/Halux/PPS/Verpakking/VerpakkingAPI.cls.xml	(revision 29980)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.Halux.PPS.Verpakking.VerpakkingAPI">
+<Abstract>1</Abstract>
+<Super>TECH.Interface</Super>
+
+<Method name="GeefOptimizeService">
+<Abstract>1</Abstract>
+<ReturnType>APPS.Halux.PPS.Verpakking.OptimizeService</ReturnType>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/Halux/PPS/Verpakking/OptimizeService.cls.xml
===================================================================
diff -u
--- APPS/Halux/PPS/Verpakking/OptimizeService.cls.xml	(revision 0)
+++ APPS/Halux/PPS/Verpakking/OptimizeService.cls.xml	(revision 29980)
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.Halux.PPS.Verpakking.OptimizeService">
+<Abstract>1</Abstract>
+<Super>TECH.Interface</Super>
+
+<Method name="PeekServer">
+<Abstract>1</Abstract>
+<ReturnType>%String</ReturnType>
+</Method>
+
+<Method name="AreYouAlive">
+<Abstract>1</Abstract>
+<ReturnType>%Boolean</ReturnType>
+</Method>
+
+<Method name="CancelCutting">
+<Abstract>1</Abstract>
+<FormalSpec>ID:%xsd.int</FormalSpec>
+<ReturnType>WS.Prod.PanOpti.q1.STATUSRES</ReturnType>
+</Method>
+
+<Method name="CancelOptimization">
+<Abstract>1</Abstract>
+<FormalSpec>ID:%xsd.int</FormalSpec>
+<ReturnType>WS.Prod.PanOpti.q1.STATUSRES</ReturnType>
+</Method>
+
+<Method name="GetCardboardsLoaded">
+<Description>
+D ##class(WS.Prod.PanOpti.OptimizerBindingPanOptimizerWS).%New().GetCardboardsLoaded()</Description>
+<Abstract>1</Abstract>
+</Method>
+
+<Method name="GetCuttings">
+<Abstract>1</Abstract>
+<ReturnType>%XML.DataSet</ReturnType>
+</Method>
+
+<Method name="GetHistCuttings">
+<Abstract>1</Abstract>
+<FormalSpec>StartDateTime:%TimeStamp</FormalSpec>
+<ReturnType>%XML.DataSet</ReturnType>
+</Method>
+
+<Method name="GetHistOptimizations">
+<Abstract>1</Abstract>
+<FormalSpec>StartDateTime:%TimeStamp</FormalSpec>
+<ReturnType>%XML.DataSet</ReturnType>
+</Method>
+
+<Method name="GetOptimizations">
+<Abstract>1</Abstract>
+<FormalSpec>QueuedOrHistorical:%xsd.short</FormalSpec>
+<ReturnType>%XML.DataSet</ReturnType>
+</Method>
+
+<Method name="GetProcesses">
+<Abstract>1</Abstract>
+<ReturnType>%XML.DataSet</ReturnType>
+</Method>
+
+<Method name="GetStatus">
+<Abstract>1</Abstract>
+<FormalSpec>Type:%String,ID:%xsd.int</FormalSpec>
+<ReturnType>WS.Prod.PanOpti.q1.STATUSRES</ReturnType>
+</Method>
+
+<Method name="OLDGetCardboardsLoaded">
+<Abstract>1</Abstract>
+<ReturnType>WS.Prod.PanOpti.q12.CARDBOARDSLOADED</ReturnType>
+</Method>
+
+<Method name="Optimize">
+<Abstract>1</Abstract>
+<FormalSpec>OptiRequest:WS.Prod.PanOpti.q1.OPTIREQ</FormalSpec>
+<ReturnType>WS.Prod.PanOpti.q1.OPTIRES</ReturnType>
+</Method>
+
+<Method name="QueueCutting">
+<Abstract>1</Abstract>
+<FormalSpec>CutRequest:WS.Prod.PanOpti.q1.CUTREQ</FormalSpec>
+<ReturnType>WS.Prod.PanOpti.q1.STATUSRES</ReturnType>
+</Method>
+
+<Method name="QueueOptimization">
+<Abstract>1</Abstract>
+<FormalSpec>Optimise:WS.Prod.PanOpti.q1.OPTIREQ</FormalSpec>
+<ReturnType>WS.Prod.PanOpti.q1.STATUSRES</ReturnType>
+</Method>
+
+<Method name="ReloadConfiguration">
+<Abstract>1</Abstract>
+</Method>
+
+<Method name="SimulateCutting">
+<Abstract>1</Abstract>
+<FormalSpec>CutRequest:WS.Prod.PanOpti.q1.CUTREQ</FormalSpec>
+<ReturnType>WS.Prod.PanOpti.q1.STATUSRES</ReturnType>
+</Method>
+</Class>
+
+
+</Export>
Index: BL/Prod/OptiBox/Diverse.cls.xml
===================================================================
diff -u -r29059 -r29980
--- BL/Prod/OptiBox/Diverse.cls.xml	(.../Diverse.cls.xml)	(revision 29059)
+++ BL/Prod/OptiBox/Diverse.cls.xml	(.../Diverse.cls.xml)	(revision 29980)
@@ -338,8 +338,8 @@
 <Implementation><![CDATA[
 	#dim IsAlive As %Boolean = $$$False
 
-	#dim OptimizerLocation As %String = ..GeefOptimizerLocation(OptiboxServer)
-	#dim wsOptimizer As WS.Prod.PanOpti.OptimizerBindingPanOptimizerWS = ##class(BL.Prod.OptiBox.Optimize).%New().GeefOptimizerWSClient(OptimizerLocation)
+	#dim OptimizerLocation As %String = ##class(BL.Prod.OptiBox.Optimize).GeefOptimizerLocation(OptiboxServer)
+	#dim wsOptimizer As WS.Prod.PanOpti.OptimizerBindingPanOptimizerWS = ##class(BL.Prod.OptiBox.Optimize).GeefOptimizerWSClient(OptimizerLocation)
 	Set wsOptimizer.Timeout=5
 
 	Try {
@@ -382,7 +382,7 @@
 <Implementation><![CDATA[
 	Set $ETRAP="Do ##class("_..%ClassName(1)_").TrapHandlerSoap()"
 	Set wsOptimizer=##class(WS.Prod.PanOpti.OptimizerBindingPanOptimizerWS).%New()
-	Do wsOptimizer.SetLocation(..GeefOptimizerLocation(OptiServer))
+	Do wsOptimizer.SetLocation(##class(BL.Prod.OptiBox.Optimize).GeefOptimizerLocation(OptiServer))
 
 	Quit wsOptimizer.AreYouAlive()
 ]]></Implementation>
@@ -396,22 +396,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefOptimizerLocation">
-<ClassMethod>1</ClassMethod>
-<FormalSpec>OptiboxServer:BL.Prod.OptiBox.enu.OptiServer</FormalSpec>
-<ProcedureBlock>1</ProcedureBlock>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	#dim OptimizerLocation As %String
-	If (OptiboxServer=##class(BL.Prod.OptiBox.enu.OptiServer).Big()) {
-		Set OptimizerLocation = ##class(TECH.Config.ConfigMgr).Instance().GetString("SOAPlib_OptiboxBIG_ServiceLocation")
-	}Else{
-		Set OptimizerLocation = ##class(TECH.Config.ConfigMgr).Instance().GetString("SOAPlib_OptiboxSMALL_ServiceLocation")
-	}
-	Quit OptimizerLocation
-]]></Implementation>
-</Method>
-
 <UDLText name="T">
 <Content><![CDATA[
 /*********************
Index: vhTest/Mock/APPS/Halux/PPS/Verpakking/VerpakkingAPI.cls.xml
===================================================================
diff -u
--- vhTest/Mock/APPS/Halux/PPS/Verpakking/VerpakkingAPI.cls.xml	(revision 0)
+++ vhTest/Mock/APPS/Halux/PPS/Verpakking/VerpakkingAPI.cls.xml	(revision 29980)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.APPS.Halux.PPS.Verpakking.VerpakkingAPI">
+<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>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>APPS.Halux.PPS.Verpakking.VerpakkingAPI,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="MockInstance">
+<ClassMethod>1</ClassMethod>
+<ReturnType>vhTest.Mock.APPS.Halux.PPS.Verpakking.VerpakkingAPI</ReturnType>
+<Implementation><![CDATA[
+	do ##class(APPS.ApplicatieContext).Instance().PushVerpakkingAPIClassName(##class(vhTest.Mock.APPS.Halux.PPS.Verpakking.VerpakkingAPI).%ClassName(1))
+	quit ##class(APPS.ApplicatieContext).Instance().GeefVerpakkingAPI()
+]]></Implementation>
+</Method>
+
+<Method name="GeefOptimizeService">
+<ReturnType>APPS.Halux.PPS.Verpakking.OptimizeService</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefOptimizeService")
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: BL/Prod/OptiBox/Optimize.cls.xml
===================================================================
diff -u -r29059 -r29980
--- BL/Prod/OptiBox/Optimize.cls.xml	(.../Optimize.cls.xml)	(revision 29059)
+++ BL/Prod/OptiBox/Optimize.cls.xml	(.../Optimize.cls.xml)	(revision 29980)
@@ -664,24 +664,41 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefOptimizerLocation">
+<Method name="GeefOptimizer">
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#dim OptiboxServer As BL.Prod.OptiBox.enu.OptiServer = ##class(BL.Prod.OptiBox.enu.OptiServer).SmallEnCuts()
 	If ..BigOptimisatie {
 		Set OptiboxServer = ##class(BL.Prod.OptiBox.enu.OptiServer).Big()
 	}
-	Quit ##class(BL.Prod.OptiBox.Diverse).GeefOptimizerLocation(OptiboxServer)
+	Quit ..GeefOptimizerLocation(OptiboxServer)
 ]]></Implementation>
 </Method>
 
+<Method name="GeefOptimizerLocation">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>OptiboxServer:BL.Prod.OptiBox.enu.OptiServer</FormalSpec>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim OptimizerLocation As %String
+	If (OptiboxServer=##class(BL.Prod.OptiBox.enu.OptiServer).Big()) {
+		Set OptimizerLocation = ##class(TECH.Config.ConfigMgr).Instance().GetString("SOAPlib_OptiboxBIG_ServiceLocation")
+	}Else{
+		Set OptimizerLocation = ##class(TECH.Config.ConfigMgr).Instance().GetString("SOAPlib_OptiboxSMALL_ServiceLocation")
+	}
+	Quit OptimizerLocation
+]]></Implementation>
+</Method>
+
 <Method name="GeefOptimizerWSClient">
+<ClassMethod>1</ClassMethod>
 <FormalSpec>OptimizerLocation:%String</FormalSpec>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>WS.Prod.PanOpti.OptimizerBindingPanOptimizerWS</ReturnType>
 <Implementation><![CDATA[
-	Set wsOptimizer=##class(WS.Prod.PanOpti.OptimizerBindingPanOptimizerWS).%New()
+	#dim wsOptimizer As APPS.Halux.PPS.Verpakking.OptimizeService = ##class(APPS.ApplicatieContext).Instance().GeefVerpakkingAPI().GeefOptimizeService()
     Do wsOptimizer.SetLocation(OptimizerLocation)
     
 	If $G(%blnProxy,..#UseProxy) {
@@ -697,7 +714,7 @@
 <ReturnType>WS.Prod.PanOpti.q1.STATUSRES</ReturnType>
 <Implementation><![CDATA[
 	Set:$G(InSync) ..BigOptimisatie=0
-	#dim OptimizerLocation As %String = ..GeefOptimizerLocation()
+	#dim OptimizerLocation As %String = ..GeefOptimizer()
 	#dim wsOptimizer As WS.Prod.PanOpti.OptimizerBindingPanOptimizerWS = ..GeefOptimizerWSClient(OptimizerLocation)
 	
 	; Controle of er iets de doen valt
Index: vhTest/Mock/APPS/Halux/PPS/Verpakking/OptimizeService.cls.xml
===================================================================
diff -u
--- vhTest/Mock/APPS/Halux/PPS/Verpakking/OptimizeService.cls.xml	(revision 0)
+++ vhTest/Mock/APPS/Halux/PPS/Verpakking/OptimizeService.cls.xml	(revision 29980)
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.APPS.Halux.PPS.Verpakking.OptimizeService">
+<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>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>APPS.Halux.PPS.Verpakking.OptimizeService,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="AreYouAlive">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("AreYouAlive")
+]]></Implementation>
+</Method>
+
+<Method name="CancelCutting">
+<FormalSpec>ID:%xsd.int</FormalSpec>
+<ReturnType>WS.Prod.PanOpti.q1.STATUSRES</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("CancelCutting",ID)
+]]></Implementation>
+</Method>
+
+<Method name="CancelOptimization">
+<FormalSpec>ID:%xsd.int</FormalSpec>
+<ReturnType>WS.Prod.PanOpti.q1.STATUSRES</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("CancelOptimization",ID)
+]]></Implementation>
+</Method>
+
+<Method name="GetCardboardsLoaded">
+<Implementation><![CDATA[	do ..VerwerkMethodCall("GetCardboardsLoaded")
+]]></Implementation>
+</Method>
+
+<Method name="GetCuttings">
+<ReturnType>%XML.DataSet</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GetCuttings")
+]]></Implementation>
+</Method>
+
+<Method name="GetHistCuttings">
+<FormalSpec>StartDateTime:%TimeStamp</FormalSpec>
+<ReturnType>%XML.DataSet</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GetHistCuttings",StartDateTime)
+]]></Implementation>
+</Method>
+
+<Method name="GetHistOptimizations">
+<FormalSpec>StartDateTime:%TimeStamp</FormalSpec>
+<ReturnType>%XML.DataSet</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GetHistOptimizations",StartDateTime)
+]]></Implementation>
+</Method>
+
+<Method name="GetOptimizations">
+<FormalSpec>QueuedOrHistorical:%xsd.short</FormalSpec>
+<ReturnType>%XML.DataSet</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GetOptimizations",QueuedOrHistorical)
+]]></Implementation>
+</Method>
+
+<Method name="GetProcesses">
+<ReturnType>%XML.DataSet</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GetProcesses")
+]]></Implementation>
+</Method>
+
+<Method name="GetStatus">
+<FormalSpec>Type:%String,ID:%xsd.int</FormalSpec>
+<ReturnType>WS.Prod.PanOpti.q1.STATUSRES</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GetStatus",Type,ID)
+]]></Implementation>
+</Method>
+
+<Method name="OLDGetCardboardsLoaded">
+<ReturnType>WS.Prod.PanOpti.q12.CARDBOARDSLOADED</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("OLDGetCardboardsLoaded")
+]]></Implementation>
+</Method>
+
+<Method name="Optimize">
+<FormalSpec>OptiRequest:WS.Prod.PanOpti.q1.OPTIREQ</FormalSpec>
+<ReturnType>WS.Prod.PanOpti.q1.OPTIRES</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("Optimize",OptiRequest)
+]]></Implementation>
+</Method>
+
+<Method name="PeekServer">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("PeekServer")
+]]></Implementation>
+</Method>
+
+<Method name="QueueCutting">
+<FormalSpec>CutRequest:WS.Prod.PanOpti.q1.CUTREQ</FormalSpec>
+<ReturnType>WS.Prod.PanOpti.q1.STATUSRES</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("QueueCutting",CutRequest)
+]]></Implementation>
+</Method>
+
+<Method name="QueueOptimization">
+<FormalSpec>Optimise:WS.Prod.PanOpti.q1.OPTIREQ</FormalSpec>
+<ReturnType>WS.Prod.PanOpti.q1.STATUSRES</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("QueueOptimization",Optimise)
+]]></Implementation>
+</Method>
+
+<Method name="ReloadConfiguration">
+<Implementation><![CDATA[	do ..VerwerkMethodCall("ReloadConfiguration")
+]]></Implementation>
+</Method>
+
+<Method name="SimulateCutting">
+<FormalSpec>CutRequest:WS.Prod.PanOpti.q1.CUTREQ</FormalSpec>
+<ReturnType>WS.Prod.PanOpti.q1.STATUSRES</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("SimulateCutting",CutRequest)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>