Index: OBJTimpl/WMSOrder/OphalenVoorraadOpLocatie.cls.xml
===================================================================
diff -u -r68860 -r72045
--- OBJTimpl/WMSOrder/OphalenVoorraadOpLocatie.cls.xml	(.../OphalenVoorraadOpLocatie.cls.xml)	(revision 68860)
+++ OBJTimpl/WMSOrder/OphalenVoorraadOpLocatie.cls.xml	(.../OphalenVoorraadOpLocatie.cls.xml)	(revision 72045)
@@ -122,6 +122,7 @@
 	_"	 and Item.name=?"
 	_"	 and location.BOType=40"
 	_"   and location.FULLNAME <>'SYSTEMLOSTANDFOUND'"
+	_"	 and csitq.DTSVALIDUNTIL is null "	
 	_"	group by location.FULLNAME  , warehouse.NAME , isnull(warehouse.DESCRIPTION,warehouse.NAME),ITEM.NAME, case when csitq.NAME like '000000%' then 'sublpn' else csitq.NAME end,DEPARTMENT.NAME  "	
 	try
     {
Index: OBJTimpl/Prepick/ProductNietInPOD.cls.xml
===================================================================
diff -u
--- OBJTimpl/Prepick/ProductNietInPOD.cls.xml	(revision 0)
+++ OBJTimpl/Prepick/ProductNietInPOD.cls.xml	(revision 72045)
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="OBJTimpl.Prepick.ProductNietInPOD">
+<ClassType>persistent</ClassType>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>TECH.Persistent</Super>
+
+<Property name="OBJTItemID">
+<Type>%String</Type>
+</Property>
+
+<Property name="KortTekst">
+<Type>%String</Type>
+</Property>
+
+<Property name="Product">
+<Type>Prod.Product</Type>
+</Property>
+
+<Property name="AantalStuks">
+<Type>%String</Type>
+</Property>
+
+<Property name="AantalLPN">
+<Type>%String</Type>
+</Property>
+
+<Index name="PrimaryKey">
+<IdKey>1</IdKey>
+<PrimaryKey>1</PrimaryKey>
+<Properties>Product</Properties>
+<Unique>1</Unique>
+</Index>
+
+<Storage name="Default">
+<Type>%Library.CacheStorage</Type>
+<DataLocation>^OBJTimpl.PFBA3.ProductNietFDA0D</DataLocation>
+<DefaultData>ProductNietInPODDefaultData</DefaultData>
+<IdLocation>^OBJTimpl.PFBA3.ProductNietFDA0D</IdLocation>
+<IndexLocation>^OBJTimpl.PFBA3.ProductNietFDA0I</IndexLocation>
+<StreamLocation>^OBJTimpl.PFBA3.ProductNietFDA0S</StreamLocation>
+<Data name="ProductNietInPODDefaultData">
+<Structure>listnode</Structure>
+<Subscript/>
+<Value name="1">
+<Value>%%CLASSNAME</Value>
+</Value>
+<Value name="2">
+<Value>OBJTItemID</Value>
+</Value>
+<Value name="3">
+<Value>KortTekst</Value>
+</Value>
+<Value name="4">
+<Value>Aantal</Value>
+</Value>
+<Value name="5">
+<Value>LPN</Value>
+</Value>
+<Value name="6">
+<Value>Locatie</Value>
+</Value>
+<Value name="7">
+<Value>Magazijn</Value>
+</Value>
+<Value name="8">
+<Value>ABCLPN</Value>
+</Value>
+<Value name="9">
+<Value>Pickgroep</Value>
+</Value>
+<Value name="10">
+<Value>PRNr</Value>
+</Value>
+<Value name="11">
+<Value>AantalLPN</Value>
+</Value>
+<Value name="12">
+<Value>AantalStuks</Value>
+</Value>
+</Data>
+</Storage>
+</Class>
+
+
+</Export>
Index: MRPRESConvertEcopack.mac.rou
===================================================================
diff -u
--- MRPRESConvertEcopack.mac.rou	(revision 0)
+++ MRPRESConvertEcopack.mac.rou	(revision 72045)
@@ -0,0 +1,62 @@
+#include Prod.Product
+Test
+	Kill Cache
+	Merge Cache=^MRPRESLog(66697,31235,"FETCH")
+	Set CRef=$na(Cache)
+	Do SwitchEcopackToBox
+	
+	Quit
+
+SwitchEcopackToBox
+	New PRNr
+	Set PRNr=""
+	For  Set PRNr=$O(@CRef@("SCANONE",PRNr)) Quit:PRNr=""  Do
+	. Set ReplacePRNrs=$$GeefVervangProducten(PRNr)
+	. If ReplacePRNrs'="" Do
+  	. . Set FabKey=""
+  	. . Kill ToeQty
+    . . For  Set FabKey=$O(@CRef@("SCANONE",PRNr,FabKey)) Quit:FabKey=""  Do
+    . . . Set ToeQty($P(FabKey,";"))=$G(ToeQty($P(FabKey,";")))+$P(@CRef@("SCANONE",PRNr,FabKey),"/")
+	. . 
+    . . Set MultipleQty=$$$ProductGet($P(ReplacePRNrs,";"),$$$GrootVerpakking)
+    . . Set TOENr=""
+    . . For  Set TOENr=$O(ToeQty(TOENr)) Quit:TOENr=""  Do
+    . . . If ToeQty(TOENr)>MultipleQty Do
+    . . . . Write TOENr," ",ToeQty(TOENr),!
+    . . . . Do SplitQty(PRNr,ToeQty(TOENr),ReplacePRNrs,.ReplaceLijst)
+    . . . . zw ReplaceLijst
+    . . . . Do ReplaceInCache(CRef,PRNr,TOENr,.ReplaceLijst)
+    . . zw @CRef@("SCANONE",2258629)
+    . . zw @CRef@("SCANONE",1811826)
+    . . zw @CRef@("SCANONE",1811828)
+  	
+GeefVervangProducten(PRNr)
+	Quit:PRNr=2258629 "1811826;1811828"
+	Quit ""
+	
+SplitQty(PRNr,Qty,ReplacePRNrs,ReplaceLijst)
+ 	; ReplaceLijst via .Local
+	Set MultipleQty=$$$ProductGet($P(ReplacePRNrs,";"),$$$GrootVerpakking)
+	Set ReplaceQty=Qty\MultipleQty*MultipleQty
+	Set RestQty=Qty-ReplaceQty
+	Kill ReplaceLijst
+	Set:RestQty>0 ReplaceLijst(PRNr)=RestQty
+	For I=1:1:$L(ReplacePRNrs,";") Do
+	. Set ReplaceLijst($P(ReplacePRNrs,";",I))=ReplaceQty
+ 	Quit
+
+
+ReplaceInCache(CRef,PRNr,TOENr,ReplaceLijst)
+ 	; ReplaceLijst via .Local
+ 	
+ 	; Verwijder Toelevering
+ 	Set FabKey=TOENr_";"
+    For  Set FabKey=$O(@CRef@("SCANONE",PRNr,FabKey)) Quit:FabKey=""  Quit:$P(FabKey,";")'=TOENr  Do
+    . Kill @CRef@("SCANONE",PRNr,FabKey)
+    ; Add nieuw aantallen
+   	Set NewPRNr=""
+   	Set FabKey=TOENr_";999"
+   	For  Set NewPRNr=$O(ReplaceLijst(NewPRNr)) Quit:NewPRNr=""  Do
+   	. Set @CRef@("SCANONE",NewPRNr,FabKey)=ReplaceLijst(NewPRNr)
+	Quit
+ 	
Index: OBJTimpl/Prepick/OphalenProductenNietInPOD.cls.xml
===================================================================
diff -u
--- OBJTimpl/Prepick/OphalenProductenNietInPOD.cls.xml	(revision 0)
+++ OBJTimpl/Prepick/OphalenProductenNietInPOD.cls.xml	(revision 72045)
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="OBJTimpl.Prepick.OphalenProductenNietInPOD">
+<Super>TECH.RegisteredObject</Super>
+
+<Property name="ConfigMgr">
+<Type>TECH.Config.ConfigMgr</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="SqlConnection">
+<Type>%SQLGatewayConnection</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>ConfigMgr:TECH.Config.ConfigMgr=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..ConfigMgr = $$$Inject(ConfigMgr,##class(TECH.Config.ConfigMgr).Instance())
+	Set ..SqlConnection = ..GeefSQLConnectie()
+
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="GeefSQLConnectie">
+<ReturnType>%SQLGatewayConnection</ReturnType>
+<Implementation><![CDATA[
+	Set SqlConnection =##class(%SQLGatewayConnection).%New()
+    #dim OBJTSqlServer As %String = ..ConfigMgr.GeefString("OBJTimpl.DatasourceName")
+    Do ##class(TECH.Exceptions.StatusException).ThrowIndienNietOK(SqlConnection.Connect(OBJTSqlServer,"",""))
+    Quit SqlConnection
+]]></Implementation>
+</Method>
+
+<Method name="GeefIterator">
+<Implementation><![CDATA[
+    Set res=##class(TECH.ResultSet).%New("%DynamicQueryGW:SQLGW")
+	#dim Status as %String = ""
+    #dim SqlStatement as %String 
+    /* DETAILS
+    Set SqlStatement= "  SELECT "
+    _"   location.fullname LOCATION,"
+    _"   warehouse.name WAREHOUSE,"
+    _"   csitq.NAME LPN,"
+    _"   item.name OBJTITEMID,"
+    _"   item.description KORTTEKST,"
+    _"   storageitemqty.VALUE as AANTAL, "
+	_"   department.NAME as ENTITEIT,"
+	_"	 it.ABCLPN,"
+	_"   it.ABCSKU,"
+	_"   it.UsrTxt6 as PICKGROEP"
+	_"FROM OBJT_STORAGEITEMQTY storageitemqty WITH (NOLOCK)"
+    _"  LEFT OUTER JOIN OBJT_CONTAINERSTORAGEITEMQTY csitq WITH (NOLOCK) ON storageitemqty.CONTAINERSTORAGEITEMQTYOID = csitq.oid"
+    _"  LEFT OUTER JOIN OBJT_WAREHOUSELOCATION location WITH (NOLOCK) ON storageitemqty.WAREHOUSELOCATIONOID = location.OID"
+    _"  LEFT OUTER JOIN OBJT_WAREHOUSE warehouse WITH (NOLOCK) ON location.WAREHOUSEOID = warehouse.OID"
+	_"  LEFT OUTER JOIN OBJT_RESOURCELINK departmentwarehouselink WITH (NOLOCK) on warehouse.OID = departmentwarehouselink.CHILDOID and departmentwarehouselink.PARENTCLASSNAME = 'dce.bo.resourcemgt.Department'"
+	_"  LEFT OUTER JOIN OBJT_DEPARTMENT department WITH (NOLOCK) on departmentwarehouselink.PARENTOID = department.oid"
+    _"  LEFT OUTER JOIN OBJT_ITEM item WITH (NOLOCK) on storageitemqty.ITEMOID = item.OID"
+	_" WHERE storageitemqty.DTSVALIDUNTIL is null"
+	_" AND (csitq.CLASSOID IS NULL OR csitq.CLASSOID = 9000000000000095836)"
+	_" AND warehouse.name='07'"
+	_" AND storageitemqty.ITEMOID not in (select pzil.itemoid from OBJT_PICKZONEITEMLINK pzil "
+	_"	left outer join OBJT_PICKZONE as pz on pzil.pickzoneoid=pz.oid"
+	_"	where pz.name in ('A Hoog','B','A Vloer/Zwaar','Orgalux')"
+	_"	and pzil.isonline='T')"
+	*/ 
+	
+    Set SqlStatement= "  SELECT "
+    _"   item.name OBJTITEMID,"
+    _"   item.description KORTTEKST,"
+    _"   sum(storageitemqty.VALUE) AANTAL,"
+	_"   count(*) as AANTAL_LPN"
+	_" FROM OBJT_STORAGEITEMQTY storageitemqty WITH (NOLOCK)"
+    _"  left outer JOIN OBJT_CONTAINERSTORAGEITEMQTY csitq WITH (NOLOCK) ON storageitemqty.CONTAINERSTORAGEITEMQTYOID = csitq.oid"
+    _"  LEFT OUTER JOIN OBJT_WAREHOUSELOCATION location WITH (NOLOCK) ON storageitemqty.WAREHOUSELOCATIONOID = location.OID"
+    _"  LEFT OUTER JOIN OBJT_WAREHOUSE warehouse WITH (NOLOCK) ON location.WAREHOUSEOID = warehouse.OID"
+    _"  LEFT OUTER JOIN OBJT_ITEM item WITH (NOLOCK) on storageitemqty.ITEMOID = item.OID"
+	_" WHERE storageitemqty.DTSVALIDUNTIL is null"
+	_" AND (csitq.CLASSOID IS NULL OR csitq.CLASSOID = 9000000000000095836)"
+	_" AND warehouse.name='07'"
+	_" AND storageitemqty.ITEMOID not in (select pzil.itemoid from OBJT_PICKZONEITEMLINK pzil "
+	_"	left outer join OBJT_PICKZONE as pz on pzil.pickzoneoid=pz.oid"
+	_"	where pz.name in ('A Hoog','B','A Vloer/Zwaar','Orgalux')"
+	_"	and pzil.isonline='T')"
+	_" GROUP BY  item.name, item.description"
+	
+    try
+    {
+    	Do res.Prepare(SqlStatement,,..SqlConnection)
+	    Do res.Execute()    
+    } catch {
+	    do ..SqlConnection.Disconnect()
+	    do ##class(TECH.ExceptionHandler).Rethrow()
+    }
+    
+    Quit ##class(TECH.ResultSetIterator).%New(res)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: OBJTimpl/WMSOrder/ImporteerVoorraadNiveau.cls.xml
===================================================================
diff -u -r70681 -r72045
--- OBJTimpl/WMSOrder/ImporteerVoorraadNiveau.cls.xml	(.../ImporteerVoorraadNiveau.cls.xml)	(revision 70681)
+++ OBJTimpl/WMSOrder/ImporteerVoorraadNiveau.cls.xml	(.../ImporteerVoorraadNiveau.cls.xml)	(revision 72045)
@@ -185,6 +185,7 @@
 	
 	#dim PickingCorrectie as %Decimal=$G(^OBJTVoorraad(..Vandaag,"CORR",..pxVoorraad.ItemId,..pxVoorraad.Entiteit))
 	Set ..pxVoorraad.AantalAdmin=itVerdeler.GeefOudeVoorraad()
+	Set ^OBJTVoorraad(..Vandaag,"FROM",..pxVoorraad.Entiteit,..pxVoorraad.ItemId)=$LB(..pxVoorraad.AantalAdmin,..pxVoorraad.Aantal)
 	If ..pxVoorraad.Aantal'=(..pxVoorraad.AantalAdmin-PickingCorrectie)
 	{
 		;Write " = ",..pxVoorraad.Aantal," <-> ", ..pxVoorraad.AantalAdmin
@@ -316,7 +317,7 @@
 <Implementation><![CDATA[
 	Set Datum=$G(Datum,..Vandaag)
  	Set From="Admin@vanhoecke.be"
-	Set To=$LB("vdr@vanhoecke.be","pv@vanhoecke.be","Matthias.DeVleeschhauwer@vanhoecke.be")
+	Set To=$LB("vdr@vanhoecke.be","pv@vanhoecke.be","Emry.Truyman@vanhoecke.be","MagAspVoorraad@vanhoecke.be")
 	;Set To=$LB("pv@vanhoecke.be")
 	Set Subject="Voorraadverschillen OBJT <-> Admin "_$zd(Datum,2)
 	
@@ -364,56 +365,87 @@
 	Do strmBody.Write("<th>Opmerking</th>")
 	Do strmBody.Write("</tr>")
 	
-	Set PRNr=$O(^OBJTVoorraad(Datum,"VERWERKT",""))
 	Set Entiteit="VHBE"
 	Set Cnt=0
 	Kill ^||Voorraad
+	; Index voor SOPR	
+	Set PRNr=$O(^OBJTVoorraad(Datum,"VERWERKT",""))
 	While PRNr'=""
 	{
+		If $D(^OBJTVoorraad(Datum,"VERWERKT",PRNr,Entiteit))
+		{
+			Set ^||Voorraad("I",$LI(^OBJTVoorraad(Datum,"VERWERKT",PRNr,Entiteit),1),PRNr)=""
+		}
+		Set PRNr=$O(^OBJTVoorraad(Datum,"VERWERKT",PRNr))
+ 	}
+	; Gesorteerde lijst volgens klassificatie en korttekst
+	Set PRNr=$O(^OBJTVoorraad(Datum,"VERWERKT",""))
+	While PRNr'=""
+	{
 		If $D(^OBJTVoorraad(Datum,"VERWERKT",PRNr,Entiteit)) && ($LI(^OBJTVoorraad(Datum,"VERWERKT",PRNr,Entiteit),2)'=($LI(^OBJTVoorraad(Datum,"VERWERKT",PRNr,Entiteit),3)-$LI(^OBJTVoorraad(Datum,"VERWERKT",PRNr,Entiteit),4)))
 		{
 			Set lb=^OBJTVoorraad(Datum,"VERWERKT",PRNr,Entiteit)
 			Set $LI(lb,10)=PRNr
-			Set ^||Voorraad($$SORTKEY^PRODUKT(PRNr))=lb
+			Set ^||Voorraad("S",$$SORTKEY^PRODUKT(PRNr))=lb
 		}
 		Set PRNr=$O(^OBJTVoorraad(Datum,"VERWERKT",PRNr))
  	}
 
 	
-	Set Key=$O(^||Voorraad(""))
+	Set Key=$O(^||Voorraad("S",""))
 	Set Cnt=0
 	While Key'=""
 	{
-		Set Cnt=Cnt+1
-		Set PRNr=$LI(^||Voorraad(Key),10)
-		Set OBJTItemID=$LI(^||Voorraad(Key),1)
-		Set IdentNummer=$$$PRGet($$$IdentNummer)		
-		Do strmBody.Write("<tr>")
-		Do strmBody.Write("<td>"_OBJTItemID_$S(OBJTItemID'=IdentNummer:"("_IdentNummer_")",1:"")_"</td>")
-		Do strmBody.Write("<td>"_$$$PRGet($$$KortTekst)_"</td>")
-		Do strmBody.Write("<td>&nbsp;"_$LI(^||Voorraad(Key),2)_"&nbsp;</td>")
-		Do strmBody.Write("<td>&nbsp;"_$LI(^||Voorraad(Key),3)_"&nbsp;</td>")
-		Do strmBody.Write("<td>&nbsp;"_($LI(^||Voorraad(Key),2)-$LI(^||Voorraad(Key),3))_"&nbsp;</td>")
-		Do strmBody.Write("<td>&nbsp;"_$LI(^||Voorraad(Key),4)_"&nbsp;</td>")
+		Set OBJTItemID=$LI(^||Voorraad("S",Key),1)
 		
-		Set HistDatum=Datum-1
-		While HistDatum>(Datum-6)
+		If $D(^||Voorraad("I",OBJTItemID))
 		{
-			If $D(^OBJTVoorraad(HistDatum,"VERWERKT",PRNr,Entiteit)) && ($LI(^OBJTVoorraad(HistDatum,"VERWERKT",PRNr,Entiteit),2)'=($LI(^OBJTVoorraad(HistDatum,"VERWERKT",PRNr,Entiteit),3))-$LI(^OBJTVoorraad(HistDatum,"VERWERKT",PRNr,Entiteit),4))
-			{
-				Do strmBody.Write("<td style=""color:#AAAAAA"">&nbsp;"_($LI(^OBJTVoorraad(HistDatum,"VERWERKT",PRNr,Entiteit),2)-($LI(^OBJTVoorraad(HistDatum,"VERWERKT",PRNr,Entiteit),3))-$LI(^OBJTVoorraad(HistDatum,"VERWERKT",PRNr,Entiteit),4))_"&nbsp;</td>")
+			Set Cnt=Cnt+1
+			Do strmBody.Write("<tr>")
+			Do strmBody.Write("<td>"_OBJTItemID)
+			
+			; Eventueel SOPR lijst en als Identnummer verschillend is van OBJTItemID
+			Set PRNr=$O(^||Voorraad("I",OBJTItemID,""))
+			Set SOPRIDs=""
+			Set SOPRCnt=0
+			While PRNr'=""
+			{ 
+				Set SOPRCnt=SOPRCnt+1
+				Set IdentNummer=$$$PRGet($$$IdentNummer)		
+				Set SOPRIDs=SOPRIDs_", "_IdentNummer
+				
+				Set PRNr=$O(^||Voorraad("I",OBJTItemID,PRNr))	
 			}
-			Else
+			Kill ^||Voorraad("I",OBJTItemID) ; mag niet meer terug komen in de lijst
+			Do strmBody.Write($S((SOPRCnt=1)&&(IdentNummer'=OBJTItemID):"("_IdentNummer_")",SOPRCnt>1:"("_$E(SOPRIDs,3,99)_")",1:"")_"</td>")
+			
+			Set PRNr=$LI(^||Voorraad("S",Key),10)
+
+			Do strmBody.Write("<td>"_$$$PRGet($$$KortTekst)_"</td>")
+			Do strmBody.Write("<td>&nbsp;"_$LI(^||Voorraad("S",Key),2)_"&nbsp;</td>")
+			Do strmBody.Write("<td>&nbsp;"_$LI(^||Voorraad("S",Key),3)_"&nbsp;</td>")
+			Do strmBody.Write("<td>&nbsp;"_($LI(^||Voorraad("S",Key),2)-$LI(^||Voorraad("S",Key),3))_"&nbsp;</td>")
+			Do strmBody.Write("<td>&nbsp;"_$LI(^||Voorraad("S",Key),4)_"&nbsp;</td>")
+		
+			Set HistDatum=Datum-1
+			While HistDatum>(Datum-6)
 			{
-				Do strmBody.Write("<td></td>")
+				If $D(^OBJTVoorraad(HistDatum,"VERWERKT",PRNr,Entiteit)) && ($LI(^OBJTVoorraad(HistDatum,"VERWERKT",PRNr,Entiteit),2)'=($LI(^OBJTVoorraad(HistDatum,"VERWERKT",PRNr,Entiteit),3))-$LI(^OBJTVoorraad(HistDatum,"VERWERKT",PRNr,Entiteit),4))
+				{
+					Do strmBody.Write("<td style=""color:#AAAAAA"">&nbsp;"_($LI(^OBJTVoorraad(HistDatum,"VERWERKT",PRNr,Entiteit),2)-($LI(^OBJTVoorraad(HistDatum,"VERWERKT",PRNr,Entiteit),3))-$LI(^OBJTVoorraad(HistDatum,"VERWERKT",PRNr,Entiteit),4))_"&nbsp;</td>")
+				}
+				Else
+				{
+					Do strmBody.Write("<td></td>")
+				}
+				Set HistDatum=HistDatum-1
 			}
-			Set HistDatum=HistDatum-1
+		
+			Do strmBody.Write("<td>"_$S($LG(^||Voorraad("S",Key),5)'="":$LG(^||Voorraad("S",Key),5),'..CheckOBJTFase.VoorraadSync(PRNr,Entiteit):"Voorraad niet toegelaten in OBJT",1:"")_"</td>")
+			Do strmBody.Write("</tr>")
 		}
 		
-		Do strmBody.Write("<td>"_$S($LG(^||Voorraad(Key),5)'="":$LG(^||Voorraad(Key),5),'..CheckOBJTFase.VoorraadSync(PRNr,Entiteit):"Voorraad niet toegelaten in OBJT",1:"")_"</td>")
-		Do strmBody.Write("</tr>")
-		
-		Set Key=$O(^||Voorraad(Key))
+		Set Key=$O(^||Voorraad("S",Key))
  	}
  	Do strmBody.Write($$$fmtEndTable)
  	Do strmBody.Write($$$fmtEndHtml)
Index: OBJTimpl/Prepick/ZendPrepick.cls.xml
===================================================================
diff -u
--- OBJTimpl/Prepick/ZendPrepick.cls.xml	(revision 0)
+++ OBJTimpl/Prepick/ZendPrepick.cls.xml	(revision 72045)
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="OBJTimpl.Prepick.ZendPrepick">
+<Description>
+Herbevoorrading van de Kardex</Description>
+<Super>%RegisteredObject</Super>
+
+<Property name="ProductVoorraad">
+<Type>OBJTimpl.Herbevoorrading.ProductVoorraad</Type>
+</Property>
+
+<Property name="OBJTSender">
+<Type>OBJTimpl.Herbevoorrading.ProductVoorraad</Type>
+</Property>
+
+<Property name="DebugNietVerzenden">
+<Type>%Boolean</Type>
+</Property>
+
+<Property name="ZendCache">
+<Type>%String</Type>
+<MultiDimensional>1</MultiDimensional>
+</Property>
+
+<Property name="OBJTIdentLookup">
+<Type>OBJTimpl.PM.OBJTIdentLookupService</Type>
+</Property>
+
+<UDLText name="T">
+<Content><![CDATA[
+// d ##class(OBJTimpl.Prepick.ZendPrepick).%New(1).Verwerk()
+
+]]></Content>
+</UDLText>
+
+<Method name="%OnNew">
+<FormalSpec>NietVerzenden:%Boolean=0</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ..DebugNietVerzenden=NietVerzenden
+	Set ..OBJTIdentLookup=##class(OBJTimpl.PM.OBJTIdentLookupService).%New()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="%OnClose">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="Verwerk">
+<Implementation><![CDATA[
+	Lock +PrePick:0 Else  Quit
+	
+	Do ..OphalenProductenNietInPOD()
+	Do ..OphalenPrePick()
+	Do ..ZendPrePickOrder()
+	;Do ..Show()
+	Lock -PrePick
+	
+	Write:..DebugNietVerzenden !,"Druk [enter] om verder te gaan" Read:..DebugNietVerzenden K
+]]></Implementation>
+</Method>
+
+<Method name="OphalenPrePick">
+<Implementation><![CDATA[
+	Kill ..ZendCache
+	Set CONSNr=$O(^ORDW("D",""))
+	While CONSNr
+	{  
+		If ($P(^ORDW("D",CONSNr),"\",20)?1(1"W",1"P")) && ($P($G(^ORDW("D",CONSNr,"S","V")),"\")="W")
+		{
+			Set ORDNr=$O(^ORDW("D",CONSNr,"D",""))
+			While ORDNr'=""
+			{
+			   Set OLNr=$O(^ORDW("D",CONSNr,"D",ORDNr,""))
+			   While OLNr'=""
+				{
+					Set SOLNr=$O(^ORDW("D",CONSNr,"D",ORDNr,OLNr,""))
+					While SOLNr'=""
+					{
+						Set Rec=^ORDW("D",CONSNr,"D",ORDNr,OLNr,SOLNr)
+						Set PRNr=$P(Rec,"\",1) 
+						If ($P(Rec,"\",13)="V") && ($P(Rec,"\",2)="W")
+						{
+							Set Aantal=$P(Rec,"\",3)
+							Set PrePickNietInPOD=##class(OBJTimpl.Prepick.ProductNietInPOD).%OpenId(PRNr)
+							w !,CONSNr,ORDNr,OLNr,SOLNr
+							If $isobject(PrePickNietInPOD) && ( Aantal>0)
+							{
+								w "  *",PrePickNietInPOD.OBJTItemID
+								Set ..ZendCache(PrePickNietInPOD.OBJTItemID)=$G(..ZendCache(PrePickNietInPOD.OBJTItemID))+Aantal
+							}
+						}
+						Set SOLNr=$O(^ORDW("D",CONSNr,"D",ORDNr,OLNr,SOLNr))
+					}
+					Set OLNr=$O(^ORDW("D",CONSNr,"D",ORDNr,OLNr))
+				}
+				Set ORDNr=$O(^ORDW("D",CONSNr,"D",ORDNr))
+			}
+		}
+		Set CONSNr=$O(^ORDW("D",CONSNr))
+	}
+]]></Implementation>
+</Method>
+
+<Method name="ZendPrePickOrder">
+<Implementation><![CDATA[
+	m %cache=..ZendCache
+	zw %cache
+]]></Implementation>
+</Method>
+
+<Method name="OphalenProductenNietInPOD">
+<Implementation><![CDATA[
+	#Dim it as TECH.Iterator
+	Set itOBJT=##class(OBJTimpl.Prepick.OphalenProductenNietInPOD).%New().GeefIterator()
+	
+	Do ##class(OBJTimpl.Prepick.ProductNietInPOD).%KillExtent()
+	Set Count=0,CountOBJT=0
+	While itOBJT.HasNext()
+	{
+		Set CountOBJT=CountOBJT+1
+		Set rsOBJT=itOBJT.Next()
+		Set itID=..OBJTIdentLookup.GeefAdminIdentNrs(rsOBJT.Data("OBJTITEMID"))
+		While itID.HasNext()
+		{
+			Set rsID=itID.Next()
+			Set PRNr=rsID.Data("Product")
+			If PRNr
+			{
+				Set ProductNietInPOD=##class(OBJTimpl.Prepick.ProductNietInPOD).%New()
+				Set ProductNietInPOD.OBJTItemID=rsOBJT.Data("OBJTITEMID")
+				Do ProductNietInPOD.ProductSetObjectId(PRNr)
+				Set ProductNietInPOD.AantalStuks=+rsOBJT.Data("AANTAL")
+				Set ProductNietInPOD.AantalLPN=rsOBJT.Data("AANTAL_LPN")
+				Do ProductNietInPOD.Save()
+				Set Count=Count+1
+			}
+		}
+	}
+	w CountOBJT," -> ",Count
+]]></Implementation>
+</Method>
+
+<Method name="Show">
+<Implementation><![CDATA[
+	#Dim it as TECH.Iterator
+	Set it=##class(OBJTimpl.Herbevoorrading.ProductVoorraadIterator).%New()
+	While it.HasNext()
+	{
+		Set ..ProductVoorraad=it.Next()
+		Write !,..ProductVoorraad.OBJTItemID,!
+		Do DumpObject^%apiOBJ(..ProductVoorraad)
+	}
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>