Index: csp/tbx/resitems.cls.xml =================================================================== diff -u -r185 -r189 --- csp/tbx/resitems.cls.xml (.../resitems.cls.xml) (revision 185) +++ csp/tbx/resitems.cls.xml (.../resitems.cls.xml) (revision 189) @@ -129,7 +129,7 @@ #define LCExclude4I(%LC) (%LC?1(1"B",1"B/Z",1"D",1"D/Z",1"DLS/Z",1"M/ZS",1"B/ZS",1"D/ZS",1"MY",1"MY/Z",1"CLY",1"CLY/Z",1"DLY",1"DLY/Z")) ; Antaro #define DSExclude4A(%DS) (%DS?1(1"-")) - #define LCExclude4A(%LC) (%LC?1(1"MB",1"G",1"B",1"BS2",1"DM",1"DM/Z",1"DS2",1"DMS2",1"DMY2",1"DMY2/Z",1"MY",1"MY/Z",1"CMY",1"CMY/Z")) + #define LCExclude4A(%LC) (%LC?1(1"MB",1"G",1"B",1"BS2",1"MY",1"MY/Z",1"CMY",1"CMY/Z")) ; Mengvorm A-design #define DSExclude4MA(%DS) (%DS?1(1"GMxx",1"IMA")) #define LCExclude4MA(%LC) (%LC?1(1"DS",1"MS2/Z",1"BS2/Z",1"DS2/Z",1"MB",1"IMB",1"G",1"MY",1"MY/Z",1"BY",1"BY/Z",1"DY",1"DY/Z")) @@ -153,10 +153,25 @@ &SQL(OPEN crLC) For &SQL(FETCH crLC) Quit:(SQLCODE) Set tmpAr(LCodeID,KMNaam)=KMWaarde &SQL(CLOSE crLC) + ;d WLIP^vhDBG(97,"arLCode IDs") Set LCodeID="" For Set LCodeID=$O(tmpAr(LCodeID)) Quit:(LCodeID="") Do - . Set arLCode($$$lcKLAS_"-"_$$$lcGT_"-"_$$$lcLT_"-"_$$$lcZW_"-"_$$$lcRH)=LCodeID ; ("TBKlasse","TBGlijderType","TBLadeType","TBZijwand","TBRugHoogte") + . Set FirstSubNode=$$$lcKLAS_"-"_$$$lcGT_"-"_$$$lcLT_"-"_$$$lcZW_"-"_$$$lcRH + . Set BeperkDesign=$$cjsGeefBeperkDesignVoorLadeCode(LCodeID) + . ;d WLIP^vhDBG(97, "arLCode( " _FirstSubNode_ " , " _BeperkDesign_" ) = " _LCodeID) + . If BeperkDesign[";" Do + . . For i=1:1:$L(BeperkDesign,";") Set arLCode(FirstSubNode , $P(BeperkDesign,";",i))=LCodeID + . . ;d WLIP^vhDBG(97, "arrayTT:"_$$$CRLF_ $$$ArrayTT("arLCode("""_FirstSubNode_""")",.arLCode)) + . Else Do + . . Set arLCode(FirstSubNode,BeperkDesign)=LCodeID ; ("TBKlasse","TBGlijderType","TBLadeType","TBZijwand","TBRugHoogte") Quit +cjsGeefBeperkDesignVoorLadeCode(LCodeID) + Set BeperkDesign="" + &sql(SELECT BeperkDesign INTO :BeperkDesign FROM Prod_GAMeta_BT.LadeCode WHERE (ID = :LCodeID)) + If BeperkDesign="" { + Set BeperkDesign="*" + } + Quit BeperkDesign cjsBuildArrayKenm(arKenm) Set Groep="TBR" Kill arKenm @@ -179,7 +194,8 @@ Set UnID="" For Set UnID=$O(arKenm(UnID)) Quit:(UnID="") Do . Quit:($G($$$akDS)="")||($G($$$akLD)="")||($G($$$akDK)="") - . Set LCodeID=$G(arLCode($G($$$akKLAS)_"-"_$G($$$akGT)_"-"_$G($$$akLT)_"-"_$G($$$akZW)_"-"_$G($$$akRH))) + . Set LCodeID=$G(arLCode($G($$$akKLAS)_"-"_$G($$$akGT)_"-"_$G($$$akLT)_"-"_$G($$$akZW)_"-"_$G($$$akRH) , $$$akDS)) + . Set:(LCodeID="") LCodeID=$G(arLCode($G($$$akKLAS)_"-"_$G($$$akGT)_"-"_$G($$$akLT)_"-"_$G($$$akZW)_"-"_$G($$$akRH) , "*")) . Quit:(LCodeID="") . Quit:($$$DKExclude($$$akDK)) . Set:('$D(arBPM($$$akDS,LCodeID))) arBPM($$$akDS,LCodeID)=$LB($G($$$akKLAS),$G($$$akZW),$G($$$akRH),$G($$$akLT))