Index: APPS/Halux/PPS/impl/PalletIDBepaler.cls.xml
===================================================================
diff -u -r72483 -r72799
--- APPS/Halux/PPS/impl/PalletIDBepaler.cls.xml	(.../PalletIDBepaler.cls.xml)	(revision 72483)
+++ APPS/Halux/PPS/impl/PalletIDBepaler.cls.xml	(.../PalletIDBepaler.cls.xml)	(revision 72799)
@@ -18,95 +18,138 @@
 <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=""</FormalSpec>
+<FormalSpec>DnaCodeRepository:DOM.Halux.AAP.DnaCodeRepository="",DateTimeApi:TECH.DateTime.DateTimeAPI="",ConfiguratorService:APPS.VKP.Maatwerk.impl.ConfiguratorService="",KlantInstellingenRepository:DOM.Halux.AAP.KlantinstellingenRepository=""</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())
 	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="GeefNieuwPalletID">
-<FormalSpec>Type:BL.PPS.TBX.enu.PalletEtiketType,DnaCode:DOM.Halux.AAP.DnaCode=""</FormalSpec>
+<FormalSpec>Type:BL.PPS.TBX.enu.PalletEtiketType,ToeleveringId:%String,ProductNummer:%String=""</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#define LengteBarcode 8
 	
 	#dim PalletNr As %Integer
-	#dim PalletCode As %String
+	#dim NieuwePalletCode As %String
 	
-	If ($IsObject(DnaCode) && (..GeefVerpakkingTypeVanDnaCode(DnaCode) = "Probox")) {
-		Set PalletCode = ..GeefPalletCodeVoorProbox(Type, DnaCode)
+	If (..GeefVerpakkingTypeVanProduct(ProductNummer) = "Probox") {
+		Set NieuwePalletCode = ..GeefPalletCodeVoorProbox(Type, ToeleveringId, $$$LengteBarcode)
 	} Else {
 		Set PalletNr = ..GeefVolgendPalletNr()
 		do ..Verwerk(Type)
-		Set PalletCode = ..Prefix _ ##class(TECH.StringUtils).AlignRight(PalletNr,0,$$$LengteBarcode-$length(..Prefix))
+		Set NieuwePalletCode = ..Prefix _ ##class(TECH.StringUtils).AlignRight(PalletNr, 0, $$$LengteBarcode - $Length(..Prefix))
 	}
 	
-	Quit PalletCode
+	Quit NieuwePalletCode
 ]]></Implementation>
 </Method>
 
 <Method name="GeefPalletCodeVoorProbox">
-<FormalSpec>Type:BL.PPS.TBX.enu.PalletEtiketType,DnaCode:DOM.Halux.AAP.DnaCode</FormalSpec>
+<FormalSpec>Type:BL.PPS.TBX.enu.PalletEtiketType,ToeleveringId:%String,LengteBarcode:%Integer</FormalSpec>
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim LaatstGescandePalletCode = ..GeefPalletCodeVanLaatstGescandeLade(DnaCode.PalletCode)
-	#dim PalletCode As %String
 	
-	If (LaatstGescandePalletCode = "") || ($Extract(LaatstGescandePalletCode, 9, 9) = "B") {
+	#dim LaatstGescandePalletCode = ..GeefPalletCodeVanLaatstGescandeLade(ToeleveringId)
+	#dim NieuwePalletCode As %String
+	
+	#dim Suffix As %String = ..GeefSuffixVoorPalletCode(ToeleveringId, LaatstGescandePalletCode)
+	If (Suffix = "A") {
 		#dim PalletNr As %Integer = ..GeefVolgendPalletNr()
-		do ..Verwerk(Type)
-		Set PalletCode = ..Prefix _ ##class(TECH.StringUtils).AlignRight(PalletNr,0,$$$LengteBarcode-$length(..Prefix)) _ "A"
+		Do ..Verwerk(Type)
+		Set NieuwePalletCode = ..Prefix _ ##class(TECH.StringUtils).AlignRight(PalletNr,0, LengteBarcode - $Length(..Prefix)) _ "A"
 	} Else {
-		Set PalletCode = $Extract(LaatstGescandePalletCode, 1, 8) _ "B"
+		Set NieuwePalletCode = $Extract(LaatstGescandePalletCode, 1, 8) _ "B"
 	}
 	
-	Quit PalletCode
+	Quit NieuwePalletCode
 ]]></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>PalletCode:%String</FormalSpec>
+<FormalSpec>ToeleveringId:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim LaatsteScanTijdstip As %Integer = "99999,99999"
+	#dim DnaCodeIterator As TECH.Iterator = ..DnaCodeRepository.ZoekViaToeleveringIdEnRecent(ToeleveringId)
+	#dim LaatsteScanTijdstip As %Integer = "1,1"
 	#dim PalletCodeLaatstGescandeLade As %String = ""
-	#dim DnaCodeIterator As TECH.Iterator = ..DnaCodeRepository.ZoekAlleRecenteViaPalletCode(PalletCode)
 	
 	While DnaCodeIterator.HasNext() {
 		#dim DnaCode As DOM.Halux.AAP.DnaCode = DnaCodeIterator.Next()
 		
-		If ($$$Not(DnaCode.ScanTijdstip = "") && ..DateTimeApi.HorologIsGroterDan(LaatsteScanTijdstip, DnaCode.ScanTijdstip)) {
+		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="GeefVerpakkingTypeVanDnaCode">
-<FormalSpec>DnaCode:DOM.Halux.AAP.DnaCode</FormalSpec>
+<Method name="GeefVerpakkingTypeVanProduct">
+<FormalSpec>ProductNummer:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim IngegevenKenmerken As APPS.PM.Maatwerk.dto.IngegevenKenmerken = ..ConfiguratorService.GeefOnverwerkteKenmerkenVanProduct(DnaCode.ProductNummer)
-	Quit IngegevenKenmerken.VerpakkingType
+	#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>