Index: APPS/Halux/PPS/Document/impl/LBX/BatchNaarObjective.cls.xml
===================================================================
diff -u -r71355 -r71362
--- APPS/Halux/PPS/Document/impl/LBX/BatchNaarObjective.cls.xml	(.../BatchNaarObjective.cls.xml)	(revision 71355)
+++ APPS/Halux/PPS/Document/impl/LBX/BatchNaarObjective.cls.xml	(.../BatchNaarObjective.cls.xml)	(revision 71362)
@@ -8,26 +8,19 @@
 <Private>1</Private>
 </Property>
 
-<Property name="OrderApi">
-<Type>DOM.VKP.OrderAPI</Type>
-<Private>1</Private>
+<Property name="BatchNaarObjectiveDataGenerator">
+<Type>APPS.Halux.PPS.Document.impl.LBX.BatchNaarObjective.BatchNaarObjectiveDataGenerator</Type>
 </Property>
 
-<Property name="PartijApi">
-<Type>DOM.PARTIJ.PartijAPI</Type>
-<Private>1</Private>
-</Property>
-
 <Method name="%OnNew">
-<FormalSpec>ToeleveringApi:DOM.AKP.ToeleveringAPI="",OrderApi:DOM.VKP.OrderAPI="",PartijApi:DOM.PARTIJ.PartijAPI=""</FormalSpec>
+<FormalSpec>ToeleveringApi:DOM.AKP.ToeleveringAPI="",BatchNaarObjectiveDataGenerator:APPS.Halux.PPS.Document.impl.LBX.BatchNaarObjective.BatchNaarObjectiveDataGenerator=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..ToeleveringApi = $$$Inject(ToeleveringApi,##class(DOM.DomeinContext).Instance().GeefToeleveringAPI())
-	Set ..OrderApi = $$$Inject(OrderApi, ##class(DOM.VKP.impl.DataM.DataMOrderAPI).%New())
-	Set ..PartijApi = $$$Inject(PartijApi, ##class(DOM.DomeinContext).Instance().GeefPartijAPI())
+	Set ..BatchNaarObjectiveDataGenerator = $$$Inject(BatchNaarObjectiveDataGenerator, ##class(APPS.Halux.PPS.Document.impl.LBX.BatchNaarObjective.BatchNaarObjectiveDataGenerator).%New())
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -58,10 +51,11 @@
 		#dim BatchId As %String  = UitvoeringInfoLijst.GetAt(1).BatchID
 		#dim Batch As APPS.Halux.common.Batch  = ##class(APPS.ApplicatieContext).Instance().GeefProductieAPI().GeefBatchService().GeefBatch(BatchId)
 		#dim ToeleveringenIterator As TECH.Iterator = Batch.GeefToeleveringIterator()
+		
 		If (..IsActiefVoorMES(Batch.GeefLijn())) {
 			While ToeleveringenIterator.HasNext() {
 				#dim Toelevering As DOM.AKP.Toelevering = ..ToeleveringApi.GeefToelevering(ToeleveringenIterator.Next().GeefID())
-				#dim BatchData As APPS.Halux.PPS.Document.impl.LBX.BatchNaarObjective.dto.BatchNaarObjectiveData = ..GeefDataVoorUitvoeringInfo(Batch, Toelevering)
+				#dim BatchData As APPS.Halux.PPS.Document.impl.LBX.BatchNaarObjective.dto.BatchNaarObjectiveData = ..BatchNaarObjectiveDataGenerator.GenereerBatchDataVoorToelevering(Batch, Toelevering)
 				Do BatchDataLijst.Insert(BatchData)
 			}	
 		}	
@@ -89,42 +83,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefDataVoorUitvoeringInfo">
-<FormalSpec>Batch:APPS.Halux.common.Batch,Toelevering:DOM.AKP.Toelevering</FormalSpec>
-<Private>1</Private>
-<ReturnType>APPS.Halux.PPS.Document.impl.LBX.BatchNaarObjective.dto.BatchNaarObjectiveData</ReturnType>
-<Implementation><![CDATA[
-	Set BatchNaarObjectiveData = ##class(APPS.Halux.PPS.Document.impl.LBX.BatchNaarObjective.dto.BatchNaarObjectiveData).%New()
-	
-	Set BatchNaarObjectiveData.Id = Toelevering.GeefID()
-	Set BatchNaarObjectiveData.Omschrijving = "Productieorder gegenereerd vanuit Caché"
-	Set BatchNaarObjectiveData.ToeleveringId = Toelevering.GeefID()
-	Set BatchNaarObjectiveData.BatchId = Batch.GeefID()
-	Set BatchNaarObjectiveData.ProductieLijn = Batch.GeefLijn()
-	Set BatchNaarObjectiveData.AantalLades = Toelevering.GeefAantalProducten()
-	Set BatchNaarObjectiveData.DueBefore = ..FormateerHorolog(Toelevering.GeefDueOutTime())
-	Set BatchNaarObjectiveData.DueOut = ..FormateerHorolog(Toelevering.GeefDueOutTime())
-	
-	#dim Order As DOM.VKP.Order = ..OrderApi.GeefOrder(Toelevering.GeefOrderID())
-	Set BatchNaarObjectiveData.VerkoopOrderId = Order.GeefAxSalesId()
-	
-
-	Set BatchNaarObjectiveData.OrderReferentie = Order.GeefOrderReferentie()
-	Set BatchNaarObjectiveData.CommisieReferentie = Order.GeefCommissieReferentie()
-	Set BatchNaarObjectiveData.Verzendwijze = $Piece(Order.GeefVerzendingWijze(), ";", 1)
-	
-	#dim Partij As DOM.PARTIJ.Partij = ..PartijApi.GeefPartij(Toelevering.GeefKlantID())
-	Set BatchNaarObjectiveData.KlantNaam = Partij.GeefNaam()
-	Set BatchNaarObjectiveData.KlantId = Toelevering.GeefKlantID()
-	
-	Set BatchNaarObjectiveData.ReceptNaam = "?"
-	Set BatchNaarObjectiveData.Rangorde = "?"
-	Set BatchNaarObjectiveData.KlantOrderId = "?"
-	
-	Quit BatchNaarObjectiveData
-]]></Implementation>
-</Method>
-
 <Method name="ExporteerDataNaarXmlDocument">
 <FormalSpec>BatchDataLijst:%ListOfObjects</FormalSpec>
 <Private>1</Private>
@@ -144,25 +102,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="FormateerHorolog">
-<FormalSpec>Horolog:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	#dim Timestamp As %String = ##class(TECH.DateTime).HorologToTimeStamp(Horolog)	
-	#dim Datum As %String = $Piece(Timestamp, " ", 1)
-	#dim Tijdstip As %String = $Piece(Timestamp, " ", 2)
-	
-	Quit Datum _ "T" _ Tijdstip _ "Z"
-]]></Implementation>
-</Method>
-
-<Method name="GeefRangorde">
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	// Uit pitchingtabel
-]]></Implementation>
-</Method>
-
 <Method name="GeefBestandVolledigeNaam">
 <FormalSpec>BatchId:%String,Index:%Integer,Extensie:TECH.String</FormalSpec>
 <Private>1</Private>