Index: vhUnitTest/APPS/Halux/AAP/DnaCodeService/GeefPalletKantABVoorProduct/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/Halux/AAP/DnaCodeService/GeefPalletKantABVoorProduct/Test.cls.xml	(revision 0)
+++ vhUnitTest/APPS/Halux/AAP/DnaCodeService/GeefPalletKantABVoorProduct/Test.cls.xml	(revision 73114)
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.Halux.AAP.DnaCodeService.GeefPalletKantABVoorProduct.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Parameter name="BatchId">
+<Type>%Integer</Type>
+<Default>1234</Default>
+</Parameter>
+
+<Parameter name="ProductNummer1">
+<Type>%Integer</Type>
+<Default>200000</Default>
+</Parameter>
+
+<Parameter name="ProductNummer2">
+<Type>%Integer</Type>
+<Default>600000</Default>
+</Parameter>
+
+<Property name="DnaCodeLijst">
+<Type>%ListOfObjects</Type>
+</Property>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestCase:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestCase)
+	
+	Set ..DnaCodeLijst = ##class(%ListOfObjects).%New()
+]]></Implementation>
+</Method>
+
+<Method name="aTest: Indien geen AB palletcode dan lege string">
+<Implementation><![CDATA[
+	#dim PalletCode As %String = "TBP12345"
+	Do ..VoegDnaCodeToeAanLijst(..#ProductNummer1, PalletCode)
+	
+	#dim DnaCodeIterator As TECH.ItemIterator = ##class(TECH.ListIterator).%New(..DnaCodeLijst)
+	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
+	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekAlleRecenteViaPalletCode", PalletCode).DanReturn(DnaCodeIterator)
+	
+	Set DnaCodeService = ##class(APPS.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)
+	#dim Resultaat = DnaCodeService.GeefPalletKantABVoorProduct(..#ProductNummer1, PalletCode)
+	
+	Do $$$AssertEquals(Resultaat, "")
+	
+	Do DnaCodeRepositoryMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Indien enkel A-kant dan string A">
+<Implementation><![CDATA[
+	#dim PalletCode As %String = "TBP12345"
+	Do ..VoegDnaCodeToeAanLijst(..#ProductNummer1, PalletCode _ "A")
+	Do ..VoegDnaCodeToeAanLijst(..#ProductNummer2, PalletCode _ "B")
+	
+	#dim DnaCodeIterator As TECH.ItemIterator = ##class(TECH.ListIterator).%New(..DnaCodeLijst)
+	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
+	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekAlleRecenteViaPalletCode", PalletCode).DanReturn(DnaCodeIterator)
+	
+	Set DnaCodeService = ##class(APPS.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)
+	#dim Resultaat = DnaCodeService.GeefPalletKantABVoorProduct(..#ProductNummer1, PalletCode)
+	
+	Do $$$AssertEquals(Resultaat, "A")
+	
+	Do DnaCodeRepositoryMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Indien enkel B-kant dan string B">
+<Implementation><![CDATA[
+	#dim PalletCode As %String = "TBP12345"
+	Do ..VoegDnaCodeToeAanLijst(..#ProductNummer2, PalletCode _ "A")
+	Do ..VoegDnaCodeToeAanLijst(..#ProductNummer1, PalletCode _ "B")
+	
+	#dim DnaCodeIterator As TECH.ItemIterator = ##class(TECH.ListIterator).%New(..DnaCodeLijst)
+	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
+	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekAlleRecenteViaPalletCode", PalletCode).DanReturn(DnaCodeIterator)
+	
+	Set DnaCodeService = ##class(APPS.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)
+	#dim Resultaat = DnaCodeService.GeefPalletKantABVoorProduct(..#ProductNummer1, PalletCode)
+	
+	Do $$$AssertEquals(Resultaat, "B")
+	
+	Do DnaCodeRepositoryMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Zowel A- als B-kant dan string AB">
+<Implementation><![CDATA[
+	#dim PalletCode As %String = "TBP12345"
+	Do ..VoegDnaCodeToeAanLijst(..#ProductNummer1, PalletCode _ "A")
+	Do ..VoegDnaCodeToeAanLijst(..#ProductNummer1, PalletCode _ "B")
+	
+	#dim DnaCodeIterator As TECH.ItemIterator = ##class(TECH.ListIterator).%New(..DnaCodeLijst)
+	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
+	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekAlleRecenteViaPalletCode", PalletCode).DanReturn(DnaCodeIterator)
+	
+	Set DnaCodeService = ##class(APPS.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)
+	#dim Resultaat = DnaCodeService.GeefPalletKantABVoorProduct(..#ProductNummer1, PalletCode)
+	
+	Do $$$AssertEquals(Resultaat, "AB")
+	
+	Do DnaCodeRepositoryMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="VoegDnaCodeToeAanLijst">
+<FormalSpec>ProductNummer:%String,PalletCode:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set DummyDnaCode = ##class(DOM.Halux.AAP.DnaCode).%New()
+	Set DummyDnaCode.ProductNummer = ProductNummer
+	Set DummyDnaCode.PalletCode = PalletCode
+	
+	Do ..DnaCodeLijst.Insert(DummyDnaCode)
+]]></Implementation>
+</Method>
+
+<Method name="GeefDnaCodeIterator">
+<FormalSpec>Dnacode:%String,Aantal:%Integer</FormalSpec>
+<Private>1</Private>
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[
+	Set LijstDnaCodes = ##class(%ListOfObjects).%New()
+	#dim Index As %Integer
+	
+	For Index = 1:1:Aantal {
+		Set DnaCode = ##class(DOM.Halux.AAP.DnaCode).%New()
+		Set DnaCode.DnaCode = Dnacode
+		
+		Do LijstDnaCodes.Insert(DnaCode)
+	}
+	
+	Quit ##class(TECH.ListIterator).%New(LijstDnaCodes)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/Halux/AAP/DnaCodeService.cls.xml
===================================================================
diff -u -r72033 -r73114
--- APPS/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 72033)
+++ APPS/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 73114)
@@ -314,6 +314,40 @@
 <Implementation><![CDATA[	Quit ..DnaCodeRepository.ZoekViaBatchIdEnSequentienummer(BatchId, Sequentienummer)
 ]]></Implementation>
 </Method>
+
+<Method name="GeefPalletKantABVoorProduct">
+<FormalSpec>ProductNummer:%String,PalletCode:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim PalletKantAB = ""
+	
+	Try {
+		#dim DnaCodeIterator As TECH.Iterator = ..DnaCodeRepository.ZoekAlleRecenteViaPalletCode(PalletCode)
+		#dim DnaCode As DOM.Halux.AAP.DnaCode
+		
+		While DnaCodeIterator.HasNext() {
+			Set DnaCode = DnaCodeIterator.Next()
+			
+			If ((DnaCode.ProductNummer = ProductNummer) && ..IsABPalletCode(DnaCode.PalletCode) && $$$Not(##class(TECH.StringUtils).Contains(PalletKantAB, $Extract(DnaCode.PalletCode, 9)))) {
+				Set PalletKantAB = PalletKantAB _ $Extract(DnaCode.PalletCode, 9)
+			}
+		}
+	} Catch {
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+		Do ..Logger.Error("APPS.Halux.AAP.DnaCodeService", Exception)
+	}
+	
+	Quit PalletKantAB
+]]></Implementation>
+</Method>
+
+<Method name="IsABPalletCode">
+<FormalSpec>PalletCode:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit (($Length(PalletCode) = 9) && (($Extract(PalletCode, 9) = "A") || ($Extract(PalletCode, 9) = "B")))
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhTest/Mock/APPS/Halux/AAP/DnaCodeService.cls.xml
===================================================================
diff -u -r72033 -r73114
--- vhTest/Mock/APPS/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 72033)
+++ vhTest/Mock/APPS/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 73114)
@@ -49,6 +49,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefPalletKantABVoorProduct">
+<FormalSpec>ProductNummer:%String,PalletCode:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefPalletKantABVoorProduct",ProductNummer,PalletCode)
+]]></Implementation>
+</Method>
+
 <Method name="GeefVolgendeAfTeDrukkenDnaCode">
 <FormalSpec>ToeleveringID:%String,ProductID:%String,SequentieNummer:%String="",Herafdruk:%Boolean=$$$False,BatchId:%String="",IsKlantEtiketSpaceStep:%Boolean=$$$False</FormalSpec>
 <ReturnType>%String</ReturnType>
Index: BL/Flow/Proxy/pxLevering.cls.xml
===================================================================
diff -u -r71669 -r73114
--- BL/Flow/Proxy/pxLevering.cls.xml	(.../pxLevering.cls.xml)	(revision 71669)
+++ BL/Flow/Proxy/pxLevering.cls.xml	(.../pxLevering.cls.xml)	(revision 73114)
@@ -643,9 +643,11 @@
 <Implementation><![CDATA[
 	#dim PRNr As TECH.String = $P(LRec,"\",2)
 	#dim lbDragerIDs As %List = $G(Lookup(ORDNr,PRNr))
+	
 	If $LL(lbDragerIDs) {
 		Set DragerTypeBepaler = ##class(DOM.PM.impl.DragerTypeBepaler).%New()
 		#dim DragerType As DOM.PM.enu.DragerType = DragerTypeBepaler.BepaalDragerType($ListGet(lbDragerIDs))
+		
 		If ##class(TECH.ListUtils).Contains(MogelijkeDragers, DragerType) {
 			#dim VertalingSleutel As TECH.String = "LEV:"_DragerType
 			//info toevoegen aan proxy object
@@ -661,6 +663,8 @@
 <FormalSpec><![CDATA[BONNr,lbLimProdGrp,&Lookup]]></FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
+	#dim DnaCodeService As APPS.Halux.AAP.DnaCodeService = ##class(APPS.Halux.PPS.Activiteit.impl.TBX.KlantEtiketIoCContainer).Instance().Resolve("DnaCodeService")
+	
 	; opbouw lookup
 	Kill Lookup
 	Set (ORDNr,OLUNr,SOLNr)=""
@@ -673,7 +677,13 @@
 	. . For  Set SOLNr=$O(^ORDW("D",BONNr,"D",ORDNr,OLUNr,SOLNr)) Quit:'SOLNr  Do
 	. . . Set SOLRec=^ORDW("D",BONNr,"D",ORDNr,OLUNr,SOLNr)
 	. . . Set PalletID=$P(SOLRec,"\",10)
-	. . . Set:PalletID'="" lbPalletIDs=lbPalletIDs_$LB(PalletID)
+	. . . Set PalletABKant = DnaCodeService.GeefPalletKantABVoorProduct(PRNr, PalletID)
+	. . . If (PalletABKant = "") Do
+	. . . . Set:PalletID'="" lbPalletIDs=lbPalletIDs_$LB(PalletID)
+	. . . If ((PalletABKant = "A") || (PalletABKant = "B")) Do
+	. . . . Set lbPalletIDs=lbPalletIDs_$LB(PalletID_PalletABKant)
+	. . . If ((PalletABKant = "AB") || (PalletABKant = "BA")) Do
+	. . . . Set lbPalletIDs=lbPalletIDs_$LB(PalletID_"A")_$LB(PalletID_"B")
 	. . Set:lbPalletIDs'="" Lookup(ORDNr,PRNr)=$G(Lookup(ORDNr,PRNr))_lbPalletIDs
 ]]></Implementation>
 </Method>
Index: BL/Flow/Proxy/pxPakbon.cls.xml
===================================================================
diff -u -r71303 -r73114
--- BL/Flow/Proxy/pxPakbon.cls.xml	(.../pxPakbon.cls.xml)	(revision 71303)
+++ BL/Flow/Proxy/pxPakbon.cls.xml	(.../pxPakbon.cls.xml)	(revision 73114)
@@ -269,14 +269,16 @@
 <Method name="ZoekKindProducten">
 <FormalSpec><![CDATA[oHoofding:Flow.OrderWMS.Hoofding,&arProduct:%String,IsTegroeperenPerKlaarzetLocatie:%Boolean]]></FormalSpec>
 <Implementation><![CDATA[
-	#dim Aantal,AantalLijnen,AantalSub,AantalViaKUL,Delta,KlaarzetLocatieId,KortTekst,MPAantal,MPKortTekst,MPPRNr,P,PRNr,PalletID,Product,Tijdstip,Totaal,User,VNR,i,j,lbMoeders,oLijn,oSub
+	#dim Aantal,AantalLijnen,AantalSub,AantalViaKUL,Delta,KlaarzetLocatieId,KortTekst,MPAantal,MPKortTekst,MPPRNr,P,PRNr,PalletID,Product,Tijdstip,Totaal,User,VNR,i,j,lbMoeders,oLijn,oSub,DnaCodeService,PalletABKant
 	
 	#dim SortKeyZonderKlaarzetLocatie As %String
 	#dim SortKey As %String
 	
 	#dim arSortKeyLookup As TECH.MultiDim
 	Kill arSortKeyLookup
 	
+	Set DnaCodeService = ##class(APPS.Halux.PPS.Activiteit.impl.TBX.KlantEtiketIoCContainer).Instance().Resolve("DnaCodeService")
+	
 	Set AantalLijnen=oHoofding.Lijnen.Count()
 	For i=1:1:AantalLijnen Do
 	. Set oLijn=oHoofding.Lijnen.GetAt(i)
@@ -317,8 +319,18 @@
 	. . Set PalletID=oSub.PickPalletID
 	. . Set Tijdstip=..GeefTijdstipVoorPickingInfo(oSub.Tijdstip) 
 	. . Set KlaarzetLocatieId = $S(IsTegroeperenPerKlaarzetLocatie : ..GeefKlaarzetLocatieId(oSub.PickPalletID), 1:"")
-	. . Set VNR=$O( arProduct(SortKey,User,""),-1)+1
-	. . Set arProduct(SortKey,User,VNR)=$LB(PalletID,Tijdstip,AantalSub, KlaarzetLocatieId)
+	. . Set PalletABKant = DnaCodeService.GeefPalletKantABVoorProduct(PRNr, PalletID)
+	. . If (PalletABKant = "") Do
+	. . . Set VNR=$O( arProduct(SortKey,User,""),-1)+1
+	. . . Set arProduct(SortKey,User,VNR)=$LB(PalletID,Tijdstip,AantalSub, KlaarzetLocatieId)
+	. . If ((PalletABKant = "A") || (PalletABKant = "B")) Do
+	. . . Set VNR=$O( arProduct(SortKey,User,""),-1)+1
+	. . . Set arProduct(SortKey,User,VNR)=$LB(PalletID_PalletABKant,Tijdstip,AantalSub, KlaarzetLocatieId)
+	. . If ((PalletABKant = "AB") || (PalletABKant = "BA")) Do
+	. . . Set VNR=$O( arProduct(SortKey,User,""),-1)+1
+	. . . Set arProduct(SortKey,User,VNR)=$LB(PalletID_"A",Tijdstip,AantalSub, KlaarzetLocatieId)
+	. . . Set VNR=$O( arProduct(SortKey,User,""),-1)+1
+	. . . Set arProduct(SortKey,User,VNR)=$LB(PalletID_"B",Tijdstip,AantalSub, KlaarzetLocatieId)
 ]]></Implementation>
 </Method>
 
Index: vhTest/Fake/APPS/Halux/AAP/DnaCodeService.cls.xml
===================================================================
diff -u -r72033 -r73114
--- vhTest/Fake/APPS/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 72033)
+++ vhTest/Fake/APPS/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 73114)
@@ -16,7 +16,13 @@
 
 <Method name="DnaCodeBijwerkenMetBatchGegevens">
 <FormalSpec>Batch:APPS.Halux.common.impl.BatchImpl</FormalSpec>
-<Implementation><![CDATA[
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="GeefPalletKantABVoorProduct">
+<FormalSpec>ProductNummer:%String,PalletCode:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ""
 ]]></Implementation>
 </Method>
 
@@ -57,26 +63,22 @@
 
 <Method name="VerwijderDnaCodesVoorBatch">
 <FormalSpec>BatchId:%String</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwijderDnaCodesVoorToeleveringLijn">
 <FormalSpec>ToeleveringId:%String,ToeleveringLijnCode:%String</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VulInSequentieId">
 <FormalSpec>SequentieId:%String,BatchId:%String,ToeleveringId:%String,ToeleveringlijnId:%String,ProductId:%String=""</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="WijzigAantalDnaCodesVoorToeleveringLijn">
 <FormalSpec>ToeleveringLijn:DOM.AKP.ProductToeleveringLijn</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 </Class>
 
Index: DOM/PM/impl/DragerTypeBepaler.cls.xml
===================================================================
diff -u -r29059 -r73114
--- DOM/PM/impl/DragerTypeBepaler.cls.xml	(.../DragerTypeBepaler.cls.xml)	(revision 29059)
+++ DOM/PM/impl/DragerTypeBepaler.cls.xml	(.../DragerTypeBepaler.cls.xml)	(revision 73114)
@@ -9,7 +9,7 @@
 <Implementation><![CDATA[
 	If (DragerID?8N) || (DragerID?1"SFS"5N) || (DragerID?1"TBX"5N) {
 		Quit ##class(DOM.PM.enu.DragerType).Pallet()
-	} ElseIf (DragerID?1"TBP"5N) {
+	} ElseIf (DragerID?1"TBP"5N.1(1"A",1"B")) {
 		Quit ##class(DOM.PM.enu.DragerType).Probox()
 	} ElseIf (DragerID?1"O"7N) {
 		Quit ##class(DOM.PM.enu.DragerType).Vhoss()