Index: EWORDS2.mac.rou =================================================================== diff -u -r61747 -r69431 --- EWORDS2.mac.rou (.../EWORDS2.mac.rou) (revision 61747) +++ EWORDS2.mac.rou (.../EWORDS2.mac.rou) (revision 69431) @@ -1,3 +1,4 @@ +#include Prod.Product EWORDS2 ;E'WMS Opbouw van een Consolidatie order [ 01/27/2003 9:34 AM ] ; BLDCONS(KLNr,MarkRef,CONSNr,VerzW,VerzDat,DOutTime,VerzZ,LevAdr,ChkBeletDone) @@ -36,9 +37,12 @@ ..Set:$P(OLRec,D,3)>0&(BOQty<1) BOQty="" ; Picking ..Set:$P(OLRec,D,3)<0&(BOQty>-1) BOQty="" ; Terugname ..Set BOLwk=$P(@MarkRef@("A",ORDNr,OLUNr),D,4) - ..Set OLCnt=OLCnt+1,ManOpsl=$$OPSLMAN^PRODUKT2($P(OLRec,D,2)),MagHandeling=$$MAGHANDEL^PRODUKT2($P(OLRec,D,2)) + ..Set OLCnt=OLCnt+1 + ..Set ManOpsl=$$OPSLMAN^PRODUKT2($P(OLRec,D,2))||($$$ProductGet($P(OLRec,D,2),$$$WerkvloerSubMag)="RVGPLM") ; Revego plaatmateriaal + ..Set MagHandeling=$$MAGHANDEL^PRODUKT2($P(OLRec,D,2)) ..If Qty<0!($P(OLRec,D,14)["Z")!ManOpsl!'MagHandeling Do ; Terugname, ZONDER picking, opslag manueel, werkvloer of zonder magazijn handeling ...Do BLDAOL(KLNr,CONSNr,ORDNr,OLUNr,Qty) + ... w "wachten ...",CONSNr r k ...Set AutoCons=AutoCons+1 Set:Qty<0 CredCnt=CredCnt+1 ..Else Do ; Doorgeven aan WMS ...Do BLDOL(KLNr,CONSNr,ORDNr,OLUNr,Qty,BOQty,BOLwk) @@ -120,7 +124,7 @@ Set $P(SubRec,D,2)="A" ; Status = Afgewerkt Set $P(SubRec,D,3)=Qty If $G(MoederPRNr)'=""&&(MoederPRNr'=PRNr) Set $P(SubRec,D,16)=$G(MoederPRNr) - Set:$$OPSLZONE^PRODUKT2(PRNr)=9 $P(SubRec,D,4)=Qty ; Werkvloerprodukt + Set:($$OPSLZONE^PRODUKT2(PRNr)=9)||($$$PRGet($$$WerkvloerSubMag)="RVGPLM") $P(SubRec,D,4)=Qty ; Werkvloerprodukt Set ^ORDW("D",CONSNr,"D",ORDNr,OLUNr,SubOLNr)=SubRec Quit Index: MRPTORD.mac.rou =================================================================== diff -u -r69301 -r69431 --- MRPTORD.mac.rou (.../MRPTORD.mac.rou) (revision 69301) +++ MRPTORD.mac.rou (.../MRPTORD.mac.rou) (revision 69431) @@ -33,6 +33,8 @@ . Set OrdRef="ONDERDELEN "_$P(SubMagEnToeNr,";",2) Else If SubMagEnToeNr?1"Y;"6N Do . Set OrdRef="MyLegra "_$P(SubMagEnToeNr,";",2) + Else If SubMagEnToeNr?1"W;"6N Do + . Set OrdRef="Revego "_$P(SubMagEnToeNr,";",2) Else Do . Set OrdRef=DT_" TRANSFERTORDER" Set Locals("KLNr")=KLNr,Locals("OrdRef")=OrdRef,Locals("CRef")=CRef Index: EWORDSW.mac.rou =================================================================== diff -u -r68822 -r69431 --- EWORDSW.mac.rou (.../EWORDSW.mac.rou) (revision 68822) +++ EWORDSW.mac.rou (.../EWORDSW.mac.rou) (revision 69431) @@ -240,6 +240,7 @@ For Set ORDNr=$O(^ORDW("D",CONSNr,"D",ORDNr)) Quit:ORDNr="" Do .For Set OLUNr=$O(^ORDW("D",CONSNr,"D",ORDNr,OLUNr)) Quit:OLUNr="" Do ..Set OLRec=^ORDW("D",CONSNr,"D",ORDNr,OLUNr) + ..Quit:$P(OLRec,D,2)'="" ; Reeds verwerkt (doorgestuurd), terugname, manueel of zonder WMS ..For Set SOLNr=$O(^ORDW("D",CONSNr,"D",ORDNr,OLUNr,SOLNr)) Quit:SOLNr="" Do ...Set SOLRec=^ORDW("D",CONSNr,"D",ORDNr,OLUNr,SOLNr) ...Set PRNr=$P(SOLRec,D,1) Index: FLOWORD7.mac.rou =================================================================== diff -u -r69296 -r69431 --- FLOWORD7.mac.rou (.../FLOWORD7.mac.rou) (revision 69296) +++ FLOWORD7.mac.rou (.../FLOWORD7.mac.rou) (revision 69431) @@ -260,7 +260,7 @@ GetVerzWFromSubMag(WVSubMag) New VerzendW - Set VerzendW="TH"_$S(WVSubMag?1N:WVSubMag,WVSubMag?1(1"A",1"B",1"C",1"D",1"E",1"F",1"G",1"Y"):WVSubMag,1:"") + Set VerzendW="TH"_$S(WVSubMag?1N:WVSubMag,WVSubMag?1(1"A",1"B",1"C",1"D",1"E",1"F",1"G",1"Y",1"W"):WVSubMag,1:"") Quit VerzendW ; Maximum lijnen per order (default 99) Index: MRPRES.mac.rou =================================================================== diff -u -r69301 -r69431 --- MRPRES.mac.rou (.../MRPRES.mac.rou) (revision 69301) +++ MRPRES.mac.rou (.../MRPRES.mac.rou) (revision 69431) @@ -291,7 +291,7 @@ ... Set SubMag=$P(@CRef@("TO",PRNr,FabKey,HFCode),D,2) ... Set:SubMag="" SubMag=$$GetVerzendCode(PRNr,FabKey) ... Set:SubMag="" SubMag="~" - ... If SubMag="Y" Do ; MyLegrabox + ... If (SubMag="Y")||(SubMag="W") Do ; MyLegrabox of SpecialWorkShop .... Set @CRef@("STO",SubMag_";"_$P(FabKey,";"),PRNr)=$G(@CRef@("STO",SubMag_";"_$P(FabKey,";"),PRNr))+Qty .... Set @CRef@("STO",SubMag_";"_$P(FabKey,";"),PRNr,FabKey,HFCode)=Qty ... Else Do