Index: HADVUL.mac.rou =================================================================== diff -u -r66436 -r66449 --- HADVUL.mac.rou (.../HADVUL.mac.rou) (revision 66436) +++ HADVUL.mac.rou (.../HADVUL.mac.rou) (revision 66449) @@ -380,7 +380,7 @@ TRANSFER(FromGlob,Opties,Titel) New FileNm,Dev,LCNt,VolgNr,sFL,Fmt,PRNr,VulExtra,FL,BorCnt,BorNr,RecB,GlasOms,Gehard,MailList - New TransformatieRec,ProfielAfwerkingCode,VullingRec,IsActiefProfielPsvZwartVanSchuco,IsAanpassingNodigVoorPsvZwart + New TransformatieRec,ProfielAfwerkingCode,VullingRec,IsActiefProfielPsvZwartVanSchuco,IsAanpassingNodigVoorPsvZwart,DossierCode New VullingOnbekendArray Set VullingOnbekendArray=##class(%ArrayOfDataTypes).%New() @@ -397,6 +397,7 @@ . Set Fmt=$$CBPRINT($NAME(@FromGlob@(VolgNr))) . Set TransformatieRec = $G(TransRec) ; variabele TransRec werd in bovenstaande routine CBPRINT opgezet. (idem voor GlasOms, TxtBor) . Set PRNr=$P(FL(3),D,1) + . Set DossierCode = $P(FL(3,"G"),"\",1) . Set ProfielAfwerkingCode = $P(FL(3,"G"),"\",2) . ;Do ControleerVullingOnbekend(PRNr,VullingOnbekendArray) . Set VullingRec = FL(3,"V") @@ -409,11 +410,12 @@ . If IsAanpassingNodigVoorPsvZwart Do . . Do PasAanVullingRecVoorPsvZwart(.VullingRec) . . Do PasAanTransRecVoorPsvZwart(.TransformatieRec) - . . Set GlasOms = GlasOms _ "(*)" + . . ;Set GlasOms = GlasOms _ "(*)" ; GlasOms niet aanpassen, want dat zou de verwerking bij de glasleverancier kunnen verstoren. + . . Set DossierCode = DossierCode _ "(*)" . Set BorCnt=$O(^HADPR("P",PRNr,"GV","B",""),-1) . Set LevDatum=$P(FL(3),D,3) - . ;Write $P(FL(3,"K"),D,2),$C(9),$P(FL(3),D,4),".",$P(FL(3,"G"),D,1),$C(9),$P(FL(3),D,7),$C(9),$$EXTDATE^vhLib.DataTypes(LevDatum,"W"),$C(9),GlasOms,$C(9),Gehard,$C(9),VulExtra,$C(9),$P(FL(3),D,2),$C(9),BorCnt,$C(9),$$MOD($P(VullingRec,D,4)),$C(9),-$$MOD($P(VullingRec,D,5)) - . Write $P(FL(3,"K"),D,2),$C(9),$P(FL(3),D,4),".",$P(FL(3,"G"),D,1),$C(9),$P(FL(3),D,7),$C(9),$TR($$EXTDATE^vhLib.DataTypes(LevDatum,"DKP"),".","/"),$C(9),GlasOms,$C(9),Gehard,$C(9),VulExtra,$C(9),$P(FL(3),D,2),$C(9),BorCnt,$C(9),$$MOD($P(VullingRec,D,4)),$C(9),-$$MOD($P(VullingRec,D,5)) + . ;Write $P(FL(3,"K"),D,2),$C(9),$P(FL(3),D,4),".",DossierCode,$C(9),$P(FL(3),D,7),$C(9),$$EXTDATE^vhLib.DataTypes(LevDatum,"W"),$C(9),GlasOms,$C(9),Gehard,$C(9),VulExtra,$C(9),$P(FL(3),D,2),$C(9),BorCnt,$C(9),$$MOD($P(VullingRec,D,4)),$C(9),-$$MOD($P(VullingRec,D,5)) + . Write $P(FL(3,"K"),D,2),$C(9),$P(FL(3),D,4),".",DossierCode,$C(9),$P(FL(3),D,7),$C(9),$TR($$EXTDATE^vhLib.DataTypes(LevDatum,"DKP"),".","/"),$C(9),GlasOms,$C(9),Gehard,$C(9),VulExtra,$C(9),$P(FL(3),D,2),$C(9),BorCnt,$C(9),$$MOD($P(VullingRec,D,4)),$C(9),-$$MOD($P(VullingRec,D,5)) . For BorNr=1:1:BorCnt Do .. Set RecB=$G(^HADPR("P",PRNr,"GV","B",BorNr)) .. Do:(IsAanpassingNodigVoorPsvZwart) PasAanGlasBoringRecVoorPsvZwart(.RecB) @@ -422,7 +424,7 @@ . Write ! . If ($P(FL(3),D,7)'="") Do ; herstelling .. ; $LB(KlantNaam, TOENr, DOSNr, HerstellingsRede, Datum, GlasOms, Gehard, Hoogte, Breedte) - .. Set MailList($I(MailList))=$LB($P(FL(3,"K"),D,2),$P(FL(3),D,4),$P(FL(3,"G"),D,1),$P(FL(3),D,7)_$S($L($P(FL(3),D,8)):": "_$P(FL(3),D,8),1:""),$TR($$EXTDATE^vhLib.DataTypes(LevDatum,"DKP"),".","/"),GlasOms,Gehard,$P(VullingRec,D,4),$C(9),$P(VullingRec,D,5)) + .. Set MailList($I(MailList))=$LB($P(FL(3,"K"),D,2),$P(FL(3),D,4),DossierCode,$P(FL(3),D,7)_$S($L($P(FL(3),D,8)):": "_$P(FL(3),D,8),1:""),$TR($$EXTDATE^vhLib.DataTypes(LevDatum,"DKP"),".","/"),GlasOms,Gehard,$P(VullingRec,D,4),$C(9),$P(VullingRec,D,5)) Close:0'[Dev Dev Do WARN^vhTXTPOP("Bestand "_FileNm_" weggeschreven") ;Do MailOnbekendeVullingen(VullingOnbekendArray)