Index: TRANSPExport2File.mac.rou =================================================================== diff -u -r53327 -r57094 --- TRANSPExport2File.mac.rou (.../TRANSPExport2File.mac.rou) (revision 53327) +++ TRANSPExport2File.mac.rou (.../TRANSPExport2File.mac.rou) (revision 57094) @@ -2,16 +2,16 @@ #include BL.Derde.KlantSpecifiek #include BL.Derde.LevSpecifiek -ExportNaarShared(TranspNr) +ExportNaarShared(TranspNr, Extensie = ".txt") New FileNaam,Pad,PadEnFile - Set FileNaam="Transport "_TranspNr_".txt" + Set FileNaam="Transport "_TranspNr_Extensie Set Pad=$$DIRUSER^vhDEV() Set PadEnFile=$$ExportNaarBestand(TranspNr,Pad,FileNaam) Quit -ExportEnFtp(TranspNr,FtpConfiguratie) +ExportEnFtp(TranspNr,FtpConfiguratie, Extensie = ".txt") New FileNaam,Pad,PadEnFile,Subject,Body - Set FileNaam="Transport "_TranspNr_".txt" + Set FileNaam="Transport "_TranspNr_Extensie Set Pad=##class(TECH.File).GetTempDir() Set:($$$Server = "CACHE01") Pad="C:\SCRATCH" Set PadEnFile=$$ExportNaarBestand(TranspNr,Pad,FileNaam) @@ -26,13 +26,13 @@ Do ##class(vhLib.Logger).%New("Transport").Info("FTP Transportlijst", "Ftp van transport "_TranspNr_" naar "_FtpConfiguratie.Adres) Quit -ExportEnMail(TranspNr,lbAdressen) +ExportEnMail(TranspNr,lbAdressen, Extensie = ".txt", Separator = "") New FileNaam,Pad,PadEnFile,Subject,Body - Set FileNaam="Transport "_TranspNr_".txt" + Set FileNaam="Transport "_TranspNr_Extensie Set Pad=##class(TECH.File).GetTempDir() Set:($$$Server = "CACHE01") Pad="C:\SCRATCH" - Set PadEnFile=$$ExportNaarBestand(TranspNr,Pad,FileNaam) + Set PadEnFile=$$ExportNaarBestand(TranspNr,Pad,FileNaam, Separator) Quit:PadEnFile="" Set lbAttachments=$LB($LB(PadEnFile)) @@ -50,16 +50,16 @@ Do ##class(vhLib.Logger).%New("Transport").Info("Mail Transportlijst", "Mail van transport "_TranspNr_" naar "_lbAdressen) Quit -ExportNaarBestand(TranspNr,Pad,FileNaam) +ExportNaarBestand(TranspNr,Pad,FileNaam, Separator = "") New %J,Dev,D Set D="\" Quit:'$G(TranspNr) "" Do Init Quit:'$D(^HULP(%J)) "" Set Dev=$$OPEN^vhDEV(Pad,FileNaam,"W","M") Use Dev - Do WriteHeader - Do ExportCache + Do WriteHeader(Separator) + Do ExportCache(Separator) Do CLOSE^vhDEV(Dev) Quit $$FULLPAD^vhDEV(Pad,FileNaam) @@ -69,20 +69,22 @@ Do SortBody^DCTRANSP(%J,TranspNr) Quit -ExportCache +ExportCache(Separator="") New SortKey,GroepNr Set SortKey="" For Set SortKey=$O(^HULP(%J,SortKey)) Quit:SortKey="" Do . Set GroepNr=^HULP(%J,SortKey) - . Do WriteAdres(TranspNr,GroepNr) + . Do WriteAdres(TranspNr,GroepNr, Separator) Quit -WriteHeader - Write $TR("TranspNr,GroepNr,Type,ContactNr,Naam,Toenaam,StraatEnNr,PostNr,Woonplaats,Land,Taal,Rembours,Munt,Gewicht,EuroPallet,Colli,Langgoed,HalvePallet,GrootPallet",",",$c(9)) +WriteHeader(Separator = "") + Set:(Separator="") Separator = $C(9) + Write $TR("TranspNr,GroepNr,Type,ContactNr,Naam,Toenaam,StraatEnNr,PostNr,Woonplaats,Land,Taal,Rembours,Munt,Gewicht,EuroPallet,Colli,Langgoed,HalvePallet,GrootPallet",",",Separator) Write ! Quit -WriteAdres(TranspNr,GroepNr) +WriteAdres(TranspNr,GroepNr, Separator="") + Set:(Separator="") Separator = $C(9) New TranspRec,TranspType,ContractRef,ContactType,Rembours,Gewicht,LevAdr,Naam,ToeNaam,Adres,PostNr,Woonpl,Land,KLTaal,Munt,EPallet,Collo,LangGoed,KPallet,BPAllet Set TranspRec=^TRANSP("D",TranspNr,"D",GroepNr) Set ContactRef=$P(TranspRec,"\") @@ -106,10 +108,10 @@ Set LangGoed=$G(^TRANSP("D",TranspNr,"D",GroepNr,"Q","L")) Set KPallet=$G(^TRANSP("D",TranspNr,"D",GroepNr,"Q","P")) Set BPallet=$G(^TRANSP("D",TranspNr,"D",GroepNr,"Q","B")) - Write TranspNr,*9,GroepNr,*9,TranspType - Write *9,ContactRef,*9,Naam,*9,ToeNaam,*9,Adres,*9,PostNr,*9,Woonpl,*9,Land,*9,KlTaal - Write *9,$$$ExcelNum(Rembours),*9,Munt,*9,$$$ExcelNum(Gewicht) - Write *9,$$FmtAantal(EPallet),*9,$$FmtAantal(Collo),*9,$$FmtAantal(LangGoed),*9,$$FmtAantal(KPallet),*9,$$FmtAantal(BPallet) + Write TranspNr,Separator,GroepNr,Separator,TranspType + Write Separator,ContactRef,Separator,Naam,Separator,ToeNaam,Separator,Adres,Separator,PostNr,Separator,Woonpl,Separator,Land,Separator,KlTaal + Write Separator,$$$ExcelNum(Rembours),Separator,Munt,Separator,$$$ExcelNum(Gewicht) + Write Separator,$$FmtAantal(EPallet),Separator,$$FmtAantal(Collo),Separator,$$FmtAantal(LangGoed),Separator,$$FmtAantal(KPallet),Separator,$$FmtAantal(BPallet) Write ! FmtAantal(VerpakRecord)