Index: APPS/Halux/common/BatchService.cls.xml
===================================================================
diff -u -r954 -r994
--- APPS/Halux/common/BatchService.cls.xml	(.../BatchService.cls.xml)	(revision 954)
+++ APPS/Halux/common/BatchService.cls.xml	(.../BatchService.cls.xml)	(revision 994)
@@ -1,39 +1,74 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-03-24 11:13:21">
+<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-04-07 10:09:29">
 <Class name="APPS.Halux.common.BatchService">
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject</Super>
-<TimeChanged>62174,40487.602047</TimeChanged>
+<TimeChanged>62188,36577.268402</TimeChanged>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Method name="GeefBatch">
 <FormalSpec>BatchID:%Integer</FormalSpec>
 <ReturnType>APPS.Halux.common.Batch</ReturnType>
-<Implementation><![CDATA[	Quit ##class(APPS.Halux.common.impl.BatchImpl).%New(BatchID)
+<Implementation><![CDATA[	Quit ##class(APPS.Halux.common.impl.BatchImpl).%OpenId(BatchID)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefNieuweBatch">
 <Description>
 Toeleveringen van het type DOM.LEV.Toelevering</Description>
-<FormalSpec>Toeleveringen:%ListOfObjects</FormalSpec>
+<FormalSpec>Toeleveringen:%ListOfObjects="",Lijn:APPS.Halux.common.enu.ProductieLijn=""</FormalSpec>
 <ReturnType>APPS.Halux.common.Batch</ReturnType>
 <Implementation><![CDATA[
-	Set Batch = ##class(APPS.Halux.common.impl.BatchImpl).%New()
+	If ('$IsObject(Toeleveringen)) { Set Toeleveringen = ##class(%ListOfObjects).%New() }
+	
+	Set Batch = ##class(APPS.Halux.common.impl.BatchImpl).%New(Lijn)
 	Set Iterator = ##class(TECH.ListIterator).%New(Toeleveringen)
+	
+	Set MaakBatchErrorLijst = ##class(%ListOfObjects).%New()
+	
+	Set Iterator = ##class(TECH.ListIterator).%New(Toeleveringen)
 	While (Iterator.HasNext())
 	{
 		Set Toelevering = Iterator.Next()
+		Set $ZTRAP = "ErrorToevoegen"
 		Do Batch.VoegToeToelevering(Toelevering)
+		Set $ZTRAP = ""
+		Continue
+ErrorToevoegen
+		Set $ZTRAP = ""
+		Set Exception = ##class(TECH.ExceptionHandler).Catch("APPS.Halux.common.impl.ToeleveringException")
+		Do MaakBatchErrorLijst.Insert(Exception.BatchError)
 	}
+	
+	If (MaakBatchErrorLijst.Count() > 0)
+	{
+		Do ##class(TECH.ExceptionHandler).Throw(##class(APPS.Halux.common.impl.MaakBatchException).%New(MaakBatchErrorLijst))
+	}
+	
 	Quit Batch
 ]]></Implementation>
 </Method>
 
+<Method name="GeefActieveBatchIterator">
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[
+	Set BatchLijst = ##class(%ListOfObjects).%New()
+	Set ResultSet = ##class(%ResultSet).%New()
+	Do ResultSet.Prepare("SELECT ID FROM APPS_Halux_common_impl.BatchImpl WHERE IsActief = 1")
+	Do ResultSet.Execute()
+	While (ResultSet.Next())
+	{
+		Set Batch = ..GeefBatch(ResultSet.Data("ID"))
+		Do BatchLijst.Insert(Batch)
+	}
+	Quit ##class(TECH.ListIterator).%New(BatchLijst)
+]]></Implementation>
+</Method>
+
 <Method name="VerwijderBatch">
 <FormalSpec>BatchID:%Integer</FormalSpec>
 <ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[	Quit ##class(DS.PPS.TBX.Batch).%DeleteId(BatchID)
+<Implementation><![CDATA[	Quit ##class(APPS.Halux.common.impl.BatchImpl).%DeleteId(BatchID)
 ]]></Implementation>
 </Method>
 
@@ -43,26 +78,16 @@
 <FormalSpec>Toelevering:DOM.LEV.Toelevering</FormalSpec>
 <ReturnType>APPS.Halux.common.Batch</ReturnType>
 <Implementation><![CDATA[
-	Set GevondenBatch = ""
-	Set ResultSet=##class(%ResultSet).%New()
-	Do ResultSet.Prepare("SELECT ID FROM PPS.Batch")
-	Do ResultSet.Execute()
-	While ((GevondenBatch = "") && ResultSet.Next()) {
-		Set ID = ResultSet.Data("ID")
-		Set Batch = ##class(DS.PPS.TBX.Batch).%OpenId(ID)
-		Set i = 0
-		While ((GevondenBatch = "") && (i < Batch.Toeleveringen.Count()))
-		{
-			Set i = i + 1
-			If ($Piece(Batch.Toeleveringen.GetAt(i).Toelevering,"||",2) = Toelevering.GeefToeNr())
-			{
-				Set GevondenBatch = ..GeefBatch(Batch.%Id())
-			}
-		}
+	Set Batch = ""
+	Set ToeleveringNummer = Toelevering.GeefToeNr()
+	&SQL(SELECT BatchImpl Into :BatchID FROM APPS_Halux_common_impl.BatchImpl_Toeleveringen WHERE element_key = :ToeleveringNummer)
+	If ($Get(BatchID))
+	{
+		Set Batch = ##class(APPS.Halux.common.impl.BatchImpl).%OpenId(BatchID)
 	}
-	Quit GevondenBatch
+	Quit Batch
 ]]></Implementation>
 </Method>
 </Class>
-<Checksum value="4001108744"/>
+<Checksum value="3433110843"/>
 </Export>