Index: DOM/Halux/AAP/DnaCodeRepository.cls.xml
===================================================================
diff -u -r72411 -r74747
--- DOM/Halux/AAP/DnaCodeRepository.cls.xml	(.../DnaCodeRepository.cls.xml)	(revision 72411)
+++ DOM/Halux/AAP/DnaCodeRepository.cls.xml	(.../DnaCodeRepository.cls.xml)	(revision 74747)
@@ -15,31 +15,17 @@
 ]]></Implementation>
 </Method>
 
-<Method name="ZoekViaLpnCode">
-<FormalSpec>LpnCode:%String</FormalSpec>
-<ReturnType>TECH.Iterator</ReturnType>
-<Implementation><![CDATA[	Quit ..ZoekViaFilter("LpnCode = ? ", $LB(LpnCode))
-]]></Implementation>
-</Method>
-
 <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[	Quit ..ZoekViaFilter("PalletCode like ? and not status = ? and (AanmaakTijdstip > current_date - 30)", $LB(PalletCode _ "%", ##class(DOM.Halux.AAP.enu.DnaCodeStatus).InBuffer()))
 ]]></Implementation>
 </Method>
 
-<Method name="ZoekViaLpnCodeEnRecent">
-<FormalSpec>LpnCode:%String</FormalSpec>
-<ReturnType>TECH.Iterator</ReturnType>
-<Implementation><![CDATA[	Quit ..ZoekViaFilter("LpnCode = ? and (AanmaakTijdstip > current_date - 30)", $LB(LpnCode))
-]]></Implementation>
-</Method>
-
 <Method name="ZoekVoorProboxEtiket">
 <FormalSpec>PalletCode:%String</FormalSpec>
 <ReturnType>TECH.Iterator</ReturnType>
-<Implementation><![CDATA[	Quit ..ZoekViaFilter("PalletCode = ? and (AanmaakTijdstip > current_date - 30)", $LB(PalletCode))
+<Implementation><![CDATA[	Quit ..ZoekViaFilter("PalletCode like ? and (AanmaakTijdstip > current_date - 30)", $LB(PalletCode _ "%"))
 ]]></Implementation>
 </Method>
 
@@ -55,17 +41,29 @@
 <ReturnType>TECH.Iterator</ReturnType>
 <Implementation><![CDATA[
 	#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))
+
+	Quit ..ZoekViaFilter("PalletCode like ? and (AanmaakTijdstip > current_date - ?)", $LB(PalletCode _ "%", AantalDagenTerug))
 ]]></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>
 
@@ -160,6 +158,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ZoekViaToeleveringEnSequentienummerEnRecent">
+<FormalSpec>Toelevering:%String,Sequentienummer:%String</FormalSpec>
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	Quit ..ZoekViaFilter("Toelevering = ? and Sequentienummer = ? and (AanmaakTijdstip > current_date - 30)", $LB(Toelevering, Sequentienummer))
+]]></Implementation>
+</Method>
+
 <Method name="ZoekViaDnaCodeEnRecent">
 <FormalSpec>DnaCode:%String</FormalSpec>
 <ReturnType>TECH.Iterator</ReturnType>
@@ -235,10 +240,11 @@
 ]]></Implementation>
 </Method>
 
-<Method name="ZoekViaStatusEnRecent">
-<FormalSpec>Status:DOM.Halux.AAP.enu.DnaCodeStatus</FormalSpec>
-<ReturnType>TECH.Iterator</ReturnType>
-<Implementation><![CDATA[	Quit ..ZoekViaFilter("Status = ? and (AanmaakTijdstip > current_date - 2)", $LB(Status))
+<Method name="IsABPalletCode">
+<FormalSpec>PalletCode:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ($Length(PalletCode) = 9) && ##class(TECH.StringUtils).Equals($Extract(PalletCode, 9), "A", "B")
 ]]></Implementation>
 </Method>
 </Class>