Index: vhUnitTest/cspBasis/GAProdTBox.cls.xml
===================================================================
diff -u
--- vhUnitTest/cspBasis/GAProdTBox.cls.xml	(revision 0)
+++ vhUnitTest/cspBasis/GAProdTBox.cls.xml	(revision 230)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="vhUnitTest.cspBasis.GAProdTBox">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>vhUnitTest.TestCase</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Method name="TestWSOrderIDStdLadeViaKLNr">
+<Implementation><![CDATA[
+	do ##class(cspBasis.GAProdTBox).WSOrderIDStdLadeViaKLNr(1000,"SET",20)
+	do $$$AssertEquals(##class(cspBasis.GAProdTBox).WSOrderIDStdLadeViaKLNr(1000),20)
+
+	do ##class(cspBasis.GAProdTBox).WSOrderIDStdLadeViaKLNr(1000,"SET",30)
+	do $$$AssertEquals(##class(cspBasis.GAProdTBox).WSOrderIDStdLadeViaKLNr(1000),30)
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: cspBasis/GAProdTBox.cls.xml
===================================================================
diff -u -r172 -r230
--- cspBasis/GAProdTBox.cls.xml	(.../GAProdTBox.cls.xml)	(revision 172)
+++ cspBasis/GAProdTBox.cls.xml	(.../GAProdTBox.cls.xml)	(revision 230)
@@ -1297,14 +1297,19 @@
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-#define StorageNodeStd(%v) ^WS.TBX.OrderD(-99,"STD",%v)
-	Quit:($G(KLNr)="") ""
-	If $$$UCase($G(GetSet))="SET" Do
-	. Set wsID=newID
-	. Set $$$StorageNodeStd(KLNr)=wsID
-	Else  Do
-	. Set wsID=$G($$$StorageNodeStd(KLNr))
-	Quit wsID
+	set OrderID = ""
+	if GetSet="GET" {
+		set rsKlantSpecifiekeStandaardLade = $$ExecDynQuery^vhQUERYLIB("SELECT OrderID FROM WS_TBX.KlantSpecifiekeStandaardLade WHERE KlantID = ?",$listbuild(KLNr))
+		while rsKlantSpecifiekeStandaardLade.Next() {
+			set OrderID = rsKlantSpecifiekeStandaardLade.Get("OrderID")
+		}
+	} else {
+		do ExecDynQuery^vhQUERYLIB("DELETE FROM WS_TBX.KlantSpecifiekeStandaardLade WHERE KlantID = ?",$listbuild(KLNr))
+		do ExecDynQuery^vhQUERYLIB("INSERT INTO WS_TBX.KlantSpecifiekeStandaardLade (KlantID , OrderID) VALUES (?,?)",$listbuild(KLNr,newID))
+		set OrderID = newID
+	}
+	
+	quit OrderID
 ]]></Implementation>
 </Method>
 
Index: WS/TBX/KlantSpecifiekeStandaardLade.cls.xml
===================================================================
diff -u
--- WS/TBX/KlantSpecifiekeStandaardLade.cls.xml	(revision 0)
+++ WS/TBX/KlantSpecifiekeStandaardLade.cls.xml	(revision 230)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="WS.TBX.KlantSpecifiekeStandaardLade">
+<ClassType>persistent</ClassType>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%Persistent</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Index name="KlantID">
+<Properties>KlantID</Properties>
+<Unique>1</Unique>
+</Index>
+
+<Property name="KlantID">
+<Type>%String</Type>
+</Property>
+
+<Property name="OrderID">
+<Type>WS.TBX.Order</Type>
+</Property>
+
+<Storage name="Default">
+<Type>%Library.CacheStorage</Type>
+<DataLocation>^WS.TBX.KlantSpecifiAFAD</DataLocation>
+<DefaultData>KlantSpecifiekeStandaardLadeDefaultData</DefaultData>
+<IdLocation>^WS.TBX.KlantSpecifiAFAD</IdLocation>
+<IndexLocation>^WS.TBX.KlantSpecifiAFAI</IndexLocation>
+<StreamLocation>^WS.TBX.KlantSpecifiAFAS</StreamLocation>
+<Data name="KlantSpecifiekeStandaardLadeDefaultData">
+<Structure>listnode</Structure>
+<Subscript/>
+<Value name="1">
+<Value>%%CLASSNAME</Value>
+</Value>
+<Value name="2">
+<Value>KlantID</Value>
+</Value>
+<Value name="3">
+<Value>OrderID</Value>
+</Value>
+</Data>
+</Storage>
+</Class>
+</Export>