Index: TRANSPE.mac.rou =================================================================== diff -u -r44292 -r50802 --- TRANSPE.mac.rou (.../TRANSPE.mac.rou) (revision 44292) +++ TRANSPE.mac.rou (.../TRANSPE.mac.rou) (revision 50802) @@ -8,11 +8,29 @@ Do @R Quit ; - ; GLS + ; GLS Freight 5036(VervRef) Do ##class(DOM.TRANSP.event.EventRaiser).RitGeslotenEvent(VervRef) Do VERWERK^TRANSPEA(VervRef) Quit + + ; GLS Parcel +6612(VervRef) + Do ##class(DOM.TRANSP.event.EventRaiser).RitGeslotenEvent(VervRef) + Do VERWERK^TRANSPEA(VervRef) + Quit + + ; TTC +6671(VervRef) + ;Set lbAdressen=$lb("jefbauwens@ttctransport.be") + ;Do ExportEnMail^TRANSPExport2File(VervRef,lbAdressen) + Set FtpConfiguratie=##class(TECH.Ftp.FtpConfiguratie).%New() + Set FtpConfiguratie.Adres="mail.ttctransport.be" + Set FtpConfiguratie.Gebruiker="VANHOECKE" + Set FtpConfiguratie.Paswoord="-7|:%:*89yN" + Set FtpConfiguratie.ServerBestandsLocatie="EDI in" + Do ExportEnFtp^TRANSPExport2File(VervRef,FtpConfiguratie) + Quit ; GEBRUDER WEISS 7186(VervRef) @@ -25,3 +43,4 @@ Quit ; + Index: vhPowerTools/APPS/TRANSP/GLS/Bevestiger.cls.xml =================================================================== diff -u -r45649 -r50802 --- vhPowerTools/APPS/TRANSP/GLS/Bevestiger.cls.xml (.../Bevestiger.cls.xml) (revision 45649) +++ vhPowerTools/APPS/TRANSP/GLS/Bevestiger.cls.xml (.../Bevestiger.cls.xml) (revision 50802) @@ -41,6 +41,12 @@ do ..VoerUit() ]]> + + +RitID:%String + + Index: TRANSPExportPalleten.mac.rou =================================================================== diff -u -r44377 -r50802 --- TRANSPExportPalleten.mac.rou (.../TRANSPExportPalleten.mac.rou) (revision 44377) +++ TRANSPExportPalleten.mac.rou (.../TRANSPExportPalleten.mac.rou) (revision 50802) @@ -1,8 +1,27 @@ #include vhLib.Macro #include BL.Derde.KlantSpecifiek #include BL.Derde.LevSpecifiek -#include Prod.Product +ExportNaarShared(TranspNr) + New FileNaam,Pad,PadEnFile + Set FileNaam="Transport "_TranspNr_".txt" + Set Pad=$$DIRUSER^vhDEV() + Set PadEnFile=$$ExportNaarBestand(TranspNr,Pad,FileNaam) + Quit + +ExportEnFtp(TranspNr,FtpConfiguratie) + New FileNaam,Pad,PadEnFile,Subject,Body + Set FileNaam="Transport "_TranspNr_".txt" + Set Pad="C:\SCRATCH" + Set PadEnFile=$$ExportNaarBestand(TranspNr,Pad,FileNaam) + Quit:PadEnFile="" + Set FtpService=##class(TECH.Ftp.impl.FtpAPI).%New() + Do FtpService.Connecteer(FtpConfiguratie) + Do FtpService.VerzendBestand(PadEnFile,FileNaam) + Do FtpService.VerbreekVerbinding() + Do DELFILE^vhDEV(PadEnFile) + Do ##class(vhLib.Logger).%New("Transport").Info("FTP Transportlijst", "Ftp van transport "_TranspNr_" naar "_FtpConfiguratie.Adres) + Quit ExportEnMail(TranspNr,lbAdressen) New FileNaam,Pad,PadEnFile,Subject,Body @@ -13,126 +32,74 @@ Set lbAttachments=$LB($LB(PadEnFile)) Set Subject="Transportlijst "_TranspNr Set Body="Afsluiting van transport "_TranspNr_", details zie bijlag."_$$$CRLF - Set Mail=$$SendMiniMail^vhLib.Mail("bbe@VANHOECKE.BE",lbAdressen,Subject,Body,,,,,lbAttachments) + Set Mail=$$SendMiniMail^vhLib.Mail("RDL@VANHOECKE.BE",lbAdressen,Subject,Body,,,,,lbAttachments) Do DELFILE^vhDEV(PadEnFile) - Do ##class(vhLib.Logger).%New("Transport").Info("Mail Transportlijst", "Mail van transport "_TranspNr_" naar "_$$ListToPieces^vhLib(lbAdressen)) + Do ##class(vhLib.Logger).%New("Transport").Info("Mail Transportlijst", "Mail van transport "_TranspNr_" naar "_FtpConfiguratie.Adres) Quit ExportNaarBestand(TranspNr,Pad,FileNaam) 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 WriteLijnen + Do ExportCache Do CLOSE^vhDEV(Dev) Quit $$FULLPAD^vhDEV(Pad,FileNaam) Init Set %J=$$%J^vhRtn1() Kill ^HULP(%J) - Do OphalenTransport(TranspNr) + Do SortBody^DCTRANSP(%J,TranspNr) Quit - -WriteLijnen - Set ORDNr="" - For Set ORDNr=$O(^HULP(%J,"O",ORDNr)) Quit:ORDNr="" Do - . Set OLNr="" - . For Set OLNr=$O(^HULP(%J,"O",ORDNr,"L",OLNr)) Quit:OLNr="" Do - . . Set PalletID="" - . . For Set PalletID=$O(^HULP(%J,"O",ORDNr,"L",OLNr,PalletID)) Quit:PalletID="" Do - . . . Set lb=^HULP(%J,"O",ORDNr,"L",OLNr,PalletID) - . . . Set PRNr=$LI(lb,4) - . . . Write $LI(lb,10),*9 - . . . Write $LI(lb,8),*9 - . . . Write $LI(lb,9),*9 ; EDINr - . . . Write ORDNr,*9 - . . . Write $LI(lb,7),*9 ; VHOrdRef - . . . Write $LI(lb,1),*9 ; BONNr - . . . Write PRNr,*9 - . . . Write $$$PRGet($$$KortTekst),*9 - . . . Write $LI(lb,5),*9 - . . . If $G(^HULP(%J,"O",ORDNr)) Write $LI(lb,6) - . . . Write *9 - . . . Write $P($$GENTYP^HAD(PRNr),"\",1,2) - . . . Write ! - Q - -OphalenTransport(TranspNr) - New R,GroepNr,SortKey,Node,KLNr - Kill ^HULP(%J) - Set GroepNr="" - - For Set GroepNr=$O(^TRANSP("D",TranspNr,"D",GroepNr)) Quit:GroepNr="" Do - . Set BONNr="" - . For Set BONNr=$O(^TRANSP("D",TranspNr,"D",GroepNr,"B",BONNr)) Quit:BONNr="" Do - . . Quit:$P(^KU1(BONNr,"F"),"\")'=$$$KlantSFS - . . Do OphalenBon(BONNr) - Quit - -OphalenBon(BONNr) - Set ORDNr="" - Set PalletOnthouden=1 - Do OphalenReferenties(BONNr,.VHRef,.ComRef,.EDIRef,.SAPRef) - For Set ORDNr=$O(^ORDW("D",BONNr,"D",ORDNr)) Quit:ORDNr="" Do - . Set OLNr="" - . For Set OLNr=$O(^ORDW("D",BONNr,"D",ORDNr,OLNr)) Quit:OLNr="" Do - . . Set PRNr=$P(^ORDW("D",BONNr,"D",ORDNr,OLNr),"\",1) - . . Set QtyOL=$P(^ORDW("D",BONNr,"D",ORDNr,OLNr),"\",5) - . . Set SOLNr="" - . . For Set SOLNr=$O(^ORDW("D",BONNr,"D",ORDNr,OLNr,SOLNr)) Quit:SOLNr="" Do - . . . Set PalletID=$P(^ORDW("D",BONNr,"D",ORDNr,OLNr,SOLNr),"\",10) - . . . Set QtySOL=$P(^ORDW("D",BONNr,"D",ORDNr,OLNr,SOLNr),"\",4) - . . . Set:PalletOnthouden PalletOnthouden=$$MoetPalletOnthoudenWorden(BONNr,ORDNr,PRNr,PalletID,VHRef,ComRef,EDIRef,SAPRef) - . . . Do Toevoegen(BONNr,ORDNr,OLNr,PRNr,QtySOL,PalletID,PalletOnthouden,VHRef,ComRef,EDIRef,SAPRef) - +ExportCache + New SortKey,GroepNr + Set SortKey="" + For Set SortKey=$O(^HULP(%J,SortKey)) Quit:SortKey="" Do + . Set GroepNr=^HULP(%J,SortKey) + . Do WriteAdres(TranspNr,GroepNr) Quit - -Toevoegen(BONNr,ORDNr,OLNr,PRNr,Qty,PalletID,PalletOnthouden,VHRef,ComRef,EDIRef,SAPRef) - Set:PalletID="" PalletID="*" - Set ^HULP(%J,"O",ORDNr,"L",OLNr,PalletID)=$LB(BONNr,ORDNr,OLNr,PRNr,Qty,PalletID,VHRef,ComRef,EDIRef,SAPRef) - If $G(^HULP(%J,"O",ORDNr))'=0 Do - . Set ^HULP(%J,"O",ORDNr)=PalletOnthouden - Quit - -OphalenReferenties(BONNr,VHRef,ComRef,EDIRef,SAPRef) - ; via .Local : VHRef,ComRef,EDIRef,SAPRef - Set KLNr=$P(^KU1(BONNr,"F"),"\") - Set Node=$S($D(^KUL(KLNr,"F",BONNr)):"F",1:"G") - Set ULNr=101 - Set OrderHoofdingRec=^KUL(KLNr,Node,BONNr,ULNr) - ; - Set VHRef=$P(OrderHoofdingRec,"\",5) - Set:VHRef?6N1" - "2N1"."2N1"."2N1" - "1.E VHRef=$E(VHRef,21,*) - Set ComRef=$P(OrderHoofdingRec,"\",20) - Set EDIRef=$P(OrderHoofdingRec,"\",21) - Set Found=0 - Set SAPRef="" - For Set ULNr=$O(^KUL(KLNr,Node,BONNr,ULNr)) Quit:(ULNr="")||(ULNr>110) Do Quit:Found=2 - . Set LijnRec=^KUL(KLNr,Node,BONNr,ULNr) - . Quit:$P($P(LijnRec,"\",17),"#")'="KF11" - . Set Tekst=$P(LijnRec,"\",5) - . If Tekst="Opmerking:" Set Found=1 - . If (Tekst?2"0"8N)&&(Found=1) Set SAPRef=Tekst,Found=2 - If (SAPRef="")&&(VHRef?2N1"."2N1"."2N1" "2"0"8N) Set SAPRef=$E(VHRef,10,19) - Quit - -MoetPalletOnthoudenWorden(BONNr,ORDNr,PRNr,PalletID,VHRef,ComRef,EDIRef,SAPRef) - Set GenType=$$GENTYP^HAD(PRNr) - Quit:$P(GenType,"\",1)?1(1"TAO",1"LBX",1"TBX")&&(ComRef["Alpnach Norm") 1 - Quit:$P(GenType,"\",1,2)'?1(1"TAO\PRB",1"LBX\PRB",1"TBX\PRB") 0 - - Quit:PalletID'?1(1"TB",1"SFS",1"LB",1"TA").E 0 - Quit 1 WriteHeader - Write $TR("CustomerOrderID,CustumerRef,VHShopID,VHOrderID,VHRef,VHDeliveryID,VHProdID,ProductName,Qty,PalletID",",",$c(9)) + Write $TR("TranspNr,GroepNr,Type,ContactNr,Naam,Toenaam,StraatEnNr,PostNr,Woonplaats,Land,Taal,Rembours,Munt,Gewicht,EuroPallet,Colli,Langgoed,HalvePallet,GrootPallet",",",$c(9)) Write ! Quit - +WriteAdres(TranspNr,GroepNr) + 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,"\") + Set ContactType=$P(TranspRec,"\",6) + Set:ContactType="" ContactType="K" + Set Rembours=$P(TranspRec,"\",2) + Set Gewicht=$P(TranspRec,"\",3) + Set TranspType=$P(^TRANSP("D",TranspNr),"\",5) + Set LevAdr=$$LEVADR^TRANSPL(TranspNr,GroepNr) + Set Naam=$P(LevAdr,"\",2) + Set ToeNaam=$P(LevAdr,"\",3) + Set Adres=$P(LevAdr,"\",5) + Set PostNr=$P(LevAdr,"\",6) + Set:PostNr?1.2A1"-".E PostNr=$P(PostNr,"-",2,99) ; land prefix moet eraf voor TTC + Set Woonpl=$P(LevAdr,"\",7) + Set Land=$$LAND^vhRtn1($P(LevAdr,"\",8)) + Set KlTaal=$P(LevAdr,"\",9) Set:KlTaal="" KlTaal="N" + Set Munt=$$MUNT^TRANSPZ(ContactType,ContactRef) + Set EPallet=$G(^TRANSP("D",TranspNr,"D",GroepNr,"Q","E")) + Set Collo=$G(^TRANSP("D",TranspNr,"D",GroepNr,"Q","C")) + 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 ! + +FmtAantal(VerpakRecord) + Set Aantal=+VerpakRecord + Set:Aantal=0 Aantal="" + Quit Aantal