Index: APPS/TRANSP/VRD/dto/LeveringDetail.cls.xml
===================================================================
diff -u
--- APPS/TRANSP/VRD/dto/LeveringDetail.cls.xml	(revision 0)
+++ APPS/TRANSP/VRD/dto/LeveringDetail.cls.xml	(revision 60146)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.TRANSP.VRD.dto.LeveringDetail">
+<Super>TECH.RegisteredObject</Super>
+
+<Property name="KlantNR">
+<Type>%String</Type>
+</Property>
+
+<Property name="LeverAdresID">
+<Type>%String</Type>
+</Property>
+
+<Property name="KlantNaam">
+<Type>%String</Type>
+</Property>
+
+<Property name="Straat">
+<Type>%String</Type>
+</Property>
+
+<Property name="PostCode">
+<Type>%String</Type>
+</Property>
+
+<Property name="Gemeente">
+<Type>%String</Type>
+</Property>
+
+<Property name="LandCode">
+<Type>%String</Type>
+</Property>
+
+<Property name="Gewicht">
+<Type>%Decimal</Type>
+</Property>
+
+<Property name="AantalMaatwerk">
+<Type>%Decimal</Type>
+</Property>
+</Class>
+
+
+</Export>
Index: APPS/TRANSP/VRD/TransportInschatting.cls.xml
===================================================================
diff -u -r60034 -r60146
--- APPS/TRANSP/VRD/TransportInschatting.cls.xml	(.../TransportInschatting.cls.xml)	(revision 60034)
+++ APPS/TRANSP/VRD/TransportInschatting.cls.xml	(.../TransportInschatting.cls.xml)	(revision 60146)
@@ -3,134 +3,280 @@
 <Class name="APPS.TRANSP.VRD.TransportInschatting">
 <Super>TECH.RegisteredObject</Super>
 
-<Method name="VerzendLijstNaarVRD">
-<ClassMethod>1</ClassMethod>
-<FormalSpec>XMLBestandsNaam:%String</FormalSpec>
-<Implementation><![CDATA[	Set FtpConfig = ##class(APPS.TRANSP.VRD.FTPConfig).%New().VerplaatsBestandNaarVRD(XMLBestandsNaam)
+<Property name="FtpApi">
+<Type>TECH.Ftp.FtpAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Logger">
+<Type>vhLib.Logger</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>FtpApi:TECH.Ftp.FtpAPI=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..FtpApi = $$$Inject(FtpApi, ##class(TECH.Context).Instance().GeefFtpAPI())
+	Set ..Logger = ##class(vhLib.Logger).%New($this.%ClassName(1))
+	
+	Quit $$$OK
 ]]></Implementation>
 </Method>
 
-<Method name="ConverteerLijstNaarXml">
-<ClassMethod>1</ClassMethod>
+<Method name="VerzendVRDLijst">
+<Implementation><![CDATA[
+	try {
+
+		#dim Root as APPS.TRANSP.VRD.XML.Root = ..ConverteerLijstNaarXml()
+		Do ..VerzendInschattingNaarVRD(Root)
+				
+	} catch {
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+		Do ..Logger.LogEnMailExceptie(Exception,"Vervelend voor VRD, maar niet blokkerend")
+	}
+]]></Implementation>
 </Method>
 
-<Method name="GeefLijst">
-<ClassMethod>1</ClassMethod>
+<Method name="VerzendInschattingNaarVRD">
+<FormalSpec>Root:APPS.TRANSP.VRD.XML.Root</FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[
-	Set (CONSNr,ORDNr,OLUNr,SOLNr)=""
-	Set (Count1,Count2,Count3,CountArrayVRD)=0
-	kill Array
-	Set CONSNr = 0
-	While $$$HasLength($ORDER(^ORDW("D",CONSNr))) {
-		Set CONSNr =$ORDER(^ORDW("D",CONSNr)) 
-		Set Rec=^ORDW("D",CONSNr)
-		Set KLNr=$PIECE(Rec,"\")
+	#dim FtpConfig as TECH.Ftp.FtpConfiguratie = ""
+	If ##class(TECH.Config.ConfigMgr).Instance().GeefOmgeving()["PROD" {
+		Set FtpConfig = ..GeefFtpConfigProduction()
+	} else {
+		Set FtpConfig = ..GeefFtpConfigTest()
+	}
 		
-		Set Status=$PIECE(Rec,"\",20)
-		CONTINUE:Status="" ; Staat W,P,A,B zijn toegelaten
-		Set DueOut=+$PIECE(Rec,"\",3)
-		If CONSNr = "300018" || CONSNr = "300017" {
-			Do ##class(Tools.Wlip).%New(43).String("DueOut"_ DueOut)
+	#dim BestandNaam As %String = "test"_$p($h,",",1)_"-"_$p($h,",",2)_".xml"
+	Do ..Logger.Info("VRD Inschatting","Verstuur stream als bestand : " _ BestandNaam)
+
+	Set Stream = ##class(%GlobalCharacterStream).%New()
+	
+	Set Writer=##class(%XML.Writer).%New()
+	Set Writer.Indent=1
+	Do Writer.OutputToStream(Stream)
+	Do Writer.AddInstanceNamespace()
+	Set Writer.Charset="UTF-8"
+
+	Do Writer.RootObject(Root,"Root")
+
+	Do ..FtpApi.Connecteer(FtpConfig)
+	Do Stream.Rewind()
+	Do ..FtpApi.VerzendStream(Stream, BestandNaam )
+	Do ..FtpApi.VerbreekVerbinding()
+	Do ..Logger.Info("VRD Inschatting",Stream)
+]]></Implementation>
+</Method>
+
+<Method name="ConverteerLijstNaarXml">
+<Private>1</Private>
+<ReturnType>APPS.TRANSP.VRD.XML.Root</ReturnType>
+<Implementation><![CDATA[
+	
+	set DetailIterator = ##class(TECH.ListIterator).%New(..VRDLijst())
+	If DetailIterator.HasNext(){
+		#dim Root as APPS.TRANSP.VRD.XML.Root=..GeefRoot()
+		While(DetailIterator.HasNext()){
+			#dim Detail as APPS.TRANSP.VRD.dto.LeveringDetail = DetailIterator.Next()
+			#dim Order as APPS.TRANSP.VRD.XML.Order = ..GeefOrder(Detail)			
+			Do Root.Orders.Insert(Order)
 		}
-		CONTINUE:DueOut'=+$HOROLOG ; niet voor vandaag
-		Do ##class(Tools.Wlip).%New(43).String("due out vandaag")
-		Do ##class(Tools.Wlip).%New(43).String("klant "_KLNr)
-		Set Vzw=$PIECE(Rec,"\",2)
-		Do ##class(Tools.Wlip).%New(43).String("Vzw "_Vzw)
-		CONTINUE:Vzw'="DI1"
-		Set Count1=Count1+1 
-		Do ##class(Tools.Wlip).%New(43).String("VOOR CheckOpTransport ")
-		CONTINUE:..CheckOpTransport(KLNr,CONSNr)
-		Set Count2=Count2+1
-		Do ##class(Tools.Wlip).%New(43).String("voor kenmerken")
-		Do ..GetKenmerken(KLNr,CONSNr,.Gewicht,.AantalMaatwerk)
-		Set AdresID=$PIECE($GET(^ORDW("D",CONSNr,"A")),"\",29)
-		Do ##class(Tools.Wlip).%New(43).String("AdresID "_AdresID)
-		Do ##class(Tools.Wlip).%New(43).String("KLNr "_KLNr)
-		Do ##class(Tools.Wlip).%New(43).String("Gewicht "_Gewicht)
-		Do ##class(Tools.Wlip).%New(43).String("AantalMaatwerk "_AantalMaatwerk)
-		Set AantalMaatwerk = 4
-		Set Gewicht = 20
-		Do ##class(Tools.Wlip).%New(43).String("AdresID_KLNr "_AdresID_KLNr)
-		Do ##class(Tools.Wlip).%New(43).String("CONSNr "_CONSNr)
-		Set Array(AdresID_KLNr,CONSNr)=$LISTBUILD(KLNr,AdresID,Gewicht, AantalMaatwerk)
-			Do ##class(Tools.Wlip).%New(43).String(Array(AdresID_KLNr,CONSNr))
 	}
-	Do ##class(Tools.Wlip).%New(43).String("na eerste loop")
+	Quit Root
+]]></Implementation>
+</Method>
 
-	; kleine en geen maatwerk er uit gooien
-	Kill ArrayVRD
-	Set (Key, CONSNr)=""
-	Set Key =$ORDER(Array(Key)) 
-	WHILE ($$$Not(Key="")) {
-		Do ##class(Tools.Wlip).%New(43).String("In tweede loop"_CONSNr)
-		Set KLNr=""
-		Set Gewicht=""
-		Set AantalMaatwerk=""
-		Set CONSNr = 0
-		Set CONSNr =$ORDER(Array(Key,CONSNr))
-		WHILE ($$$Not(CONSNr="")) {
-			Do ##class(Tools.Wlip).%New(43).String("Binnen tweede loop, start derde loop"_CONSNr)
-			Set Gewicht=Gewicht+$LIST(Array(Key,CONSNr),3)
-			Set AantalMaatwerk=AantalMaatwerk+$LIST(Array(Key,CONSNr),4)
-			Set KLNr=$LIST(Array(Key,CONSNr),1)
-			Set AdresID=$LIST(Array(Key,CONSNr),2)
-			Set Adres=$GET(^ORDW("D",CONSNr,"A"))
-			Set CONSNr =$ORDER(Array(Key,CONSNr))
-			Do ##class(Tools.Wlip).%New(43).String("Einde tweede loop, start derde loop"_CONSNr)
+<Method name="GeefOrder">
+<FormalSpec>Detail:APPS.TRANSP.VRD.dto.LeveringDetail</FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.TRANSP.VRD.XML.Order</ReturnType>
+<Implementation><![CDATA[
+	Set Order = ##class(APPS.TRANSP.VRD.XML.Order).%New()
+	Set Order.CommunicationPartner = "VANHOECKE"
+	Set Order.CustomerNo = "VanHoecke"
+	Set Order.TransportType = "Leveren"
+	;Set Order.ExternalOrderNumber ="?"
+	Do Order.OrderCargos.Insert(..GeefOrderCargo(Detail))
+	Do Order.OrderLines.Insert(..GeefOrderLine(Detail))
+	Quit Order
+]]></Implementation>
+</Method>
+
+<Method name="GeefOrderCargo">
+<FormalSpec>Detail:APPS.TRANSP.VRD.dto.LeveringDetail</FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.TRANSP.VRD.XML.OrderCargo</ReturnType>
+<Implementation><![CDATA[
+	Set OrderCargo = ##class(APPS.TRANSP.VRD.XML.OrderCargo).%New()
+	Set OrderCargo.NetWeight = Detail.Gewicht\1
+	Set OrderCargo.Quantity = 1 + (Detail.AantalMaatwerk\10)
+	Set OrderCargo.UnitOfMeasure = "Wwpallet"
+	
+	Quit OrderCargo
+]]></Implementation>
+</Method>
+
+<Method name="GeefOrderLine">
+<FormalSpec>Detail:APPS.TRANSP.VRD.dto.LeveringDetail</FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.TRANSP.VRD.XML.OrderLine</ReturnType>
+<Implementation><![CDATA[
+	Set Line = ##class(APPS.TRANSP.VRD.XML.OrderLine).%New()
+	Set Line.Action = "LOAD"
+	Set Line.AddressName = Detail.KlantNaam
+	Set Line.AddressStreet = Detail.Straat
+	Set Line.AddressCountryCode = Detail.LandCode
+	Set Line.AddressCity = Detail.Gemeente
+	Set Line.AddressPostalCode = Detail.PostCode
+	Quit Line
+]]></Implementation>
+</Method>
+
+<Method name="GeefRoot">
+<Private>1</Private>
+<ReturnType>APPS.TRANSP.VRD.XML.Root</ReturnType>
+<Implementation><![CDATA[	Quit ##class(APPS.TRANSP.VRD.XML.Root).%New()
+]]></Implementation>
+</Method>
+
+<Method name="VRDLijst">
+<Private>1</Private>
+<ReturnType>%ListOfObjects</ReturnType>
+<Implementation><![CDATA[
+	#dim HoofdingIterator as TECH.Iterator = ##class(Flow.OrderWMS.HoofdingRepository).%New().ZoekVia2Verzendwijzen("DI1","DD1")
+	#dim LeveringDetailArray as %ArrayOfObjects = ##class(%ArrayOfObjects).%New()
+	
+	While(HoofdingIterator.HasNext()){
+		#dim Hoofding as Flow.OrderWMS.Hoofding = HoofdingIterator.Next()
+		If $$$HasLength(Hoofding.StatusWMS){ ; W,P,A,B
+			If (+Hoofding.DueOutTime = +$H) { ; voor vandaag
+					If $$$Not(..OpTransport(Hoofding.Klant.Nummer,Hoofding.ConsolidatieNr)){
+						#dim Sleutel as %String  = Hoofding.Klant_"#"_Hoofding.GeefAXLeverAdresID() ; adresId niet altijd opgevuld, dus klant ook nodig
+						#dim Detail as APPS.TRANSP.VRD.dto.LeveringDetail = ""
+						If LeveringDetailArray.IsDefined(Sleutel){
+							Set Detail = LeveringDetailArray.GetAt(Sleutel)
+						} else { 
+							Set Detail = ..MaakLeveringDetail(Hoofding.Klant,Hoofding.GeefAXLeverAdresID(),Hoofding.ConsolidatieNr)
+						}
+						Do LeveringDetailArray.SetAt(..PasAanLeveringDetail(Detail, Hoofding),Sleutel)
+					}
+			}
 		}
-		
-		Quit:(Gewicht<20)&&($$$Not(AantalMaatwerk)) ; 20Kg en geen maatwerk
-		
-		Do ##class(Tools.Wlip).%New(43).String("array aanvullen"_AdresID)
-		Set ArrayVRD(AdresID)=$LISTBUILD(KLNr,$PIECE(Adres,"\",2,8),AdresID,Gewicht,AantalMaatwerk)
-		Set CountArrayVRD=CountArrayVRD+1
-		Set Key =$ORDER(Array(Key)) 
 	}
-	Do ##class(Tools.Wlip).%New(43).String("na tweede loop")
-	write !
-	zwrite Count1,Count2,CountArrayVRD,ArrayVRD
-	Quit
+	#dim DetailList as List of APPS.TRANSP.VRD.dto.LeveringDetail = ##class(%ListOfObjects).%New()
+	Set ArrayIterator = ##class(TECH.ListIterator).%New(LeveringDetailArray)
+	While ArrayIterator.HasNext(){
+		Set Detail = ArrayIterator.Next()
+		If (Detail.AantalMaatwerk > 0) || (Detail.Gewicht > 20) {
+			Do DetailList.Insert(Detail)
+		}
+	}
+	Quit DetailList
 ]]></Implementation>
 </Method>
 
-<Method name="CheckOpTransport">
-<ClassMethod>1</ClassMethod>
-<FormalSpec>KLNr:%String,CONSNr:%String</FormalSpec>
+<Method name="PasAanLeveringDetail">
+<FormalSpec>Detail:APPS.TRANSP.VRD.dto.LeveringDetail,Hoofding:Flow.OrderWMS.Hoofding</FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.TRANSP.VRD.dto.LeveringDetail</ReturnType>
+<Implementation><![CDATA[
+	Set LijnIterator = ##class(TECH.ListIterator).%New( Hoofding.Lijnen	)
+	While LijnIterator.HasNext(){
+		#dim Lijn as Flow.OrderWMS.Lijn = LijnIterator.Next()
+		set Detail.Gewicht = Detail.Gewicht + ( Lijn.Product.GewichtPerDuizendStuksInKG * Lijn.AantalGevraagd /1000)
+		If ##class(TECH.StringUtils).Equals(Lijn.Product.ProductGroep,"TBX","LBX","TA.B") {
+			Set Detail.AantalMaatwerk = Detail.AantalMaatwerk + Lijn.AantalGevraagd
+		}
+	}	
+	Quit Detail
+]]></Implementation>
+</Method>
+
+<Method name="MaakLeveringDetail">
+<FormalSpec>KlantNR:%String,AdresID:%String,CONSNr:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.TRANSP.VRD.dto.LeveringDetail</ReturnType>
+<Implementation><![CDATA[
+	set Detail = ##class(APPS.TRANSP.VRD.dto.LeveringDetail).%New()
+	set Detail.KlantNR =  KlantNR
+	Set Detail.LeverAdresID = AdresID
+	Set Detail = ..VulAanAdres(Detail,KlantNR,CONSNr)
+	Set Detail.Gewicht = 0
+	Set Detail.AantalMaatwerk = 0
+	Quit Detail
+]]></Implementation>
+</Method>
+
+<Method name="VulAanAdres">
+<FormalSpec>Detail:APPS.TRANSP.VRD.dto.LeveringDetail,KlantNR:%String,CONSNr:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.TRANSP.VRD.dto.LeveringDetail</ReturnType>
+<Implementation><![CDATA[
+	#dim AdresData as %String = $Get(^ORDW("D",CONSNr,"A"))
+	Set Detail.KlantNaam = $P(AdresData,"\",2)
+	Set Detail.Straat = $P(AdresData,"\",5)
+	Set Detail.Gemeente =  $P(AdresData,"\",7)
+	Set Detail.PostCode =  $P(AdresData,"\",6)
+	Set Detail.LandCode = ..GeefLand($P(AdresData,"\",8))
+	Quit Detail
+]]></Implementation>
+</Method>
+
+<Method name="GeefLand">
+<FormalSpec>LandId:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit $Select(LandId=1019:"BE",LandId=1147:"NL",LandId=1120:"LU",1:"onbepaald")
+]]></Implementation>
+</Method>
+
+<Method name="OpTransport">
+<FormalSpec>KlantNR:%String,ConsNr:%String</FormalSpec>
+<Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit $$$Not($Piece($Get(^KUL(KlantNR,"F",ConsNr,1)),"\",8)="")
+]]></Implementation>
+</Method>
+
+<Method name="GeefFtpConfigTest">
+<Private>1</Private>
+<ReturnType>TECH.Ftp.FtpConfiguratie</ReturnType>
 <Implementation><![CDATA[
-	Do ##class(Tools.Wlip).%New(43).String("CheckOpTransport")
-	Quit $Piece($Get(^KUL(KLNr,"F",CONSNr,1)),"\",8)'=""
+	Set FtpConfig=##class(TECH.Ftp.FtpConfiguratie).%New()
+	Set FtpConfig.ServerBestandsLocatie="import-test"
+	Do ..InstellenFtpConfig(FtpConfig)
+	Quit FtpConfig
 ]]></Implementation>
 </Method>
 
-<Method name="GetKenmerken">
-<ClassMethod>1</ClassMethod>
-<FormalSpec>KLNr:%String,COSNr:%String,Gewicht:%Integer,AantalMaatwerk:%Integer</FormalSpec>
+<Method name="GeefFtpConfigProduction">
+<Private>1</Private>
+<ReturnType>TECH.Ftp.FtpConfiguratie</ReturnType>
 <Implementation><![CDATA[
-	Do ##class(Tools.Wlip).%New(43).String("GetKenmerken")
-	Set (ORDNr,OLUNr,SOLNr)=""
-	Set (Gewicht,AantalMaatwerk)=0
+	Set FtpConfig=##class(TECH.Ftp.FtpConfiguratie).%New()
+	Set FtpConfig.ServerBestandsLocatie="import-live"
+	Do ..InstellenFtpConfig(FtpConfig)
+	Quit FtpConfig
+]]></Implementation>
+</Method>
+
+<Method name="InstellenFtpConfig">
+<FormalSpec>FtpConfig:TECH.Ftp.FtpConfiguratie</FormalSpec>
+<Private>1</Private>
+<ReturnType>TECH.Ftp.FtpConfiguratie</ReturnType>
+<Implementation><![CDATA[
+	Set FtpConfig.Adres="ftp.go4tms.net"
+	Set FtpConfig.Gebruiker="vanhoecke"
+	Set FtpConfig.Paswoord="Xazi8673"
+	Set FtpConfig.Poort=21  
+	Set FtpConfig.Timeout=30
 	
-	Set CONSNr = 0
-	Set CONSNr =$ORDER(^ORDW("D",CONSNr,"D",ORDNr))
-	WHILE ($$$Not(CONSNr="")) {
-		;For Set ORDNr=$O(^ORDW("D",CONSNr,"D",ORDNr)) Quit:ORDNr="" Do
-		Set CONSNr = 0
-		Set CONSNr =$ORDER(^ORDW("D",CONSNr,"D",ORDNr,OLUNr))
-		WHILE ($$$Not(CONSNr="")) {
-		;. For Set OLUNr=$O(^ORDW("D",CONSNr,"D",ORDNr,OLUNr)) Quit:OLUNr="" Do
-			Set Rec=^(OLUNr)
-			Set PRNr=$PIECE(Rec,"\",1)
-			Set Qty=$PIECE(Rec,"\",4)
-			Set ProdGrp=$$PRODGRP^PRODUKT(PRNr)
-			Set:",TBX,LBX,TA.B,KAD,"[(","_ProdGrp_",") AantalMaatwerk=AantalMaatwerk+Qty
-			// TODO $$$PRGet en $$$Gewicht
-			//Set Gewicht=Gewicht+($$$PRGet($$$Gewicht)*Qty/1000)
-			Set Gewicht=Gewicht+(20*Qty/1000)
-		}
-	}
-	Quit
+	Quit FtpConfig
 ]]></Implementation>
 </Method>
 </Class>