Index: APPS/Halux/PPS/impl/PalletIDBepaler.cls.xml
===================================================================
diff -u -r72410 -r73652
--- APPS/Halux/PPS/impl/PalletIDBepaler.cls.xml	(.../PalletIDBepaler.cls.xml)	(revision 72410)
+++ APPS/Halux/PPS/impl/PalletIDBepaler.cls.xml	(.../PalletIDBepaler.cls.xml)	(revision 73652)
@@ -3,40 +3,85 @@
 <Class name="APPS.Halux.PPS.impl.PalletIDBepaler">
 <Super>TECH.RegisteredObject,BL.PPS.TBX.enu.PalletEtiketType.Verwerker,APPS.Halux.PPS.PalletIDBepaler</Super>
 
-<Parameter name="LpnPrefix">
-<Type>%String</Type>
-<Default>LPN</Default>
-</Parameter>
-
 <Property name="Prefix">
 <Type>%String</Type>
 <Private>1</Private>
 </Property>
 
+<Property name="PalletIDBepalerHelper">
+<Type>APPS.Halux.PPS.impl.PalletIDBepaler.PalletIDBepalerHelper</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>PalletIDBepalerHelper:APPS.Halux.PPS.impl.PalletIDBepaler.PalletIDBepalerHelper=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ..PalletIDBepalerHelper = $$$Inject(PalletIDBepalerHelper, ##class(APPS.Halux.PPS.impl.PalletIDBepaler.PalletIDBepalerHelper).%New())
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="GeefNieuwPalletID">
-<FormalSpec>Type:BL.PPS.TBX.enu.PalletEtiketType</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 = ..GeefVolgendPalletNr()
-	do ..Verwerk(Type)
+	#dim PalletNr As %Integer
+	#dim NieuwePalletCode As %String
 	
-	quit ..Prefix _ ##class(TECH.StringUtils).AlignRight(PalletNr,0,$$$LengteBarcode-$length(..Prefix))
+	If (..PalletIDBepalerHelper.GeefVerpakkingTypeVanProduct(ProductNummer) = "Probox") {
+		Set NieuwePalletCode = ..GeefPalletCodeVoorProbox(Type, ToeleveringId, $$$LengteBarcode)
+	} Else {
+		Set PalletNr = ..GeefVolgendPalletNr()
+		Do ..Verwerk(Type)
+		Set NieuwePalletCode = ..Prefix _ ##class(TECH.StringUtils).AlignRight(PalletNr, 0, $$$LengteBarcode - $Length(..Prefix))
+	}
+	
+	Quit NieuwePalletCode
 ]]></Implementation>
 </Method>
 
-<Method name="GeefNieuwLpnCode">
+<Method name="GeefPalletCodeVoorProbox">
+<FormalSpec>Type:BL.PPS.TBX.enu.PalletEtiketType,ToeleveringId:%String,LengteBarcode:%Integer</FormalSpec>
+<Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#define LengteLpnCode 7
+	#dim LaatstGescandePalletCode = ..PalletIDBepalerHelper.GeefLaatstGebruiktePalletCodeVoorToelevering(ToeleveringId)
+	#dim NieuwePalletCode As %String
+	#dim PalletNr As %Integer
 	
-	#dim LpnNr As %Integer = ..GeefVolgendLpnNr()
+	If ..IsPalletCodeVoorOnderdelenDoos(LaatstGescandePalletCode) {
+		Set PalletNr = ..GeefVolgendPalletNr()
+		Do ..Verwerk(Type)
+		Quit ..Prefix _ ##class(TECH.StringUtils).AlignRight(PalletNr,0, LengteBarcode - $Length(..Prefix)) _ "A"
+	}
 	
-	quit ..#LpnPrefix _ ##class(TECH.StringUtils).AlignRight(LpnNr,0,$$$LengteLpnCode-$length(..#LpnPrefix))
+	#dim Suffix As %String = ..PalletIDBepalerHelper.GeefSuffixVoorPalletCode(ToeleveringId, LaatstGescandePalletCode)
+	If (Suffix = "A") {
+		Set PalletNr = ..GeefVolgendPalletNr()
+		Do ..Verwerk(Type)
+		Set NieuwePalletCode = ..Prefix _ ##class(TECH.StringUtils).AlignRight(PalletNr,0, LengteBarcode - $Length(..Prefix)) _ "A"
+	} Else {
+		Set NieuwePalletCode = $Extract(LaatstGescandePalletCode, 1, 8) _ "B"
+	}
+	
+	Quit NieuwePalletCode
 ]]></Implementation>
 </Method>
 
+<Method name="IsPalletCodeVoorOnderdelenDoos">
+<FormalSpec>PalletCode:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit $$$Not($Extract(PalletCode, 1, 3) = "TBP")
+]]></Implementation>
+</Method>
+
 <Method name="GeefVolgendPalletNr">
 <Private>1</Private>
 <ReturnType>%Integer</ReturnType>
@@ -49,39 +94,27 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefVolgendLpnNr">
-<Private>1</Private>
-<ReturnType>%Integer</ReturnType>
-<Implementation><![CDATA[
-	Lock +^RES("EWPAL","CNT","LPN")
-	#dim LpnNr As %String = $increment(^RES("EWPAL","CNT","LPN"))
-	If LpnNr>9999 Set LpnNr=1,^RES("EWPAL","CNT","LPN") = LpnNr
-	Lock -^RES("EWPAL","CNT","LPN")
-	quit LpnNr
-]]></Implementation>
-</Method>
-
 <Method name="VerwerkProbox">
 <Private>1</Private>
-<Implementation><![CDATA[	set ..Prefix = ##class(BL.PPS.TBX.enu.PalletEtiketPrefix).Probox()
+<Implementation><![CDATA[	Set ..Prefix = ##class(BL.PPS.TBX.enu.PalletEtiketPrefix).Probox()
 ]]></Implementation>
 </Method>
 
 <Method name="VerwerkSFS">
 <Private>1</Private>
-<Implementation><![CDATA[	set ..Prefix = ##class(BL.PPS.TBX.enu.PalletEtiketPrefix).SFS()
+<Implementation><![CDATA[	Set ..Prefix = ##class(BL.PPS.TBX.enu.PalletEtiketPrefix).SFS()
 ]]></Implementation>
 </Method>
 
 <Method name="VerwerkTandembox">
 <Private>1</Private>
-<Implementation><![CDATA[	set ..Prefix = ##class(BL.PPS.TBX.enu.PalletEtiketPrefix).Tandembox()
+<Implementation><![CDATA[	Set ..Prefix = ##class(BL.PPS.TBX.enu.PalletEtiketPrefix).Tandembox()
 ]]></Implementation>
 </Method>
 
 <Method name="VerwerkZonderLogo">
 <Private>1</Private>
-<Implementation><![CDATA[	set ..Prefix = ##class(BL.PPS.TBX.enu.PalletEtiketPrefix).Tandembox() //Geen Typo, bewuste keuze om 'ZonderLogo' de Tandembox-logica te doen volgen
+<Implementation><![CDATA[	Set ..Prefix = ##class(BL.PPS.TBX.enu.PalletEtiketPrefix).Tandembox() //Geen Typo, bewuste keuze om 'ZonderLogo' de Tandembox-logica te doen volgen
 ]]></Implementation>
 </Method>
 </Class>