Index: PRODUKT.mac.rou =================================================================== diff -u -r40407 -r53155 --- PRODUKT.mac.rou (.../PRODUKT.mac.rou) (revision 40407) +++ PRODUKT.mac.rou (.../PRODUKT.mac.rou) (revision 53155) @@ -166,6 +166,21 @@ .Else Set SortKey=$P(R,D,3)_$$COMPR(PRNr) Quit SortKey ; +SORTKEYTypeEnKleur(PRNr,Niv) + New I,R,KKey,SortKey,D,KTekst, Kleur, PrType + Set D="\" + Set KTekst = $P(^KPR(PRNr,0),"\") + Set Kleur=$E(KTekst,$L(KTekst)-3,$l(KTekst)) + Set PrType=$E(KTekst,1,4) + Set Niv=$G(Niv),I=$O(^KPR(PRNr,"I")) + If Niv'=1,Niv'=2,Niv'=3 Set Niv=4 + If $E(I)'="I" Set SortKey="" + Else Do + .Set R=^KPR(PRNr,I) + .If Niv<4 Set SortKey=$P(R,D,Niv) + .Else Set SortKey=$P(R,D,3)_PrType_Kleur_$$COMPR(PRNr) + Quit SortKey + ; ; Nieuw PRNr NEXTID(NoLDISP) New R,PRNr,MailId Index: FLOWTOE.mac.rou =================================================================== diff -u -r50407 -r53155 --- FLOWTOE.mac.rou (.../FLOWTOE.mac.rou) (revision 50407) +++ FLOWTOE.mac.rou (.../FLOWTOE.mac.rou) (revision 53155) @@ -129,17 +129,22 @@ ; ; Sorteer volgens boom SORT(First,Last) - New R,%J,TLLNr,Count,PRNr,Key,Next,NewRef,OldRef + New R,%J,TLLNr,Count,PRNr,Key,Next,NewRef,OldRef,PRKlas Quit:$O(^KTO(LEVNr,TLNr,100))="" - Quit:##class(TECH.StringUtils).Equals($P(^KTO(LEVNr,TLNr,1),D,8),$$$KlantKeller,$$$KlantDKGDeKeukenfabriek) + ;Quit:##class(TECH.StringUtils).Equals($P(^KTO(LEVNr,TLNr,1),D,8),$$$KlantKeller,$$$KlantDKGDeKeukenfabriek) Set %J=$$%J^vhRtn1() Kill ^HULP(%J) Set:'$G(First) First=101 Set:'$G(Last) Last=^KTO(LEVNr,TLNr,0)-1 Set TLLNr=First-1,Count=0 For Set TLLNr=$O(^KTO(LEVNr,TLNr,TLLNr)) Quit:TLLNr>Last!'TLLNr Do .Set R=^KTO(LEVNr,TLNr,TLLNr),PRNr=$P(R,D,2) - .If 'PRNr Set Count=Count+1,Key="" - .Else Set Key=$$SORTKEY^PRODUKT(PRNr) + .If ('PRNr) Do + .. Set Count=Count+1,Key="" + .Else Do + ..;indien klassificatie key van product = aluminium maatwerk voor derden (dkg) = 775 -> andere sortering : bijkomend op produkttype en kleur + ..Set PRKlas = $$Get^PRODUKT(PRNr,"I04") + ..Set:('(PRKlas="775")) Key=$$SORTKEY^PRODUKT(PRNr) + ..Set:(PRKlas="775") Key=$$SORTKEYTypeEnKleur^PRODUKT(PRNr) .Set ^HULP(%J,$J(Count,3)_" "_Key_" "_TLLNr)=TLLNr Set Next="",NewRef=100 For Set Next=$O(^HULP(%J,Next)) Quit:Next="" Do @@ -556,4 +561,3 @@ Set %wms=$S(TotLines:WmsLines/TotLines*100,1:0) Quit %wms ; -