Index: DOM/Halux/AAP/DnaCodeRepository.cls.xml
===================================================================
diff -u -r61007 -r74747
--- DOM/Halux/AAP/DnaCodeRepository.cls.xml	(.../DnaCodeRepository.cls.xml)	(revision 61007)
+++ DOM/Halux/AAP/DnaCodeRepository.cls.xml	(.../DnaCodeRepository.cls.xml)	(revision 74747)
@@ -18,14 +18,52 @@
 <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="ZoekVoorProboxEtiket">
+<FormalSpec>PalletCode:%String</FormalSpec>
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	Quit ..ZoekViaFilter("PalletCode like ? and (AanmaakTijdstip > current_date - 30)", $LB(PalletCode _ "%"))
+]]></Implementation>
+</Method>
+
+<Method name="ZoekVoorHernoemPallet">
+<FormalSpec>PalletCode:%String</FormalSpec>
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	Quit ..ZoekViaFilter("PalletCode = ? and (AanmaakTijdstip > current_date - 30)", $LB(PalletCode))
+]]></Implementation>
+</Method>
+
+<Method name="ZoekAlleRecenteViaPalletCode">
+<FormalSpec>PalletCode:%String</FormalSpec>
+<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 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>
 
@@ -43,6 +81,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ZoekViaToeleveringIdEnSequentieNummerEnProductNummerEnRecent">
+<FormalSpec>ToeleveringId:%String,SequentieNummer:%String,ProductNummer:%String</FormalSpec>
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	Quit ..ZoekViaFilter("Toelevering = ? and SequentieNummer = ? and ProductNummer = ? and (AanmaakTijdstip > current_date - 30)", $LB(ToeleveringId, SequentieNummer, ProductNummer))
+]]></Implementation>
+</Method>
+
 <Method name="ZoekViaToeleveringIdEnNotStatusEnRecent">
 <FormalSpec>ToeleveringId:%String,Status:DOM.Halux.AAP.enu.DnaCodeStatus</FormalSpec>
 <ReturnType>TECH.Iterator</ReturnType>
@@ -57,6 +102,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ZoekViaToeleveringIdEnStatusEnRecent">
+<FormalSpec>ToeleveringId:%String,Status:DOM.Halux.AAP.enu.DnaCodeStatus</FormalSpec>
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	Quit ..ZoekViaFilter("Toelevering = ? and Status = ? and (AanmaakTijdstip > current_date - 30)", $LB(ToeleveringId, Status))
+]]></Implementation>
+</Method>
+
 <Method name="ZoekViaDatum">
 <FormalSpec>Horolog:TECH.Horolog</FormalSpec>
 <ReturnType>TECH.Iterator</ReturnType>
@@ -71,6 +123,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ZoekViaToeleveringEnProductNummer">
+<FormalSpec>ToeleveringId:%String,ProductNummer:%String</FormalSpec>
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	Quit ..ZoekViaFilter("Toelevering = ? and ProductNummer = ?", $LB(ToeleveringId, ProductNummer))
+]]></Implementation>
+</Method>
+
 <Method name="ZoekViaDnaCode">
 <FormalSpec>DnaCode:%String</FormalSpec>
 <ReturnType>TECH.Iterator</ReturnType>
@@ -85,13 +144,27 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ZoekViaBatchId">
+<FormalSpec>BatchId:%String</FormalSpec>
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	Quit ..ZoekViaFilter("BatchId = ?", $LB(BatchId))
+]]></Implementation>
+</Method>
+
 <Method name="ZoekViaBatchIdEnSequentienummer">
 <FormalSpec>BatchId:%String,Sequentienummer:%String</FormalSpec>
 <ReturnType>TECH.Iterator</ReturnType>
 <Implementation><![CDATA[	Quit ..ZoekViaFilter("BatchId = ? and Sequentienummer = ?", $LB(BatchId, Sequentienummer))
 ]]></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>
@@ -149,9 +222,31 @@
 <Method name="ZoekViaLadecodeEnRecent">
 <FormalSpec>Ladecode:%String</FormalSpec>
 <ReturnType>TECH.Iterator</ReturnType>
-<Implementation><![CDATA[	Quit ..ZoekViaFilter("LadeCode = ? and (AanmaakTijdstip > current_date - 30)",$lb(Ladecode))
+<Implementation><![CDATA[
+	If $Length(Ladecode)=4 {
+		Set Ladecode = $Extract(Ladecode,1,2)_"."_$Extract(Ladecode,3,4)
+	}
+	If $Length(Ladecode)=5 {
+		Set Ladecode = $Extract(Ladecode,1,3)_"."_$Extract(Ladecode,4,5)
+	}
+	Quit ..ZoekViaFilter("LadeCode like '%"_Ladecode_"%' and (AanmaakTijdstip > current_date - 30)","")
 ]]></Implementation>
 </Method>
+
+<Method name="ZoekViaParentDnaCode">
+<FormalSpec>ParentDnaCode:%String</FormalSpec>
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	Quit ..ZoekViaFilter("ParentDnaCode = ? ", $LB(ParentDnaCode))
+]]></Implementation>
+</Method>
+
+<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>