Index: vhTest/Fake/APPS/Halux/PPS/TAORProductie/impl/AssemblageKarRepository.cls.xml
===================================================================
diff -u -r29952 -r29957
--- vhTest/Fake/APPS/Halux/PPS/TAORProductie/impl/AssemblageKarRepository.cls.xml	(.../AssemblageKarRepository.cls.xml)	(revision 29952)
+++ vhTest/Fake/APPS/Halux/PPS/TAORProductie/impl/AssemblageKarRepository.cls.xml	(.../AssemblageKarRepository.cls.xml)	(revision 29957)
@@ -7,6 +7,11 @@
 <ProcedureBlock>1</ProcedureBlock>
 <Super>APPS.Halux.PPS.TAORProductie.impl.AssemblageKarRepository</Super>
 
+<Property name="BewaardeAssemblageKarren">
+<Type>APPS.Halux.PPS.TAORProductie.data.AssemblageKar</Type>
+<Collection>list</Collection>
+</Property>
+
 <Property name="AssemblageKar">
 <Type>APPS.Halux.PPS.TAORProductie.data.AssemblageKar</Type>
 <Private>1</Private>
@@ -17,6 +22,11 @@
 <InitialExpression>0</InitialExpression>
 </Property>
 
+<Property name="KarID">
+<Type>TECH.Integer</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="GeefKar">
 <FormalSpec>BatchID:TECH.String,SequentieNummer:TECH.Integer</FormalSpec>
 <ReturnType>APPS.Halux.PPS.TAORProductie.data.AssemblageKar</ReturnType>
@@ -26,7 +36,9 @@
 
 <Method name="GeefVolgendeKarID">
 <ReturnType>TECH.String</ReturnType>
-<Implementation><![CDATA[	Quit ""
+<Implementation><![CDATA[
+	Set ..KarID = ..KarID + 1
+	Quit ##class(TECH.StringUtils).AddLeadingChar(..KarID, "0", 4)
 ]]></Implementation>
 </Method>
 
@@ -94,7 +106,7 @@
 
 <Method name="Create">
 <ReturnType>APPS.Halux.PPS.TAORProductie.data.AssemblageKar</ReturnType>
-<Implementation><![CDATA[	Quit ""
+<Implementation><![CDATA[	Quit ##class(APPS.Halux.PPS.TAORProductie.data.AssemblageKar).%New()
 ]]></Implementation>
 </Method>
 
@@ -112,7 +124,8 @@
 
 <Method name="Save">
 <FormalSpec>AssemblageKar:APPS.Halux.PPS.TAORProductie.data.AssemblageKar</FormalSpec>
-<Implementation><![CDATA[]]></Implementation>
+<Implementation><![CDATA[	Do ..BewaardeAssemblageKarren.Insert(AssemblageKar)
+]]></Implementation>
 </Method>
 
 <Method name="%OnNew">
@@ -127,6 +140,7 @@
 	Set ..AssemblageKar.SequentieNummer = "58"
 	Set ..AssemblageKar.Kar = "3"
 	Set ..AssemblageKar.Vak = "18"
+	Set ..KarID = 0
 	Quit $$$OK
 ]]></Implementation>
 </Method>
Index: vhUnitTest/APPS/Halux/common/impl/ProductieSequentie/Taor/AssemblageKarGenerator/GenereerKarren/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/Halux/common/impl/ProductieSequentie/Taor/AssemblageKarGenerator/GenereerKarren/Test.cls.xml	(revision 0)
+++ vhUnitTest/APPS/Halux/common/impl/ProductieSequentie/Taor/AssemblageKarGenerator/GenereerKarren/Test.cls.xml	(revision 29957)
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.Halux.common.impl.ProductieSequentie.Taor.AssemblageKarGenerator.GenereerKarren.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Parameter name="BatchID">
+<Type>%String</Type>
+<Default>15000</Default>
+</Parameter>
+
+<Parameter name="AantalVakkenInKar">
+<Type>%Integer</Type>
+<Default>16</Default>
+</Parameter>
+
+<Property name="SequentieNr">
+<Type>TECH.Integer</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="Test">
+<Implementation><![CDATA[
+	Set SequentieItems = ##class(%ListOfObjects).%New()
+	#dim i As TECH.Integer
+	For i=1:1:30 {
+		Do SequentieItems.Insert(..GeefProductieSequentieItem())
+	}
+	
+	Set FakeAssemblageKarRepository = ##class(vhTest.Fake.APPS.Halux.PPS.TAORProductie.impl.AssemblageKarRepository).%New()
+	Set Generator = ##class(APPS.Halux.common.impl.ProductieSequentie.Taor.AssemblageKarGenerator).%New(FakeAssemblageKarRepository)
+	Do Generator.GenereerKarren(SequentieItems)
+	
+	#dim Karren As List of APPS.Halux.PPS.TAORProductie.data.AssemblageKar = FakeAssemblageKarRepository.BewaardeAssemblageKarren
+	If $$$AssertEquals(Karren.Count(),30) {
+		#dim AssemblageKar As APPS.Halux.PPS.TAORProductie.data.AssemblageKar
+		For i=1:1:..#AantalVakkenInKar {
+			Set AssemblageKar = Karren.GetAt(i)
+			Do $$$AssertEquals(AssemblageKar.BatchID,..#BatchID)
+			Do $$$AssertEquals(AssemblageKar.Kar,"0001")
+			Do $$$AssertEquals(AssemblageKar.SequentieNummer,i)
+			Do $$$AssertEquals(AssemblageKar.Vak,i)
+		}
+		For i=17:1:30 {
+			Set AssemblageKar = Karren.GetAt(i)
+			Do $$$AssertEquals(AssemblageKar.BatchID,..#BatchID)
+			Do $$$AssertEquals(AssemblageKar.Kar,"0002")
+			Do $$$AssertEquals(AssemblageKar.SequentieNummer,i)
+			Do $$$AssertEquals(AssemblageKar.Vak,i-..#AantalVakkenInKar)
+		}
+	}
+]]></Implementation>
+</Method>
+
+<Method name="GeefProductieSequentieItem">
+<ReturnType>APPS.Halux.common.ProductieSequentieItem</ReturnType>
+<Implementation><![CDATA[
+	Set SequentieItem = ##class(APPS.Halux.common.ProductieSequentieItem).%New()
+	Set SequentieItem.BatchID = ..#BatchID
+	Set SequentieItem.SequentieNummer = ..SequentieNr
+	Set ..SequentieNr = ..SequentieNr + 1
+	Quit SequentieItem
+]]></Implementation>
+</Method>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestName)
+	Set ..SequentieNr = 1
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/Halux/common/impl/ProductieSequentie/Taor/AssemblageKarGenerator.cls.xml
===================================================================
diff -u
--- APPS/Halux/common/impl/ProductieSequentie/Taor/AssemblageKarGenerator.cls.xml	(revision 0)
+++ APPS/Halux/common/impl/ProductieSequentie/Taor/AssemblageKarGenerator.cls.xml	(revision 29957)
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.Halux.common.impl.ProductieSequentie.Taor.AssemblageKarGenerator">
+<Super>TECH.RegisteredObject</Super>
+
+<Parameter name="AantalVakkenInKar">
+<Type>%Integer</Type>
+<Default>16</Default>
+</Parameter>
+
+<Property name="AssemblageKarRepository">
+<Type>APPS.Halux.PPS.TAORProductie.impl.AssemblageKarRepository</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="KarID">
+<Type>TECH.String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="VakNr">
+<Type>TECH.Integer</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>AssemblageKarRepository:APPS.Halux.PPS.TAORProductie.impl.AssemblageKarRepository=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..AssemblageKarRepository = $$$Implementation(AssemblageKarRepository, ##class(APPS.Halux.PPS.TAORProductie.impl.AssemblageKarRepository).%New())
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="GenereerKarren">
+<FormalSpec>SequentieItems:%ListOfObjects(ELEMENTTYPE="APPS.Halux.common.ProductieSequentieItem")</FormalSpec>
+<Implementation><![CDATA[
+	Do ..InitNieuweKar()
+	Set ItemIterator = ##class(TECH.ListIterator).%New(SequentieItems)
+	While ItemIterator.HasNext() {
+		Do ..GenereerNieuweAssemblageKarKar(ItemIterator.Next())
+		Do:(..IsKarGevuld()) ..InitNieuweKar()
+	}
+]]></Implementation>
+</Method>
+
+<Method name="InitNieuweKar">
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set ..KarID = ..AssemblageKarRepository.GeefVolgendeKarID()
+	Set ..VakNr = 1
+]]></Implementation>
+</Method>
+
+<Method name="GenereerNieuweAssemblageKarKar">
+<FormalSpec>Item:APPS.Halux.common.ProductieSequentieItem</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim AssemblageKar As APPS.Halux.PPS.TAORProductie.data.AssemblageKar = ..AssemblageKarRepository.Create()
+	Set AssemblageKar.BatchID = Item.BatchID
+	Set AssemblageKar.SequentieNummer = Item.SequentieNummer
+	Set AssemblageKar.Kar = ..KarID
+	Set AssemblageKar.Vak = ..VakNr
+	Do ..AssemblageKarRepository.Save(AssemblageKar)
+	Set ..VakNr = ..VakNr+1
+]]></Implementation>
+</Method>
+
+<Method name="IsKarGevuld">
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ..VakNr > ..#AantalVakkenInKar
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/Halux/common/impl/ProductieSequentie/Taor.cls.xml
===================================================================
diff -u -r29955 -r29957
--- APPS/Halux/common/impl/ProductieSequentie/Taor.cls.xml	(.../Taor.cls.xml)	(revision 29955)
+++ APPS/Halux/common/impl/ProductieSequentie/Taor.cls.xml	(.../Taor.cls.xml)	(revision 29957)
@@ -3,13 +3,8 @@
 <Class name="APPS.Halux.common.impl.ProductieSequentie.Taor">
 <Super>APPS.Halux.common.impl.ProductieSequentie.Basis</Super>
 
-<Parameter name="AantalVakkenInKar">
-<Type>%Integer</Type>
-<Default>16</Default>
-</Parameter>
-
-<Property name="AssemblageKarRepository">
-<Type>APPS.Halux.PPS.TAORProductie.impl.AssemblageKarRepository</Type>
+<Property name="AssemblageKarGenerator">
+<Type>APPS.Halux.common.impl.ProductieSequentie.Taor.AssemblageKarGenerator</Type>
 <Private>1</Private>
 <Transient>1</Transient>
 </Property>
@@ -22,7 +17,7 @@
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Do ##super(Batch)
-	Set ..AssemblageKarRepository = ##class(APPS.Halux.PPS.TAORProductie.impl.AssemblageKarRepository).%New()
+	Set ..AssemblageKarGenerator = ##class(APPS.Halux.common.impl.ProductieSequentie.Taor.AssemblageKarGenerator).%New()
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -45,32 +40,10 @@
 <Method name="MaakStandaardSequentie">
 <Implementation><![CDATA[
 	Do ##super()
-	Do ..GenereerKarren(..SequentieItems)
+	Do ..AssemblageKarGenerator.GenereerKarren(..SequentieItems)
 ]]></Implementation>
 </Method>
 
-<Method name="GenereerKarren">
-<FormalSpec>SequentieItems:%ListOfObjects(ELEMENTTYPE="APPS.Halux.common.ProductieSequentieItem")</FormalSpec>
-<Implementation><![CDATA[
-	#dim KarID As TECH.Integer = ..AssemblageKarRepository.GeefVolgendeKarID()
-	#dim VakNr As TECH.Integer = 0
-	Set ItemIterator = ##class(TECH.ListIterator).%New(SequentieItems)
-	While ItemIterator.HasNext() {
-		#dim Item As APPS.Halux.common.ProductieSequentieItem = ItemIterator.Next()
-		#dim AssemblageKar As APPS.Halux.PPS.TAORProductie.data.AssemblageKar = ..AssemblageKarRepository.Create()
-		Set AssemblageKar.BatchID = Item.BatchID
-		Set AssemblageKar.SequentieNummer = Item.SequentieNummer
-		Set AssemblageKar.Kar = KarID
-		Set AssemblageKar.Vak = $Increment(VakNr)
-		Do ..AssemblageKarRepository.Save(AssemblageKar)
-		If AssemblageKar.Vak >= ..#AantalVakkenInKar {
-			Set KarID = ..AssemblageKarRepository.GeefVolgendeKarID()
-			Set VakNr = 0
-		}
-	}
-]]></Implementation>
-</Method>
-
 <Storage name="Default">
 <Type>%Library.CacheStorage</Type>
 </Storage>