Index: WSimpl/Halux/AAP/DnaCodeService.cls.xml
===================================================================
diff -u -r59797 -r59802
--- WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 59797)
+++ WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 59802)
@@ -38,8 +38,13 @@
 <Private>1</Private>
 </Property>
 
+<Property name="ProboxEtiketAfdrukkenHelper">
+<Type>WSimpl.Halux.AAP.DnaCodeService.ProboxEtiketAfdrukkenHelper</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>DnaCodeRepository:DOM.Halux.AAP.DnaCodeRepository="",PalletCodeValidator:WSimpl.Halux.AAP.DnaCodeService.PalletCodeValidator="",InventarisService:APPS.MAG.Inventaris.impl.InventarisService,DocsV1:BL.PPS.TBX.DocsV1="",QueryAPI:TECH.Query.QueryAPI</FormalSpec>
+<FormalSpec>DnaCodeRepository:DOM.Halux.AAP.DnaCodeRepository="",PalletCodeValidator:WSimpl.Halux.AAP.DnaCodeService.PalletCodeValidator="",InventarisService:APPS.MAG.Inventaris.impl.InventarisService,DocsV1:BL.PPS.TBX.DocsV1="",QueryAPI:TECH.Query.QueryAPI,ProboxEtiketAfdrukkenHelper:WSimpl.Halux.AAP.DnaCodeService.ProboxEtiketAfdrukkenHelper</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -51,6 +56,7 @@
 	Set ..InventarisService = $$$Inject(InventarisService, ##class(APPS.MAG.Inventaris.impl.InventarisService).%New())
 	Set ..DocsV1 = $$$Inject(DocsV1, ##class(BL.PPS.TBX.DocsV1).%New())
 	Set ..QueryAPI = $$$Inject(QueryAPI, ##class(TECH.Context).Instance().GeefQueryAPI())
+	Set ..ProboxEtiketAfdrukkenHelper = $$$Inject(ProboxEtiketAfdrukkenHelper, ##class(WSimpl.Halux.AAP.DnaCodeService.ProboxEtiketAfdrukkenHelper).%New())
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -464,11 +470,11 @@
 	Try {
 		Set Response = ##class(WS.Halux.AAP.ProboxEtiketAfdrukkenResponse).%New()
 		
-		#dim DnaCodeIterator As TECH.Iterator = ..MaakDnaCodeIteratorVanDnaCodeStringLijst(ProboxEtiketAfdrukkenRequest)
+		#dim DnaCodeIterator As TECH.Iterator = ..ProboxEtiketAfdrukkenHelper.MaakDnaCodeIteratorVanDnaCodeStringLijst(ProboxEtiketAfdrukkenRequest)
 		
 		#dim DnaCode As TECH.Iterator = DnaCodeIterator.Next()
 		Do DnaCodeIterator.Reset()
-		#dim TeGebruikenPrinter = ..MapProductieLijnOpPrinter(..GeefWerkpost(DnaCode))
+		#dim TeGebruikenPrinter = ..ProboxEtiketAfdrukkenHelper.MapProductieLijnOpPrinter(..ProboxEtiketAfdrukkenHelper.GeefWerkpost(DnaCode))
 		
 		If TeGebruikenPrinter = "" {
 			Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.GeneralErrorException).%New("Geen printer gevonden voor DnaCode '"_DnaCode.DnaCode_"'"))
@@ -485,84 +491,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="MaakDnaCodeIteratorVanDnaCodeStringLijst">
-<FormalSpec>ProboxEtiketAfdrukkenRequest:WS.Halux.AAP.ProboxEtiketAfdrukkenRequest</FormalSpec>
-<Private>1</Private>
-<ReturnType>TECH.Iterator</ReturnType>
-<Implementation><![CDATA[
-		#dim DnaCodeAsStringIterator As TECH.Iterator
-		Set DnaCodeAsStringIterator = ##class(TECH.ListIterator).%New(ProboxEtiketAfdrukkenRequest.DnaCodes)
-		
-		Quit:$$$Not(DnaCodeAsStringIterator.HasNext())
-		
-		#dim LijstMetDnaCodes = ##class(%ListOfDataTypes).%New()
-		#dim DnaCode As DOM.Halux.AAP.DnaCode
-		While DnaCodeAsStringIterator.HasNext() {
-			Set DnaCode = ..DnaCodeRepository.ZoekViaDnaCode(DnaCodeAsStringIterator.Next()).Next()
-			Do LijstMetDnaCodes.Insert(DnaCode)
-		}
-		
-		Quit ##class(TECH.ListIterator).%New(LijstMetDnaCodes)
-]]></Implementation>
-</Method>
-
-<Method name="MapProductieLijnOpPrinter">
-<FormalSpec>Werkpost:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	Quit:(Werkpost="TAO")||(Werkpost="TAX") "Halux_TaorMontage"
-	
-	#dim Productielijn As %String
-	Set Productielijn = ..VertaalWerkpostNaarResource(Werkpost)
-	Quit:Productielijn=##class(APPS.Halux.common.enu.ProductieLijn).Twee() "Halux_LadeAfw_L2"
-	Quit:Productielijn=##class(APPS.Halux.common.enu.ProductieLijn).Drie() "Halux_LadeAfw_L3"
-	Quit:Productielijn=##class(APPS.Halux.common.enu.ProductieLijn).Vier() "Halux_LadeAfw_L4"
-	
-	Quit "Bartender"
-]]></Implementation>
-</Method>
-
-<Method name="VertaalWerkpostNaarResource">
-<FormalSpec>Werkpost:APPS.Halux.common.enu.Werkpost</FormalSpec>
-<Private>1</Private>
-<ReturnType>APPS.Halux.common.enu.ProductieLijn</ReturnType>
-<Implementation><![CDATA[	Quit $CASE(Werkpost,"Z1":1,"Z2":2,"Z3":3,"P1":1,"P2":4,"LP1":1,"LP2":2,"LP3":3,:"")
-]]></Implementation>
-</Method>
-
-<Method name="GeefWerkpost">
-<FormalSpec>DnaCode:DOM.Halux.AAP.DnaCode</FormalSpec>
-<Private>1</Private>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	#dim Statement As %String = "SELECT top 1 Werkpost FROM APPS_VKP_Maatwerk_LadeRegistratie_impl.Registratie "
-	If $$$HasLength(DnaCode.Toelevering) {
-		Set Statement = Statement _ "where (prnr = ? and toeleveringid = ?) "
-	} Else {
-		Set Statement = Statement _ "where prnr = ? "
-	}
-	Set Statement = Statement _ "order by id desc "
-	
-	#dim Query As TECH.DynamicQuery
-	If $$$HasLength(DnaCode.Toelevering) {
-		Set Query = ##class(TECH.DynamicQuery).%New(Statement, $ListBuild(DnaCode.ProductNummer,  DnaCode.Toelevering))
-	} Else {
-		Set Query = ##class(TECH.DynamicQuery).%New(Statement, $ListBuild(DnaCode.ProductNummer))
-	}
-	#dim ResultSet As TECH.ResultSet = ..QueryAPI.GetResultSet(Query)
-	
-	#dim Werkpost As %String = ""
-	While (ResultSet.Next()) {
-		Set Werkpost = ResultSet.GetDataByName("Werkpost")
-	}
-	If Werkpost = "" {
-		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.DataNotFoundException).%New("Werkpost/Productielijn kon niet bepaald worden voor DnaCode '"_DnaCode.DnaCode_"'"))
-	}
-	Quit Werkpost
-]]></Implementation>
-</Method>
-
 <Method name="GeefPalletCodeVanDnaCode">
 <FormalSpec>DnaCode:%String</FormalSpec>
 <Private>1</Private>
Index: WSimpl/Halux/AAP/DnaCodeService/ProboxEtiketAfdrukkenHelper.cls.xml
===================================================================
diff -u -r59798 -r59802
--- WSimpl/Halux/AAP/DnaCodeService/ProboxEtiketAfdrukkenHelper.cls.xml	(.../ProboxEtiketAfdrukkenHelper.cls.xml)	(revision 59798)
+++ WSimpl/Halux/AAP/DnaCodeService/ProboxEtiketAfdrukkenHelper.cls.xml	(.../ProboxEtiketAfdrukkenHelper.cls.xml)	(revision 59802)
@@ -2,6 +2,104 @@
 <Export generator="Cache" version="24">
 <Class name="WSimpl.Halux.AAP.DnaCodeService.ProboxEtiketAfdrukkenHelper">
 <Super>TECH.RegisteredObject</Super>
+
+<Property name="DnaCodeRepository">
+<Type>DOM.Halux.AAP.DnaCodeRepository</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="QueryAPI">
+<Type>TECH.Query.QueryAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>DnaCodeRepository:DOM.Halux.AAP.DnaCodeRepository="",QueryAPI:TECH.Query.QueryAPI=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..DnaCodeRepository = $$$Inject(DnaCodeRepository, ##class(DOM.Halux.AAP.DnaCodeRepository).%New())
+	Set ..QueryAPI = $$$Inject(QueryAPI, ##class(TECH.Context).Instance().GeefQueryAPI())
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="MaakDnaCodeIteratorVanDnaCodeStringLijst">
+<FormalSpec>ProboxEtiketAfdrukkenRequest:WS.Halux.AAP.ProboxEtiketAfdrukkenRequest</FormalSpec>
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[
+		#dim DnaCodeAsStringIterator As TECH.Iterator
+		Set DnaCodeAsStringIterator = ##class(TECH.ListIterator).%New(ProboxEtiketAfdrukkenRequest.DnaCodes)
+		
+		Quit:$$$Not(DnaCodeAsStringIterator.HasNext())
+		
+		#dim LijstMetDnaCodes = ##class(%ListOfDataTypes).%New()
+		#dim DnaCode As DOM.Halux.AAP.DnaCode
+		While DnaCodeAsStringIterator.HasNext() {
+			Set DnaCode = ..DnaCodeRepository.ZoekViaDnaCode(DnaCodeAsStringIterator.Next()).Next()
+			Do LijstMetDnaCodes.Insert(DnaCode)
+		}
+		
+		Quit ##class(TECH.ListIterator).%New(LijstMetDnaCodes)
+]]></Implementation>
+</Method>
+
+<Method name="MapProductieLijnOpPrinter">
+<FormalSpec>Werkpost:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Quit:(Werkpost="TAO")||(Werkpost="TAX") "Halux_TaorMontage"
+	
+	#dim Productielijn As %String
+	Set Productielijn = ..VertaalWerkpostNaarResource(Werkpost)
+	Quit:Productielijn=##class(APPS.Halux.common.enu.ProductieLijn).Twee() "Halux_LadeAfw_L2"
+	Quit:Productielijn=##class(APPS.Halux.common.enu.ProductieLijn).Drie() "Halux_LadeAfw_L3"
+	Quit:Productielijn=##class(APPS.Halux.common.enu.ProductieLijn).Vier() "Halux_LadeAfw_L4"
+	
+	Quit "Bartender"
+]]></Implementation>
+</Method>
+
+<Method name="VertaalWerkpostNaarResource">
+<FormalSpec>Werkpost:APPS.Halux.common.enu.Werkpost</FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.Halux.common.enu.ProductieLijn</ReturnType>
+<Implementation><![CDATA[	Quit $CASE(Werkpost,"Z1":1,"Z2":2,"Z3":3,"P1":1,"P2":4,"LP1":1,"LP2":2,"LP3":3,:"")
+]]></Implementation>
+</Method>
+
+<Method name="GeefWerkpost">
+<FormalSpec>DnaCode:DOM.Halux.AAP.DnaCode</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim Statement As %String = "SELECT top 1 Werkpost FROM APPS_VKP_Maatwerk_LadeRegistratie_impl.Registratie "
+	If $$$HasLength(DnaCode.Toelevering) {
+		Set Statement = Statement _ "where (prnr = ? and toeleveringid = ?) "
+	} Else {
+		Set Statement = Statement _ "where prnr = ? "
+	}
+	Set Statement = Statement _ "order by id desc "
+	
+	#dim Query As TECH.DynamicQuery
+	If $$$HasLength(DnaCode.Toelevering) {
+		Set Query = ##class(TECH.DynamicQuery).%New(Statement, $ListBuild(DnaCode.ProductNummer,  DnaCode.Toelevering))
+	} Else {
+		Set Query = ##class(TECH.DynamicQuery).%New(Statement, $ListBuild(DnaCode.ProductNummer))
+	}
+	#dim ResultSet As TECH.ResultSet = ..QueryAPI.GetResultSet(Query)
+	
+	#dim Werkpost As %String = ""
+	While (ResultSet.Next()) {
+		Set Werkpost = ResultSet.GetDataByName("Werkpost")
+	}
+	If Werkpost = "" {
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.DataNotFoundException).%New("Werkpost/Productielijn kon niet bepaald worden voor DnaCode '"_DnaCode.DnaCode_"'"))
+	}
+	Quit Werkpost
+]]></Implementation>
+</Method>
 </Class>