Index: DOM/Halux/AAP/DnaCodeRepository.cls.xml
===================================================================
diff -u -r72411 -r72458
--- DOM/Halux/AAP/DnaCodeRepository.cls.xml	(.../DnaCodeRepository.cls.xml)	(revision 72411)
+++ DOM/Halux/AAP/DnaCodeRepository.cls.xml	(.../DnaCodeRepository.cls.xml)	(revision 72458)
@@ -25,7 +25,17 @@
 <Method name="ZoekViaPalletCodeEnRecent">
 <FormalSpec>PalletCode:%String</FormalSpec>
 <ReturnType>TECH.Iterator</ReturnType>
-<Implementation><![CDATA[	Quit ..ZoekViaFilter("PalletCode = ? and not status = ? and (AanmaakTijdstip > current_date - 30)", $LB(PalletCode, ##class(DOM.Halux.AAP.enu.DnaCodeStatus).InBuffer()))
+<Implementation><![CDATA[
+	#dim DnaCodeIterator As TECH.DynamicIterator
+	
+	If ..IsABPalletCode(PalletCode) {
+		#dim BasisPalletCode = $Extract(PalletCode, 1, 8)
+		Set DnaCodeIterator = ..ZoekViaFilter("PalletCode like ? and not status = ? and (AanmaakTijdstip > current_date - 30)", $LB(BasisPalletCode _ "%", ##class(DOM.Halux.AAP.enu.DnaCodeStatus).InBuffer()))
+	} Else {
+		Set DnaCodeIterator = ..ZoekViaFilter("PalletCode = ? and not status = ? and (AanmaakTijdstip > current_date - 30)", $LB(PalletCode, ##class(DOM.Halux.AAP.enu.DnaCodeStatus).InBuffer()))
+	}
+	
+	Quit DnaCodeIterator
 ]]></Implementation>
 </Method>
 
@@ -54,18 +64,37 @@
 <FormalSpec>PalletCode:%String</FormalSpec>
 <ReturnType>TECH.Iterator</ReturnType>
 <Implementation><![CDATA[
+	#dim DnaCodeIterator As TECH.DynamicIterator
+	
 	#dim AantalDagenTerug As %Integer = 30
 	If ##class(APPS.VisiDot.impl.Tech).IsFrameID(PalletCode) {
 		Set AantalDagenTerug = 5
 	}
-	Quit ..ZoekViaFilter("PalletCode = ? and (AanmaakTijdstip > current_date - ?)", $LB(PalletCode, AantalDagenTerug))
+	If ..IsABPalletCode(PalletCode) {
+		#dim BasisPalletCode = $Extract(PalletCode, 1, 8)
+		Set DnaCodeIterator = ..ZoekViaFilter("PalletCode like ? and (AanmaakTijdstip > current_date - ?)", $LB(BasisPalletCode _ "%", AantalDagenTerug))
+	} Else {
+		Set DnaCodeIterator = ..ZoekViaFilter("PalletCode = ? and (AanmaakTijdstip > current_date - ?)", $LB(PalletCode, AantalDagenTerug))
+	}
+	
+	Quit DnaCodeIterator
 ]]></Implementation>
 </Method>
 
 <Method name="ZoekViaPalletCodeEnNotStatus">
 <FormalSpec>PalletCode:%String,Status:DOM.Halux.AAP.enu.DnaCodeStatus</FormalSpec>
 <ReturnType>TECH.Iterator</ReturnType>
-<Implementation><![CDATA[	Quit ..ZoekViaFilter("PalletCode = ? and not Status = ?", $LB(PalletCode, Status))
+<Implementation><![CDATA[
+	#dim DnaCodeIterator As TECH.DynamicIterator
+	
+	If ..IsABPalletCode(PalletCode) {
+		#dim BasisPalletCode = $Extract(PalletCode, 1, 8)
+		Set DnaCodeIterator = ..ZoekViaFilter("PalletCode like ? and not Status = ?", $LB(BasisPalletCode _ "%", Status))
+	} Else {
+		Set DnaCodeIterator = ..ZoekViaFilter("PalletCode = ? and not Status = ?", $LB(PalletCode, Status))
+	}
+	
+	Quit DnaCodeIterator
 ]]></Implementation>
 </Method>
 
@@ -241,6 +270,13 @@
 <Implementation><![CDATA[	Quit ..ZoekViaFilter("Status = ? and (AanmaakTijdstip > current_date - 2)", $LB(Status))
 ]]></Implementation>
 </Method>
+
+<Method name="IsABPalletCode">
+<FormalSpec>PalletCode:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[	Quit ($Length(PalletCode) = 9) && ##class(TECH.StringUtils).Equals($Extract(PalletCode, 9), "A", "B")
+]]></Implementation>
+</Method>
 </Class>