Index: APPS/Halux/PPS/impl/PalletIDBepaler.cls.xml
===================================================================
diff -u -r72799 -r73169
--- APPS/Halux/PPS/impl/PalletIDBepaler.cls.xml	(.../PalletIDBepaler.cls.xml)	(revision 72799)
+++ APPS/Halux/PPS/impl/PalletIDBepaler.cls.xml	(.../PalletIDBepaler.cls.xml)	(revision 73169)
@@ -8,36 +8,18 @@
 <Private>1</Private>
 </Property>
 
-<Property name="DnaCodeRepository">
-<Type>DOM.Halux.AAP.DnaCodeRepository</Type>
+<Property name="PalletIDBepalerHelper">
+<Type>APPS.Halux.PPS.impl.PalletIDBepaler.PalletIDBepalerHelper</Type>
 <Private>1</Private>
 </Property>
 
-<Property name="DateTimeApi">
-<Type>TECH.DateTime.DateTimeAPI</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="KlantInstellingenRepository">
-<Type>DOM.Halux.AAP.KlantinstellingenRepository</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="ConfiguratorService">
-<Type>APPS.VKP.Maatwerk.impl.ConfiguratorService</Type>
-<Private>1</Private>
-</Property>
-
 <Method name="%OnNew">
-<FormalSpec>DnaCodeRepository:DOM.Halux.AAP.DnaCodeRepository="",DateTimeApi:TECH.DateTime.DateTimeAPI="",ConfiguratorService:APPS.VKP.Maatwerk.impl.ConfiguratorService="",KlantInstellingenRepository:DOM.Halux.AAP.KlantinstellingenRepository=""</FormalSpec>
+<FormalSpec>PalletIDBepalerHelper:APPS.Halux.PPS.impl.PalletIDBepaler.PalletIDBepalerHelper=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	Set ..DnaCodeRepository = $$$Inject(DnaCodeRepository, ##class(DOM.Halux.AAP.DnaCodeRepository).%New())
-	Set ..DateTimeApi = $$$Inject(DateTimeApi, ##class(TECH.DateTime.impl.DateTimeAPI).%New())
-	Set ..ConfiguratorService = $$$Inject(ConfiguratorService, ##class(APPS.VKP.Maatwerk.impl.ConfiguratorService).%New())
-	Set ..KlantInstellingenRepository = $$$Inject(KlantInstellingenRepository, ##class(DOM.Halux.AAP.KlantinstellingenRepository).%New())
+	Set ..PalletIDBepalerHelper = $$$Inject(PalletIDBepalerHelper, ##class(APPS.Halux.PPS.impl.PalletIDBepaler.PalletIDBepalerHelper).%New())
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -52,7 +34,7 @@
 	#dim PalletNr As %Integer
 	#dim NieuwePalletCode As %String
 	
-	If (..GeefVerpakkingTypeVanProduct(ProductNummer) = "Probox") {
+	If (..PalletIDBepalerHelper.GeefVerpakkingTypeVanProduct(ProductNummer) = "Probox") {
 		Set NieuwePalletCode = ..GeefPalletCodeVoorProbox(Type, ToeleveringId, $$$LengteBarcode)
 	} Else {
 		Set PalletNr = ..GeefVolgendPalletNr()
@@ -69,11 +51,10 @@
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	
-	#dim LaatstGescandePalletCode = ..GeefPalletCodeVanLaatstGescandeLade(ToeleveringId)
+	#dim LaatstGescandePalletCode = ..PalletIDBepalerHelper.GeefPalletCodeVanLaatstGescandeLade(ToeleveringId)
 	#dim NieuwePalletCode As %String
 	
-	#dim Suffix As %String = ..GeefSuffixVoorPalletCode(ToeleveringId, LaatstGescandePalletCode)
+	#dim Suffix As %String = ..PalletIDBepalerHelper.GeefSuffixVoorPalletCode(ToeleveringId, LaatstGescandePalletCode)
 	If (Suffix = "A") {
 		#dim PalletNr As %Integer = ..GeefVolgendPalletNr()
 		Do ..Verwerk(Type)
@@ -86,73 +67,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefSuffixVoorPalletCode">
-<FormalSpec>ToeleveringId:%String,LaatstGescandePalletCode:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[
-	#dim DnaCodeIterator As TECH.Iterator = ..DnaCodeRepository.ZoekViaToeleveringIdEnRecent(ToeleveringId)
-	#dim IsKlantVoorHalvePallet As %Boolean = $$$False
-	
-	If DnaCodeIterator.HasNext() {
-		#dim KlantId As %String = DnaCodeIterator.Next().KlantNummer
-		#dim KlantInstellingenIterator As TECH.Iterator = ..KlantInstellingenRepository.ZoekViaKlantId(KlantId)
-		
-		If KlantInstellingenIterator.HasNext() {
-			Set IsKlantVoorHalvePallet = KlantInstellingenIterator.Next().HalvePallet
-		}
-	}
-	// Do DnaCodeIterator.Reset()
-	
-	#dim Suffix As %String
-	If IsKlantVoorHalvePallet || (LaatstGescandePalletCode = "") || ($Extract(LaatstGescandePalletCode, 9, 9) = "B") {
-		Set Suffix = "A"
-	} Else {
-		Set Suffix = "B"
-	}
-	
-	Quit Suffix
-]]></Implementation>
-</Method>
-
-<Method name="GeefPalletCodeVanLaatstGescandeLade">
-<FormalSpec>ToeleveringId:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	#dim DnaCodeIterator As TECH.Iterator = ..DnaCodeRepository.ZoekViaToeleveringIdEnRecent(ToeleveringId)
-	#dim LaatsteScanTijdstip As %Integer = "1,1"
-	#dim PalletCodeLaatstGescandeLade As %String = ""
-	
-	While DnaCodeIterator.HasNext() {
-		#dim DnaCode As DOM.Halux.AAP.DnaCode = DnaCodeIterator.Next()
-		
-		If ($$$Not(DnaCode.ScanTijdstip = "") && ..DateTimeApi.HorologIsGroterDan(DnaCode.ScanTijdstip, LaatsteScanTijdstip)) {
-			Set LaatsteScanTijdstip = DnaCode.ScanTijdstip
-			Set PalletCodeLaatstGescandeLade = DnaCode.PalletCode
-		}
-	}
-	// Do DnaCodeIterator.Reset()
-	
-	Quit PalletCodeLaatstGescandeLade
-]]></Implementation>
-</Method>
-
-<Method name="GeefVerpakkingTypeVanProduct">
-<FormalSpec>ProductNummer:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	#dim VerpakkingType As %String = ""
-	Try {
-		#dim IngegevenKenmerken As APPS.PM.Maatwerk.dto.IngegevenKenmerken = ..ConfiguratorService.GeefOnverwerkteKenmerkenVanProduct(ProductNummer)
-		Set VerpakkingType = IngegevenKenmerken.VerpakkingType
-	} Catch {}
-	
-	Quit VerpakkingType
-]]></Implementation>
-</Method>
-
 <Method name="GeefVolgendPalletNr">
 <Private>1</Private>
 <ReturnType>%Integer</ReturnType>