Index: PRODUKT6.mac.rou =================================================================== diff -u -r29059 -r67920 --- PRODUKT6.mac.rou (.../PRODUKT6.mac.rou) (revision 29059) +++ PRODUKT6.mac.rou (.../PRODUKT6.mac.rou) (revision 67920) @@ -45,7 +45,7 @@ If PR="",'zb,EntExit Set PRNr=PR Goto EXIT If PR=""!zb Kill %SelProd Do LIST(LimT,LimV):$L(LimT),LISTKT("","",""):'$L(LimT) Goto SEL2:'PRNr,EXIT If PR?1P4.7N,$D(^KPR($E(PR,2,8))),$$CHECK($E(PR,2,8)) Kill %SelProd Set PRNr=$E(PR,2,8) Goto EXIT ; Intern product nummer - If PR?1"#"1.4E Kill %SelProd Do LISTHD(LimT,LimV,PR) Goto SEL2:'PRNr,EXIT:PRNr Set PRNr="" Goto SEL2 ; Halux dossiernummer + If PR?1"#"1.5E Kill %SelProd Do LISTHD(LimT,LimV,PR) Goto SEL2:'PRNr,EXIT:PRNr Set PRNr="" Goto SEL2 ; Halux dossiernummer Kill:$L(PR)<$L($G(%SelProd("Korttekst"))) %SelProd Set (IIPR,%SelProd("Via"))=PR Do PrepPatM @@ -116,19 +116,20 @@ Quit '(##class(DOM.DomeinContext).Instance().GeefKlantTypeAPI().IsIndustriePoolKlant(KlantID)) LISTHD(LimT,LimV,PR) ; Tonen van de lijst volgens dossiernummer - New R,LD + New R,LD,ZoekString Kill Y,X Do InitCriteria - I $D(^Prod.SearchIndexD("D",$E(PR,2,5)_" ")) Do + Set ZoekString = $E(##class(TECH.StringUtils).Trim(PR),2,6) + I $D(^Prod.SearchIndexD("D",ZoekString_" ")) Do . Set PRNr="" - . For Set PRNr=$O(^Prod.SearchIndexD("D",$E(PR,2,5)_" ",PRNr)) Quit:PRNr="" Do + . For Set PRNr=$O(^Prod.SearchIndexD("D",ZoekString_" ",PRNr)) Quit:PRNr="" Do . . Quit:'$$CHECK(PRNr) . . Set NR=$O(Y(""))+1 . . Set Y(NR)=PRNr Else Do . Do InitCriteria . Set pxCriteria.At=$$$ProdCritAtDossier - . Set pxCriteria.SearchTxt=$E(PR,2,5) + . Set pxCriteria.SearchTxt=ZoekString . Set pxCriteria.MaxCount=500 . Set pxCriteria.Sorted=$$$ProdCritSortedNot . Do blSearch.SearchIndex(pxCriteria,.Y)