Index: vhUnitTest/APPS/Halux/PPS/impl/PalletIDBepaler/GeefNieuwPalletID/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/Halux/PPS/impl/PalletIDBepaler/GeefNieuwPalletID/Test.cls.xml	(revision 0)
+++ vhUnitTest/APPS/Halux/PPS/impl/PalletIDBepaler/GeefNieuwPalletID/Test.cls.xml	(revision 72483)
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.Halux.PPS.impl.PalletIDBepaler.GeefNieuwPalletID.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Parameter name="DummyPalletNr">
+<Type>%Integer</Type>
+<Default>12345</Default>
+</Parameter>
+
+<Property name="PalletNr">
+<Type>%Integer</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="VorigPalletNr">
+<Type>%Integer</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="DateTimeApiMock">
+<Type>TECH.DateTime.DateTimeAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="DnaCodeRepositoryMock">
+<Type>DOM.Halux.AAP.DnaCodeRepository</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ConfiguratorServiceMock">
+<Type>APPS.VKP.Maatwerk.impl.ConfiguratorService</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>TestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(TestName)
+	
+	Set ..VorigPalletNr = ^RES("EWPAL","CNT","TBX")
+	Set ^RES("EWPAL","CNT","TBX") = ..#DummyPalletNr
+	
+	Set ..DateTimeApiMock = ##class(vhTest.Mock.TECH.DateTime.DateTimeAPI).%New()
+	Set ..DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
+	Set ..ConfiguratorServiceMock = ##class(vhTest.Mock.APPS.VKP.Maatwerk.impl.ConfiguratorService).%New()
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterOneTest">
+<FormalSpec>TestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Set ^RES("EWPAL","CNT","TBX") = ..VorigPalletNr
+	
+	Do ##super(TestName)
+]]></Implementation>
+</Method>
+
+<Method name="Test: GeefPalletId type TBP zonder DnaCode geeft volgende PalletId zonder A/B">
+<Implementation><![CDATA[
+	#dim Type = "TBP"
+	#dim PalletIdBepaler = ##class(APPS.Halux.PPS.impl.PalletIDBepaler).%New()
+	#dim PalletId = PalletIdBepaler.GeefNieuwPalletID(Type)
+	
+	Do $$$AssertEquals(PalletId, "TBP12346")
+]]></Implementation>
+</Method>
+
+<Method name="Test: GeefPalletId type TBX zonder DnaCode geeft volgende PalletId zonder A/B">
+<Implementation><![CDATA[
+	#dim Type = "TBX"
+	#dim PalletIdBepaler = ##class(APPS.Halux.PPS.impl.PalletIDBepaler).%New()
+	#dim PalletId = PalletIdBepaler.GeefNieuwPalletID(Type)
+	
+	Do $$$AssertEquals(PalletId, "TBX12346")
+]]></Implementation>
+</Method>
+
+<Method name="Test: GeefPalletId type TBP met DnaCode niet op probox geeft volgende PalletId zonder A/B">
+<Implementation><![CDATA[
+	#dim IngegevenKenmerkenStub = ##class(vhTest.Utils.APPS.PM.Maatwerk.dto.LBXKenmerken).StandaardLade()
+	#dim DnaCodeMock = ##class(DOM.Halux.AAP.DnaCode).%New()
+	Set DnaCodeMock.ProductNummer = "1000"
+	
+	Do ..ConfiguratorServiceMock.IndienMethodCall("GeefOnverwerkteKenmerkenVanProduct", "1000").DanReturn(IngegevenKenmerkenStub)
+	
+	#dim Type = "TBP"
+	#dim PalletIdBepaler = ##class(APPS.Halux.PPS.impl.PalletIDBepaler).%New(,, ..ConfiguratorServiceMock)
+	#dim PalletId = PalletIdBepaler.GeefNieuwPalletID(Type, DnaCodeMock)
+	
+	Do $$$AssertEquals(PalletId, "TBP12346")
+]]></Implementation>
+</Method>
+
+<Method name="Test: GeefPalletId type TBP met DnaCode op probox en geen gescande DnaCodes geeft volgende PalletId A">
+<Implementation><![CDATA[
+	#dim IngegevenKenmerkenStub = ##class(vhTest.Utils.APPS.PM.Maatwerk.dto.LBXKenmerken).StandaardLade()
+	Set IngegevenKenmerkenStub.VerpakkingType = "Probox"
+	
+	#dim DnaCodeMock = ##class(DOM.Halux.AAP.DnaCode).%New()
+	Set DnaCodeMock.ProductNummer = "1000"
+	Set DnaCodeMock.PalletCode = "TBP99999A"
+	
+	#dim DnaCodeLijst = ##class(%ListOfObjects).%New()
+	Do DnaCodeLijst.Insert(DnaCodeMock)
+	#dim DnaCodeIteratorMock As TECH.Iterator = ##class(TECH.ListIterator).%New(DnaCodeLijst)
+	
+	Do ..ConfiguratorServiceMock.IndienMethodCall("GeefOnverwerkteKenmerkenVanProduct", "1000").DanReturn(IngegevenKenmerkenStub)
+	Do ..DnaCodeRepositoryMock.IndienMethodCall("ZoekAlleRecenteViaPalletCode", "TBP99999A").DanReturn(DnaCodeIteratorMock)
+	
+	#dim Type = "TBP"
+	#dim PalletIdBepaler = ##class(APPS.Halux.PPS.impl.PalletIDBepaler).%New(..DnaCodeRepositoryMock,, ..ConfiguratorServiceMock)
+	#dim PalletId = PalletIdBepaler.GeefNieuwPalletID(Type, DnaCodeMock)
+	
+	Do $$$AssertEquals(PalletId, "TBP12346A")
+]]></Implementation>
+</Method>
+
+<Method name="Test: GeefPalletId type TBP met DnaCode op probox met laatst gescande DnaCode B geeft volgende PalletId A">
+<Implementation><![CDATA[
+	#dim IngegevenKenmerkenStub = ##class(vhTest.Utils.APPS.PM.Maatwerk.dto.LBXKenmerken).StandaardLade()
+	Set IngegevenKenmerkenStub.VerpakkingType = "Probox"
+	
+	#dim DnaCodeMock = ##class(DOM.Halux.AAP.DnaCode).%New()
+	Set DnaCodeMock.ProductNummer = "1000"
+	Set DnaCodeMock.PalletCode = "TBP99999B"
+	Set DnaCodeMock.ScanTijdstip = "10000,10000"
+	
+	#dim DnaCodeLijst = ##class(%ListOfObjects).%New()
+	Do DnaCodeLijst.Insert(DnaCodeMock)
+	#dim DnaCodeIteratorMock As TECH.Iterator = ##class(TECH.ListIterator).%New(DnaCodeLijst)
+	
+	Do ..ConfiguratorServiceMock.IndienMethodCall("GeefOnverwerkteKenmerkenVanProduct", "1000").DanReturn(IngegevenKenmerkenStub)
+	Do ..DnaCodeRepositoryMock.IndienMethodCall("ZoekAlleRecenteViaPalletCode", "TBP99999B").DanReturn(DnaCodeIteratorMock)
+	
+	#dim Type = "TBP"
+	#dim PalletIdBepaler = ##class(APPS.Halux.PPS.impl.PalletIDBepaler).%New(..DnaCodeRepositoryMock,, ..ConfiguratorServiceMock)
+	#dim PalletId = PalletIdBepaler.GeefNieuwPalletID(Type, DnaCodeMock)
+	
+	Do $$$AssertEquals(PalletId, "TBP12346A")
+]]></Implementation>
+</Method>
+
+<Method name="Test: GeefPalletId type TBP met DnaCode op probox met laatst gescande DnaCode A geeft dezelfde PalletId B">
+<Implementation><![CDATA[
+	#dim IngegevenKenmerkenStub = ##class(vhTest.Utils.APPS.PM.Maatwerk.dto.LBXKenmerken).StandaardLade()
+	Set IngegevenKenmerkenStub.VerpakkingType = "Probox"
+	
+	#dim DnaCodeMock = ##class(DOM.Halux.AAP.DnaCode).%New()
+	Set DnaCodeMock.ProductNummer = "1000"
+	Set DnaCodeMock.PalletCode = "TBP99999A"
+	Set DnaCodeMock.ScanTijdstip = "10000,10000"
+	
+	#dim DnaCodeLijst = ##class(%ListOfObjects).%New()
+	Do DnaCodeLijst.Insert(DnaCodeMock)
+	#dim DnaCodeIteratorMock As TECH.Iterator = ##class(TECH.ListIterator).%New(DnaCodeLijst)
+	
+	Do ..ConfiguratorServiceMock.IndienMethodCall("GeefOnverwerkteKenmerkenVanProduct", "1000").DanReturn(IngegevenKenmerkenStub)
+	Do ..DnaCodeRepositoryMock.IndienMethodCall("ZoekAlleRecenteViaPalletCode", "TBP99999A").DanReturn(DnaCodeIteratorMock)
+	
+	#dim Type = "TBP"
+	#dim PalletIdBepaler = ##class(APPS.Halux.PPS.impl.PalletIDBepaler).%New(..DnaCodeRepositoryMock,, ..ConfiguratorServiceMock)
+	#dim PalletId = PalletIdBepaler.GeefNieuwPalletID(Type, DnaCodeMock)
+	
+	Do $$$AssertEquals(PalletId, "TBP99999B")
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/Halux/PPS/impl/PalletIDBepaler.cls.xml
===================================================================
diff -u -r72410 -r72483
--- APPS/Halux/PPS/impl/PalletIDBepaler.cls.xml	(.../PalletIDBepaler.cls.xml)	(revision 72410)
+++ APPS/Halux/PPS/impl/PalletIDBepaler.cls.xml	(.../PalletIDBepaler.cls.xml)	(revision 72483)
@@ -3,40 +3,113 @@
 <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="DnaCodeRepository">
+<Type>DOM.Halux.AAP.DnaCodeRepository</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="DateTimeApi">
+<Type>TECH.DateTime.DateTimeAPI</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>
+<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())
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="GeefNieuwPalletID">
-<FormalSpec>Type:BL.PPS.TBX.enu.PalletEtiketType</FormalSpec>
+<FormalSpec>Type:BL.PPS.TBX.enu.PalletEtiketType,DnaCode:DOM.Halux.AAP.DnaCode=""</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#define LengteBarcode 8
 	
-	#dim PalletNr As %Integer = ..GeefVolgendPalletNr()
-	do ..Verwerk(Type)
+	#dim PalletNr As %Integer
+	#dim PalletCode As %String
 	
-	quit ..Prefix _ ##class(TECH.StringUtils).AlignRight(PalletNr,0,$$$LengteBarcode-$length(..Prefix))
+	If ($IsObject(DnaCode) && (..GeefVerpakkingTypeVanDnaCode(DnaCode) = "Probox")) {
+		Set PalletCode = ..GeefPalletCodeVoorProbox(Type, DnaCode)
+	} Else {
+		Set PalletNr = ..GeefVolgendPalletNr()
+		do ..Verwerk(Type)
+		Set PalletCode = ..Prefix _ ##class(TECH.StringUtils).AlignRight(PalletNr,0,$$$LengteBarcode-$length(..Prefix))
+	}
+	
+	Quit PalletCode
 ]]></Implementation>
 </Method>
 
-<Method name="GeefNieuwLpnCode">
+<Method name="GeefPalletCodeVoorProbox">
+<FormalSpec>Type:BL.PPS.TBX.enu.PalletEtiketType,DnaCode:DOM.Halux.AAP.DnaCode</FormalSpec>
+<Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#define LengteLpnCode 7
+	#dim LaatstGescandePalletCode = ..GeefPalletCodeVanLaatstGescandeLade(DnaCode.PalletCode)
+	#dim PalletCode As %String
 	
-	#dim LpnNr As %Integer = ..GeefVolgendLpnNr()
+	If (LaatstGescandePalletCode = "") || ($Extract(LaatstGescandePalletCode, 9, 9) = "B") {
+		#dim PalletNr As %Integer = ..GeefVolgendPalletNr()
+		do ..Verwerk(Type)
+		Set PalletCode = ..Prefix _ ##class(TECH.StringUtils).AlignRight(PalletNr,0,$$$LengteBarcode-$length(..Prefix)) _ "A"
+	} Else {
+		Set PalletCode = $Extract(LaatstGescandePalletCode, 1, 8) _ "B"
+	}
 	
-	quit ..#LpnPrefix _ ##class(TECH.StringUtils).AlignRight(LpnNr,0,$$$LengteLpnCode-$length(..#LpnPrefix))
+	Quit PalletCode
 ]]></Implementation>
 </Method>
 
+<Method name="GeefPalletCodeVanLaatstGescandeLade">
+<FormalSpec>PalletCode:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim LaatsteScanTijdstip As %Integer = "99999,99999"
+	#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)) {
+			Set LaatsteScanTijdstip = DnaCode.ScanTijdstip
+			Set PalletCodeLaatstGescandeLade = DnaCode.PalletCode
+		}
+	}
+	
+	Quit PalletCodeLaatstGescandeLade
+]]></Implementation>
+</Method>
+
+<Method name="GeefVerpakkingTypeVanDnaCode">
+<FormalSpec>DnaCode:DOM.Halux.AAP.DnaCode</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim IngegevenKenmerken As APPS.PM.Maatwerk.dto.IngegevenKenmerken = ..ConfiguratorService.GeefOnverwerkteKenmerkenVanProduct(DnaCode.ProductNummer)
+	Quit IngegevenKenmerken.VerpakkingType
+]]></Implementation>
+</Method>
+
 <Method name="GeefVolgendPalletNr">
 <Private>1</Private>
 <ReturnType>%Integer</ReturnType>
@@ -49,18 +122,6 @@
 ]]></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()