Index: ZBCHKFLO.mac.rou =================================================================== diff -u -r33103 -r33105 --- ZBCHKFLO.mac.rou (.../ZBCHKFLO.mac.rou) (revision 33103) +++ ZBCHKFLO.mac.rou (.../ZBCHKFLO.mac.rou) (revision 33105) @@ -31,7 +31,7 @@ .....Do wKLANT^zbcheck .....Write !!,"Kom link ",ZR," toelevering lijn onbekend",!,?8,"Leveranc = ",LEVNr,?29,"Toelev = ",TOENr,?50,"Lijn = ",TLNr ....Set R=^KTO(LEVNr,TOENr,TLNr) - ....If $P(R,D,27)'=ORDNr!($P($P(R,D,28),";")'=OLNr) Do + ....If ($P(R,D,27)'=ORDNr) || ($P($P(R,D,28),";")'=OLNr) Do .....Set Check=0 .....Do wKLANT^zbcheck .....Write !!,"Kom link ",ZR," foutief",!,?8,"Order = ",ORDNr,?29,"Toelev = ",TOENr,?50,"Lijn = ",TLNr,!,?8,"Toelev = ",TOENr,?29,"Order = ",$P(R,D,27),?50,"Lijn = ",$P(R,D,28) @@ -92,12 +92,12 @@ ......Do wLEVERANCIER^zbcheck ......Write !!,"Kom link ",ZR," order lijn onbekend",!,?8,"Klant = ",KLNr,?29,"Order = ",ORDNr,?50,"Lijn = ",OLNr .....Set R=^KOD(KLNr,"F",ORDNr,OLNr) - .....If $P(R,D,27)'=TOENr!($P($P(R,D,28),";")'=TLNr) Do + .....If ($P(R,D,27)'=TOENr) || (($P($P(R,D,28),";")'=TLNr)) Do ......Set Check=0 ......New ExtraMelding Set ExtraMelding="" ......New OrderLijnIsSpaceTower Set OrderLijnIsSpaceTower = $$IsSpaceTower^PRODUKT2($P(R,D,2)) ......// Indien SpaceTower, dan enkel vermelding maken, zbcheck niet als "Gefaald" markeren. Opmerking: TOENr moet wel correct zijn, m.a.w. alleen ToeveringLijn verschillend. - ......If (OrderLijnIsSpaceTower)&&($P(R,D,27)=TOENr) Do + ......If (OrderLijnIsSpaceTower) && ($P(R,D,27)=TOENr) Do ...... . Set Check=1 ...... . Set ExtraMelding=", maar mag genegeerd worden want is SPACETOWER." ......Do wLEVERANCIER^zbcheck