Index: APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/OrderOptiesGenerator.cls.xml
===================================================================
diff -u
--- APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/OrderOptiesGenerator.cls.xml	(revision 0)
+++ APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/OrderOptiesGenerator.cls.xml	(revision 71790)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.OptieGenerator.OrderOptiesGenerator">
+<Super>APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.OptieGenerator</Super>
+
+<Property name="OrderApi">
+<Type>DOM.VKP.OrderAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>OrderApi:DOM.VKP.OrderAPI=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..OrderApi = $$$Inject(OrderApi, ##class(DOM.VKP.impl.DataM.DataMOrderAPI).%New())
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="GenereerOptiesVoorLade">
+<FormalSpec>Toelevering:DOM.AKP.Toelevering,UitvoeringInfo:APPS.Halux.PPS.Activiteit.impl.common.dto.BatchNaarObjectiveUitvoeringInfo</FormalSpec>
+<ReturnType>%ListOfObjects</ReturnType>
+<Implementation><![CDATA[
+	Set Opties = ##class(%ListOfObjects).%New()
+	
+	#dim Order As DOM.VKP.Order = ..OrderApi.GeefOrder(Toelevering.GeefOrderID())	
+	Do Opties.Insert(..GeefOptieVoorLade(..PrependNul(UitvoeringInfo.SequentieNummerLade), "-Verkoopordernummer", Order.GeefAxSalesId()))
+	
+	Quit Opties
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/OrderOptiesGenerator/GenereerOptiesVoorLade/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/OrderOptiesGenerator/GenereerOptiesVoorLade/Test.cls.xml	(revision 0)
+++ vhUnitTest/APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/OrderOptiesGenerator/GenereerOptiesVoorLade/Test.cls.xml	(revision 71790)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.OptieGenerator.OrderOptiesGenerator.GenereerOptiesVoorLade.Test">
+<Super>vhUnitTest.APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.OptieGenerator.Base</Super>
+
+<Method name="Test: Standaard gedrag">
+<Implementation><![CDATA[
+	#dim AxSalesId As %String = "VO123456"
+	#dim SequentieNummerLade As %Integer = 2
+	#dim OrderId As %String = "111111"
+	
+	#dim UitvoeringInfo As APPS.Halux.PPS.Activiteit.impl.common.dto.BatchNaarObjectiveUitvoeringInfo = ..GeefUitvoeringInfo(SequentieNummerLade,"","")
+	
+	Set ToeleveringMock = ##class(vhTest.Mock.DOM.AKP.Toelevering).%New()
+	Do ToeleveringMock.VerwachtMethodCall("GeefOrderID").DanReturn(OrderId)
+	
+	#dim OrderMock As vhTest.Mock.DOM.VKP.Order = ##class(vhTest.Mock.DOM.VKP.Order).%New()
+	Do OrderMock.VerwachtMethodCall("GeefAxSalesId").ExactAantalKeer(1).DanReturn(AxSalesId)
+	
+	#dim OrderApiMock As vhTest.Mock.DOM.VKP.OrderAPI = ##class(vhTest.Mock.DOM.VKP.OrderAPI).%New()
+	Do OrderApiMock.VerwachtMethodCall("GeefOrder", OrderId).ExactAantalKeer(1).DanReturn(OrderMock)
+	
+	Set Generator = ##class(APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.OptieGenerator.OrderOptiesGenerator).%New(OrderApiMock)
+	#dim Resultaat As %ListOfObjects = Generator.GenereerOptiesVoorLade(ToeleveringMock, UitvoeringInfo)
+	
+	Do $$$AssertEquals(Resultaat.Size, 1)
+	
+	Do ..AssertOptie(Resultaat.GetAt(1), "LADE 00" _ SequentieNummerLade, "00" _ SequentieNummerLade _ "-Verkoopordernummer", AxSalesId)
+	
+	Do ToeleveringMock.Verifieer()
+	Do OrderMock.Verifieer()
+	Do OrderApiMock.Verifieer()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/BatchNaarObjectiveDataGenerator.cls.xml
===================================================================
diff -u -r71782 -r71790
--- APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/BatchNaarObjectiveDataGenerator.cls.xml	(.../BatchNaarObjectiveDataGenerator.cls.xml)	(revision 71782)
+++ APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/BatchNaarObjectiveDataGenerator.cls.xml	(.../BatchNaarObjectiveDataGenerator.cls.xml)	(revision 71790)
@@ -34,6 +34,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="OrderOptiesGenerator">
+<Type>APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.OptieGenerator.OrderOptiesGenerator</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
@@ -46,6 +51,7 @@
 	Set ..ProductOptiesGenerator = ##class(APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.OptieGenerator.ProductOptiesGenerator).%New()
 	Set ..IngegevenKenmerkenOptiesGenerator = ##class(APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.OptieGenerator.IngegevenKenmerkenOptiesGenerator).%New()
 	Set ..AlgemeneInfoOptiesGenerator = ##class(APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.OptieGenerator.AlgemeneInfoOptiesGenerator).%New()
+	Set ..OrderOptiesGenerator = ##class(APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.OptieGenerator.OrderOptiesGenerator).%New()
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -94,7 +100,8 @@
 	Do ##class(TECH.ListUtils).AppendList(Opties, ..GenereerProductOpties(Toelevering, UitvoeringInfo))
 	Do ##class(TECH.ListUtils).AppendList(Opties, ..GenereerRollenEnStuklijstOpties(Toelevering, UitvoeringInfo))
 	Do ##class(TECH.ListUtils).AppendList(Opties, ..GenereerAlgemeneKenmerkenOpties(Toelevering, UitvoeringInfo))
-	Do ##class(TECH.ListUtils).AppendList(Opties, ..GenereerIngegevenKenmerkenOpties(Toelevering, UitvoeringInfo))	
+	Do ##class(TECH.ListUtils).AppendList(Opties, ..GenereerIngegevenKenmerkenOpties(Toelevering, UitvoeringInfo))
+	Do ##class(TECH.ListUtils).AppendList(Opties, ..GenereerOrderOpties(Toelevering, UitvoeringInfo))
 	
 	Quit Opties
 ]]></Implementation>
@@ -128,6 +135,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GenereerOrderOpties">
+<FormalSpec>Toelevering:DOM.AKP.Toelevering,UitvoeringInfo:APPS.Halux.PPS.Activiteit.impl.common.dto.BatchNaarObjectiveUitvoeringInfo</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[	Quit ..OrderOptiesGenerator.GenereerOptiesVoorLade(Toelevering, UitvoeringInfo)
+]]></Implementation>
+</Method>
+
 <Method name="GenereerRollenEnStuklijstOpties">
 <Abstract>1</Abstract>
 <FormalSpec>Toelevering:DOM.AKP.Toelevering,UitvoeringInfo:APPS.Halux.PPS.Activiteit.impl.common.dto.BatchNaarObjectiveUitvoeringInfo</FormalSpec>