Index: vhUnitTest/APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/RollenEnStuklijstOptiesGeneratorLbx/GenereerOptiesVoorLade/Test.cls.xml
===================================================================
diff -u -r74458 -r74472
--- vhUnitTest/APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/RollenEnStuklijstOptiesGeneratorLbx/GenereerOptiesVoorLade/Test.cls.xml	(.../Test.cls.xml)	(revision 74458)
+++ vhUnitTest/APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/RollenEnStuklijstOptiesGeneratorLbx/GenereerOptiesVoorLade/Test.cls.xml	(.../Test.cls.xml)	(revision 74472)
@@ -57,12 +57,8 @@
 	Set HalffabItemBoomMock = ##class(vhTest.Mock.DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom).%New()
 	Do HalffabItemBoomMock.VerwachtMethodCall("GeefAlleHalffabItemsIterator").DanReturn(HalffabItemsIterator)
 	
-	#dim BatchPitchExportedVolgnummer As %String = 100
-	Set BatchPitchExported = ##class(APPS.Halux.Planning.Pitching.BatchPitchExported).%New()
-	Set BatchPitchExported.Volgnummer = BatchPitchExportedVolgnummer
-	Set BatchPitchExported.LijnNummer = 1
-	#dim BatchPitchExportedLijst As %ListOfObjects = ##class(TECH.ListUtils).CreateListOfObjects(BatchPitchExported)
-	#dim BatchPitchExportedServiceMock As vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchExportedService = ..GeefBatchPitchExportedServiceMock(..#BatchId, BatchPitchExportedLijst)
+	Set BatchServiceMock = ##class(vhTest.Mock.APPS.Halux.common.BatchService).%New()
+	Do BatchServiceMock.VerwachtMethodCall("GeefLijn").DanReturn(1)
 	
 	Set ProductMock = ##class(vhTest.Mock.DOM.PM.MaatwerkProduct).%New()
 	Do ProductMock.VerwachtMethodCall("GeefIngegevenKenmerken").DanReturn(..LbxKenmerken)
@@ -74,7 +70,7 @@
 	Do ProductApiMock.VerwachtMethodCall("GeefIdentNummerVoorProductId", ..#HFProductId2).DanReturn(..#HFIdentnummer2)
 	
 	Set ..UitvoeringInfo.BatchID = ..#BatchId
-	Set Generator = ##class(APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.OptieGenerator.RollenEnStuklijstOptiesGenerator).%New(ProductApiMock, BatchPitchExportedServiceMock)
+	Set Generator = ##class(APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.OptieGenerator.RollenEnStuklijstOptiesGenerator).%New(ProductApiMock, BatchServiceMock)
 	#dim Resultaat As %ListOfObjects = Generator.GenereerOptiesVoorLade(, ..UitvoeringInfo)
 	
 	Do $$$AssertEquals(Resultaat.Size, 5)
@@ -87,7 +83,7 @@
 	Do HalffabItemBoomMock.Verifieer()
 	Do ProductMock.Verifieer()
 	Do ProductApiMock.Verifieer()
-	Do BatchPitchExportedServiceMock.Verifieer()
+	Do BatchServiceMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -106,12 +102,8 @@
 	Set HalffabItemBoomMock = ##class(vhTest.Mock.DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom).%New()
 	Do HalffabItemBoomMock.VerwachtMethodCall("GeefAlleHalffabItemsIterator").DanReturn(HalffabItemsIterator)
 	
-	#dim BatchPitchExportedVolgnummer As %String = 100
-	Set BatchPitchExported = ##class(APPS.Halux.Planning.Pitching.BatchPitchExported).%New()
-	Set BatchPitchExported.Volgnummer = BatchPitchExportedVolgnummer
-	Set BatchPitchExported.LijnNummer = 1
-	#dim BatchPitchExportedLijst As %ListOfObjects = ##class(TECH.ListUtils).CreateListOfObjects(BatchPitchExported)
-	#dim BatchPitchExportedServiceMock As vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchExportedService = ..GeefBatchPitchExportedServiceMock(..#BatchId, BatchPitchExportedLijst)
+	Set BatchServiceMock = ##class(vhTest.Mock.APPS.Halux.common.BatchService).%New()
+	Do BatchServiceMock.VerwachtMethodCall("GeefLijn").DanReturn(1)
 	
 	Set ProductMock = ##class(vhTest.Mock.DOM.PM.MaatwerkProduct).%New()
 	Do ProductMock.VerwachtMethodCall("GeefIngegevenKenmerken").DanReturn(LbxKenmerken)
@@ -122,7 +114,7 @@
 	Do ProductApiMock.VerwachtMethodCall("GeefIdentNummerVoorProductId", ..#HFProductId2).DanReturn(..#HFIdentnummer2)
 	
 	Set ..UitvoeringInfo.BatchID = ..#BatchId
-	Set Generator = ##class(APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.OptieGenerator.RollenEnStuklijstOptiesGenerator).%New(ProductApiMock, BatchPitchExportedServiceMock)
+	Set Generator = ##class(APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.OptieGenerator.RollenEnStuklijstOptiesGenerator).%New(ProductApiMock, BatchServiceMock)
 	#dim Resultaat As %ListOfObjects = Generator.GenereerOptiesVoorLade(, ..UitvoeringInfo)
 	
 	Do $$$AssertEquals(Resultaat.Size, 3)
@@ -133,7 +125,7 @@
 	Do HalffabItemBoomMock.Verifieer()
 	Do ProductMock.Verifieer()
 	Do ProductApiMock.Verifieer()
-	Do BatchPitchExportedServiceMock.Verifieer()
+	Do BatchServiceMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -148,12 +140,8 @@
 	Set HalffabItemBoomMock = ##class(vhTest.Mock.DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom).%New()
 	Do HalffabItemBoomMock.VerwachtMethodCall("GeefAlleHalffabItemsIterator").DanReturn(HalffabItemsIterator)
 	
-	#dim BatchPitchExportedVolgnummer As %String = 100
-	Set BatchPitchExported = ##class(APPS.Halux.Planning.Pitching.BatchPitchExported).%New()
-	Set BatchPitchExported.Volgnummer = BatchPitchExportedVolgnummer
-	Set BatchPitchExported.LijnNummer = 1
-	#dim BatchPitchExportedLijst As %ListOfObjects = ##class(TECH.ListUtils).CreateListOfObjects(BatchPitchExported)
-	#dim BatchPitchExportedServiceMock As vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchExportedService = ..GeefBatchPitchExportedServiceMock(..#BatchId, BatchPitchExportedLijst)
+	Set BatchServiceMock = ##class(vhTest.Mock.APPS.Halux.common.BatchService).%New()
+	Do BatchServiceMock.VerwachtMethodCall("GeefLijn").DanReturn(1)
 	
 	Set ProductMock = ##class(vhTest.Mock.DOM.PM.MaatwerkProduct).%New()
 	Do ProductMock.VerwachtMethodCall("GeefIngegevenKenmerken").DanReturn(..LbxKenmerken)
@@ -164,7 +152,7 @@
 	Do ProductApiMock.VerwachtMethodCall("GeefIdentNummerVoorProductId", ..#HFProductId1).ExactAantalKeer(0)
 	
 	Set ..UitvoeringInfo.BatchID = ..#BatchId
-	Set Generator = ##class(APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.OptieGenerator.RollenEnStuklijstOptiesGenerator).%New(ProductApiMock, BatchPitchExportedServiceMock)
+	Set Generator = ##class(APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.OptieGenerator.RollenEnStuklijstOptiesGenerator).%New(ProductApiMock, BatchServiceMock)
 	#dim Resultaat As %ListOfObjects = Generator.GenereerOptiesVoorLade(, ..UitvoeringInfo)
 	
 	Do $$$AssertEquals(Resultaat.Size, 1)
@@ -173,7 +161,7 @@
 	Do HalffabItemBoomMock.Verifieer()
 	Do ProductMock.Verifieer()
 	Do ProductApiMock.Verifieer()
-	Do BatchPitchExportedServiceMock.Verifieer()
+	Do BatchServiceMock.Verifieer()
 ]]></Implementation>
 </Method>
 
Index: APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/HoofdDataGenerator.cls.xml
===================================================================
diff -u -r74411 -r74472
--- APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/HoofdDataGenerator.cls.xml	(.../HoofdDataGenerator.cls.xml)	(revision 74411)
+++ APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/HoofdDataGenerator.cls.xml	(.../HoofdDataGenerator.cls.xml)	(revision 74472)
@@ -145,6 +145,7 @@
 	} Else {
 		Set TekstVelden.LeveradresDetails = LeverAdres.GeefStraat()_LeverAdres.GeefPostcode()_LeverAdres.GeefGemeente()
 		Set TekstVelden.LeveradresLand = LeverAdres.GeefLandNr()
+		Set TekstVelden.ProductieLijn = ..GeefWaardeOfNull(Batch.GeefLijn())
 	}
 	
 	Set TekstVelden.VerkoopOrderId = ..GeefWaardeOfNull(Order.GeefAxSalesId())
Index: APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/RollenEnStuklijstOptiesGenerator.cls.xml
===================================================================
diff -u -r74458 -r74472
--- APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/RollenEnStuklijstOptiesGenerator.cls.xml	(.../RollenEnStuklijstOptiesGenerator.cls.xml)	(revision 74458)
+++ APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/RollenEnStuklijstOptiesGenerator.cls.xml	(.../RollenEnStuklijstOptiesGenerator.cls.xml)	(revision 74472)
@@ -13,21 +13,21 @@
 <Private>1</Private>
 </Property>
 
-<Property name="BatchPitchExportedService">
-<Type>APPS.Halux.Planning.Pitching.impl.BatchPitchExportedService</Type>
+<Property name="BatchService">
+<Type>APPS.Halux.common.BatchService</Type>
 <Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>ProductApi:DOM.PM.ProductAPI="",BatchPitchExportedService:APPS.Halux.Planning.Pitching.impl.BatchPitchExportedService=""</FormalSpec>
+<FormalSpec>ProductApi:DOM.PM.ProductAPI="",BatchService:APPS.Halux.common.BatchService=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..ProductApi = $$$Inject(ProductApi, ##class(DOM.PM.impl.ProductAPI).%New())
 	Set ..OBJTIdentLookupService = ##class(APPS.Halux.PPS.Activiteit.impl.common.BatchNaarObjectiveIoCContainer).Instance().Resolve("OBJTIdentLookupService")
-	Set ..BatchPitchExportedService = $$$Inject(BatchPitchExportedService, ##class(APPS.Halux.PPS.Activiteit.impl.common.BatchNaarObjectiveIoCContainer).Instance().Resolve("BatchPitchExportedService"))
+	Set ..BatchService = $$$Implementation(BatchService,##class(APPS.ApplicatieContext).Instance().GeefProductieAPI().GeefBatchService())
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -48,7 +48,7 @@
 	#dim HalffabItemsIterator As TECH.Iterator = HalffabItemsBoom.GeefAlleHalffabItemsIterator()	
 	#dim Index As %Integer = 0
 	#dim StalenRugPRNr As %String = ""
-	#dim ProductieLijn As %String = ..GeefProductieLijn(UitvoeringInfo.BatchID)
+	#dim ProductieLijn As %String = ..BatchService.GeefBatch(UitvoeringInfo.BatchID).GeefLijn()
 	
 	While (HalffabItemsIterator.HasNext()) {
 		#dim HalffabItem As DOM.PM.Maatwerk.Calc.HF.IHalffabItem = HalffabItemsIterator.Next()
@@ -136,41 +136,18 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefProductieLijn">
-<FormalSpec>BatchId:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>%Integer</ReturnType>
-<Implementation><![CDATA[
-	#dim BatchPitchExported As APPS.Halux.Planning.Pitching.BatchPitchExported = ..GeefBatchPitchExported(BatchId)	
-	Quit BatchPitchExported.LijnNummer
-]]></Implementation>
-</Method>
-
-<Method name="GeefBatchPitchExported">
-<FormalSpec>BatchId:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>APPS.Halux.Planning.Pitching.BatchPitchExported</ReturnType>
-<Implementation><![CDATA[
-	#dim BatchPitchExported As APPS.Halux.Planning.Pitching.BatchPitchExported = ""
-	#dim BatchPitchExportedLijst As %ListOfObjects = ..BatchPitchExportedService.ZoekViaBatchId(BatchId)
-	
-	Set BatchPitchExported = BatchPitchExportedLijst.GetAt(1)
-	
-	Quit BatchPitchExported
-]]></Implementation>
-</Method>
-
 <Method name="GeefBackSteelIsFastMover">
 <FormalSpec>ProductieLijn:%String,StalenugPRNr:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 	#dim BackSteelIsFastMover As %Boolean = "false"
-	#dim FastMoversLijn3 As %ListOfDataTypes = ##class(TECH.ListUtils).ListbuildToList($LB(838846, 838847, 838828, 838309, 838843, 957546, 838175, 838310, 838841, 838311, 838137, 838308, 838176, 838134, 838820, 838845, 838174, 838135, 838155, 957560, 838177, 838178, 838848, 838156, 838152, 838132, 838158, 838167))
-	#dim FastMoversLijn4 As %ListOfDataTypes = ##class(TECH.ListUtils).ListbuildToList($LB(2617468, 2617474, 2617476, 2617633, 2617666, 2617669, 2617674, 2617675, 2617676, 2617677, 2617684, 2617708, 2617725, 2617732, 2617742, 2617743, 2617767, 2617784, 2617794, 2617795, 2617830, 2679620, 2679632, 2679643, 2679668, 2679694, 2679699, 2679711, 2679749, 2679755, 2679763, 2679808, 2679828, 2679838, 2679887, 2679892))
+	#dim OBJTIdentNummer As %String = ..OBJTIdentLookupService.GeefOBJTIdentNr(StalenugPRNr)
+	#dim FastMoversLijn3 As %ListOfDataTypes = ##class(TECH.ListUtils).ListbuildToList($LB("0.788.452.5", "0.833.870.2", "0.166.553.1", "0.585.633.3", "0.372.907.0", "0.986.893.7", "0.632.262.3", "0.818.036.9", "0.307.626.5", "0.847.520.9", "0.226.233.0", "0.502.802.7", "0.793.806.2", "0.161.642.4", "0.142.112.1", "0.740.335.8", "0.620.831.3", "0.179.970.9", "0.320.659.9", "0.354.585.3", "0.907.843.9", "0.968.828.6", "0.987.403.6", "0.374.201.1", "0.287.456.5", "0.133.392.4", "0.378.220.5", "0.525.681.1" ))
+	#dim FastMoversLijn4 As %ListOfDataTypes = ##class(TECH.ListUtils).ListbuildToList($LB("0.957.409.1", "0.183.856.4", "0.391.883.5", "0.778.613.9", "0.545.524.4", "0.143.454.6", "0.580.355.0", "0.703.636.9", "0.753.823.2", "0.134.492.2", "0.219.709.3", "0.845.170.2", "0.140.751.2", "0.819.552.5", "0.977.810.1", "0.684.269.9", "0.453.563.5", "0.685.176.1", "0.964.323.6", "0.302.969.4", "0.794.541.5", "0.397.417.8", "0.420.938.7", "0.229.006.8", "0.519.993.2", "0.401.991.9", "0.429.388.2", "0.122.225.7", "0.425.091.8", "0.540.005.2", "0.849.574.3", "0.614.985.3", "0.426.316.9", "0.404.347.5", "0.419.803.6", "0.651.790.5"))
 	
-	If ((ProductieLijn = ##class(APPS.Halux.common.enu.ProductieLijn).Drie() && ##class(TECH.ListUtils).Contains(FastMoversLijn3, StalenugPRNr)) 
-		|| (ProductieLijn = ##class(APPS.Halux.common.enu.ProductieLijn).Vier() && ##class(TECH.ListUtils).Contains(FastMoversLijn4, StalenugPRNr))) {
+	If ((ProductieLijn = ##class(APPS.Halux.common.enu.ProductieLijn).Drie() && ##class(TECH.ListUtils).Contains(FastMoversLijn3, OBJTIdentNummer)) 
+		|| (ProductieLijn = ##class(APPS.Halux.common.enu.ProductieLijn).Vier() && ##class(TECH.ListUtils).Contains(FastMoversLijn4, OBJTIdentNummer))) {
 		Set BackSteelIsFastMover = "true"
 	}