Index: APPS/Halux/PPS/Document/impl/LBX/OnderdelenPicking.cls.xml
===================================================================
diff -u -r56879 -r56936
--- APPS/Halux/PPS/Document/impl/LBX/OnderdelenPicking.cls.xml (.../OnderdelenPicking.cls.xml) (revision 56879)
+++ APPS/Halux/PPS/Document/impl/LBX/OnderdelenPicking.cls.xml (.../OnderdelenPicking.cls.xml) (revision 56936)
@@ -165,14 +165,32 @@
Set EersteLijnProduct = 0
}
If VermeldKorttekst { // Op de eerste lijn van het Halffab staat soms de korttekst.
- Set $Piece(Lijn,..#Delimiter,..#PosKortTekst) = DataVoorLijn.HFV.GeefKorttekst()
+ ;Set $Piece(Lijn,..#Delimiter,..#PosKortTekst) = DataVoorLijn.HFV.GeefKorttekst()
+ Do ..FormatKorttekst(.Lijn, DataVoorLijn)
Set VermeldKorttekst = 0
}
}
}
]]>
+
+
+1
+%String
+
+
+
1
Index: PROC.mac.rou
===================================================================
diff -u -r29059 -r56936
--- PROC.mac.rou (.../PROC.mac.rou) (revision 29059)
+++ PROC.mac.rou (.../PROC.mac.rou) (revision 56936)
@@ -66,40 +66,71 @@
;
;
; Format line
-FL N OX
- S (FLs,FLt)="" I '$D(FL(2)) S FL(2)=""
- I FL(2) S FP=FL(2) W @F
- If $P(FL(1),"\")?1.2N New D S D=$C($P(FL(1),"\")),FLt=1
- If FL(1)?1.U S OX=FL(1),FL(1)=^LD("L",FL(1)) I $D(^LD("L",OX,"E")) w *7 X ^("E")_" D FL1" Quit
- I $D(FL(5)) X FL(5)_" D FL1" Quit
-FL1 S FLt=FLt+1,FLv=$P(FL(1),"\",FLt),FLl=$P(FLv,U,4) G FL7:FLv="" S R="" G FL2:'$L($P(FLv,U,1)) ;ophalen data
- I $P(FLv,U,1)?.N S R=$P(FL(3),D,$P(FLv,U,1))
- E I $P(FLv,U,1)?1.E1"."1.N S R=$P(FL(3,$P($P(FLv,U,1),".",1)),D,$P($P(FLv,U,1),".",2))
- E X "S R="_$P(FLv,U,1)
- I $P(FLv,U,8)'="" S OX=$G(X),X=R X "S R="_$P(FLv,U,8) S X=OX
-FL2 G FL3:$P(FLv,U,2)'["N" S FN(1)=R,FN(2)=FLl,FN(3)=$P(FLv,U,5),FN(4)=$P(FLv,U,2) ;verwerking numerieke data
- D FN
+FL
+ NEW OX,RmetTAGS
+ SET (FormattedLine,FieldNbr)="" IF '$DATA(FL(2)) SET FL(2)=""
+ IF FL(2) SET FP=FL(2) WRITE @F
+ If $PIECE(FL(1),"\")?1.2N New D SET D=$CHAR($PIECE(FL(1),"\")),FieldNbr=1
+ If FL(1)?1.U SET OX=FL(1),FL(1)=^LD("L",FL(1)) IF $DATA(^LD("L",OX,"E")) write *7 XECUTE ^("E")_" D FL1" Quit
+ IF $DATA(FL(5)) XECUTE FL(5)_" D FL1" Quit
+FL1
+ SET FieldNbr=FieldNbr+1,FieldParameters=$PIECE(FL(1),"\",FieldNbr),FieldLength=$PIECE(FieldParameters,U,4) GOTO FL7:FieldParameters="" SET R="" GOTO FL2:'$LENGTH($PIECE(FieldParameters,U,1)) ;ophalen data
+ IF $PIECE(FieldParameters,U,1)?.N SET R=$PIECE(FL(3),D,$PIECE(FieldParameters,U,1))
+ ELSE IF $PIECE(FieldParameters,U,1)?1.E1"."1.N SET R=$PIECE(FL(3,$PIECE($PIECE(FieldParameters,U,1),".",1)),D,$PIECE($PIECE(FieldParameters,U,1),".",2))
+ ELSE XECUTE "S R="_$PIECE(FieldParameters,U,1)
+ IF $PIECE(FieldParameters,U,8)'="" SET OX=$GET(X),X=R XECUTE "S R="_$PIECE(FieldParameters,U,8) SET X=OX
+ IF ((R["�B")||(R["�b")) Set RmetTAGS=R,R=$Replace(R,"�B",""),R=$Replace(R,"�b","")
+ ELSE SET RmetTAGS=""
+FL2
+ GOTO FL3:$PIECE(FieldParameters,U,2)'["N" SET FN(1)=R,FN(2)=FieldLength,FN(3)=$PIECE(FieldParameters,U,5),FN(4)=$PIECE(FieldParameters,U,2) ;verwerking numerieke data
+ DO FN
FL3
- If "\DN\DC\MN\MC\DM\DW\W\J\DKP\DK\DL\"[("\"_$P(FLv,U,2)_"\") S R=$$EXTDATE^vhLib.DataTypes(R,$P(FLv,U,2))
- If $P(FLv,U,2)="T" S R=$$EXTTIME^vhLib.DataTypes(R)
- If $P(FLv,U,2)="F" Set R=$TR($J("",$P(FLv,U,4))," ",R)
- G FL4:'FLl S R=$E(R,1,FLl)
- I $P(FLv,U,3)="L" S R=R_$J("",FLl-$L(R)) ;alignering
- E I $P(FLv,U,3)="R" S R=$J(R,FLl)
- E I $P(FLv,U,3)="C" S R=$J("",(FLl-$L(R))\2)_R_$J("",FLl-$L(R)-((FLl-$L(R))\2))
- E S R="",$P(R,"#",FLl)="#"
-FL4 G FL6:'$L(FL(2)),FL5:'$L($P(FLv,U,7)) ;print
- I $P(FLv,U,7)?.N S FLb=$P(FL(3),"\",$P(FLv,U,7))
- E X "S FLb="_$P(FLv,U,7)
- I '$G(FL(4)),FLb W @FMTB,$$FLATASCI(R),@FMTb,$P(FLv,U,6) G FL6
-FL5 W $$FLATASCI(R),$P(FLv,U,6)
-FL6 S FLs=FLs_R_$P(FLv,U,6) G FL1 ;concatinering
-FL7 S R=$$FLATASCI(FLs)
- Q
+ If "\DN\DC\MN\MC\DM\DW\W\J\DKP\DK\DL\"[("\"_$PIECE(FieldParameters,U,2)_"\") SET R=$$EXTDATE^vhLib.DataTypes(R,$PIECE(FieldParameters,U,2))
+ If $PIECE(FieldParameters,U,2)="T" SET R=$$EXTTIME^vhLib.DataTypes(R)
+ If $PIECE(FieldParameters,U,2)="F" Set R=$TRANSLATE($JUSTIFY("",$PIECE(FieldParameters,U,4))," ",R)
+ GOTO FL4:'FieldLength
+ SET R=$EXTRACT(R,1,FieldLength)
+ IF $PIECE(FieldParameters,U,3)="L" SET R=R_$JUSTIFY("",FieldLength-$LENGTH(R)) ;alignering
+ ELSE IF $PIECE(FieldParameters,U,3)="R" SET R=$JUSTIFY(R,FieldLength)
+ ELSE IF $PIECE(FieldParameters,U,3)="C" SET R=$JUSTIFY("",(FieldLength-$LENGTH(R))\2)_R_$JUSTIFY("",FieldLength-$LENGTH(R)-((FieldLength-$LENGTH(R))\2))
+ ELSE SET R="",$PIECE(R,"#",FieldLength)="#"
+FL4
+ GOTO FL6:'$LENGTH(FL(2)),FL5:'$LENGTH($PIECE(FieldParameters,U,7)) ;print
+ IF $PIECE(FieldParameters,U,7)?.N SET FLb=$PIECE(FL(3),"\",$PIECE(FieldParameters,U,7))
+ ELSE XECUTE "S FLb="_$PIECE(FieldParameters,U,7)
+ IF '$GET(FL(4)),FLb WRITE @FMTB,$$FLATASCI(R),@FMTb,$PIECE(FieldParameters,U,6) GOTO FL6
+FL5
+ If (RmetTAGS="") {
+ WRITE $$FLATASCI(R),$PIECE(FieldParameters,U,6)
+ } ELSE {
+ Set Positie = 1
+ Set Tekst = ""
+ While Positie <= $Length(RmetTAGS)
+ {
+ If ($Extract(RmetTAGS,Positie,Positie+1) = "�B") {
+ WRITE @FMTB
+ Set Positie = Positie + 2
+ } ElseIf ($Extract(RmetTAGS,Positie,Positie+1) = "�b") {
+ WRITE @FMTb
+ Set Positie = Positie + 2
+ } Else {
+ WRITE $Extract(RmetTAGS,Positie,Positie)
+ Set Positie = Positie + 1
+ }
+ }
+ WRITE $PIECE(FieldParameters,U,6)
+ }
+FL6
+ SET FormattedLine=FormattedLine_R_$PIECE(FieldParameters,U,6)
+ GOTO FL1 ;concatinering
+FL7
+ SET R=$$FLATASCI(FormattedLine)
+ QUIT
;
+ ;
FLATASCI(R)
- I $L(R),$G(sScr("VT"))=1 S R=$$FLATASCI^vhRtn1(R)
- Q R
+ IF $LENGTH(R),$GET(sScr("VT"))=1 SET R=$$FLATASCI^vhRtn1(R)
+ QUIT R
;
; sLijst parameters
LPar S DLt=@DL(1)@(1) F DLi=$L(DLt):-1 Q:" ,)"'[$E(DLt,DLi) ; instellen van de referenties