Index: TRANSPExportPalleten.mac.rou =================================================================== diff -u -r44292 -r44377 --- TRANSPExportPalleten.mac.rou (.../TRANSPExportPalleten.mac.rou) (revision 44292) +++ TRANSPExportPalleten.mac.rou (.../TRANSPExportPalleten.mac.rou) (revision 44377) @@ -43,21 +43,23 @@ For Set ORDNr=$O(^HULP(%J,"O",ORDNr)) Quit:ORDNr="" Do . Set OLNr="" . For Set OLNr=$O(^HULP(%J,"O",ORDNr,"L",OLNr)) Quit:OLNr="" Do - . . Set lb=^HULP(%J,"O",ORDNr,"L",OLNr) - . . Set PRNr=$LI(lb,4) - . . Write $LI(lb,10),*9 - . . Write $LI(lb,8),*9 - . . Write $LI(lb,9),*9 ; EDINr - . . Write ORDNr,*9 - . . Write $LI(lb,7),*9 ; VHOrdRef - . . Write $LI(lb,1),*9 ; BONNr - . . Write PRNr,*9 - . . Write $$$PRGet($$$KortTekst),*9 - . . Write $LI(lb,5),*9 - . . If $D(^HULP(%J,"O",ORDNr,"P")) Write $LI(lb,6) - . . Write *9 - . . Write $P($$GENTYP^HAD(PRNr),"\",1,2) - . . Write ! + . . Set PalletID="" + . . For Set PalletID=$O(^HULP(%J,"O",ORDNr,"L",OLNr,PalletID)) Quit:PalletID="" Do + . . . Set lb=^HULP(%J,"O",ORDNr,"L",OLNr,PalletID) + . . . Set PRNr=$LI(lb,4) + . . . Write $LI(lb,10),*9 + . . . Write $LI(lb,8),*9 + . . . Write $LI(lb,9),*9 ; EDINr + . . . Write ORDNr,*9 + . . . Write $LI(lb,7),*9 ; VHOrdRef + . . . Write $LI(lb,1),*9 ; BONNr + . . . Write PRNr,*9 + . . . Write $$$PRGet($$$KortTekst),*9 + . . . Write $LI(lb,5),*9 + . . . If $G(^HULP(%J,"O",ORDNr)) Write $LI(lb,6) + . . . Write *9 + . . . Write $P($$GENTYP^HAD(PRNr),"\",1,2) + . . . Write ! Q @@ -81,20 +83,21 @@ . Set OLNr="" . For Set OLNr=$O(^ORDW("D",BONNr,"D",ORDNr,OLNr)) Quit:OLNr="" Do . . Set PRNr=$P(^ORDW("D",BONNr,"D",ORDNr,OLNr),"\",1) - . . Set Qty=$P(^ORDW("D",BONNr,"D",ORDNr,OLNr),"\",5) + . . Set QtyOL=$P(^ORDW("D",BONNr,"D",ORDNr,OLNr),"\",5) . . Set SOLNr="" . . For Set SOLNr=$O(^ORDW("D",BONNr,"D",ORDNr,OLNr,SOLNr)) Quit:SOLNr="" Do . . . Set PalletID=$P(^ORDW("D",BONNr,"D",ORDNr,OLNr,SOLNr),"\",10) + . . . Set QtySOL=$P(^ORDW("D",BONNr,"D",ORDNr,OLNr,SOLNr),"\",4) . . . Set:PalletOnthouden PalletOnthouden=$$MoetPalletOnthoudenWorden(BONNr,ORDNr,PRNr,PalletID,VHRef,ComRef,EDIRef,SAPRef) - . . . Do Toevoegen(BONNr,ORDNr,OLNr,PRNr,Qty,PalletID,PalletOnthouden,VHRef,ComRef,EDIRef,SAPRef) + . . . Do Toevoegen(BONNr,ORDNr,OLNr,PRNr,QtySOL,PalletID,PalletOnthouden,VHRef,ComRef,EDIRef,SAPRef) + Quit Toevoegen(BONNr,ORDNr,OLNr,PRNr,Qty,PalletID,PalletOnthouden,VHRef,ComRef,EDIRef,SAPRef) - Set ^HULP(%J,"O",ORDNr,"L",OLNr)=$LB(BONNr,ORDNr,OLNr,PRNr,Qty,PalletID,VHRef,ComRef,EDIRef,SAPRef) - If PalletOnthouden Do - . Set:$L(PalletID) ^HULP(%J,"O",ORDNr,"P",PalletID,OLNr)="" - Else Do - . Kill ^HULP(%J,"O",ORDNr,"P") + Set:PalletID="" PalletID="*" + Set ^HULP(%J,"O",ORDNr,"L",OLNr,PalletID)=$LB(BONNr,ORDNr,OLNr,PRNr,Qty,PalletID,VHRef,ComRef,EDIRef,SAPRef) + If $G(^HULP(%J,"O",ORDNr))'=0 Do + . Set ^HULP(%J,"O",ORDNr)=PalletOnthouden Quit OphalenReferenties(BONNr,VHRef,ComRef,EDIRef,SAPRef) Index: BLKALO1.mac.rou =================================================================== diff -u -r29059 -r44377 --- BLKALO1.mac.rou (.../BLKALO1.mac.rou) (revision 29059) +++ BLKALO1.mac.rou (.../BLKALO1.mac.rou) (revision 44377) @@ -46,7 +46,7 @@ LVHBL Q:'$D(^KTO3(ToeNr,$P(RecToe,D,13,14)_D_SortNr)) Set I=1 LVHBL1 Set T=$P(Test,",",I) Goto LVHBL2:T="" - Do:$L(Conf) @$S(T="QTY":"QTY",T="LVW":"LVW",T="ID":"ID",T="PR":"PR",1:"DUMMY") + Do @$S(T="QTY":"QTY",T="LVW":"LVW",T="ID":"ID",T="PR":"PR",1:"DUMMY") S I=I+1 Goto LVHBL1 LVHBL2 If $D(^KTO(5005,ToeNr,SortNr)),$P(RecToe,D,14)'=$P(RecToe,D,34) Set LVHCYB=1 Do ^BLKALAL Q