Index: EWPAL.mac.rou =================================================================== diff -u -r48848 -r56287 --- EWPAL.mac.rou (.../EWPAL.mac.rou) (revision 48848) +++ EWPAL.mac.rou (.../EWPAL.mac.rou) (revision 56287) @@ -50,13 +50,21 @@ RCPPAL(PRNr,PalId,ORDNr,OLUNr,Qty) + Do ReceptiePalletEventRaisen(PRNr,PalId,ORDNr,OLUNr,Qty) If $G(PRNr) Quit:$$OPSLMAN^PRODUKT2(PRNr) Set ORDNr=$G(ORDNr) Set OLUNr=$G(OLUNr)\10*10 ; Basis OLUNr = zonder backorder info Do ADDPAL(PRNr,PalId,Qty) If $L(PalId),ORDNr,OLUNr Set ^EWPAL("D",PRNr,PalId,ORDNr,OLUNr)="" Quit ; +ReceptiePalletEventRaisen(PRNr,PalId,ORDNr,OLUNr,Qty) + New ReceptiePalletEventData,ReceptiePalletEvent + Set ReceptiePalletEventData = ##class(APPS.MAG.Receptie.event.ReceptiePalletEventData).%New(PRNr, PalId, ORDNr, OLUNr, Qty) + Set ReceptiePalletEvent = ##class(APPS.MAG.Receptie.event.ReceptiePalletEvent).%New(ReceptiePalletEventData) + Do ##class(TECH.PubSub.OrchestrationContext).GetEventRaiser().RaiseEventAsync(ReceptiePalletEvent) + Quit + ; SELPAL(PRNr,ORDNr,OLUNr,Qty) ; Opsporen van de PalId waartoe het order behoort. New R,PalId,PalIds,PalQty,TotQty,OrdQty If $G(PRNr) Quit:$$OPSLMAN^PRODUKT2(PRNr) "" @@ -217,10 +225,10 @@ .Set Reden="C/C "_TempPal If $G(^EWREC("P","INVENTARIS")) Do .Set Reden="INV "_$$EXTDATE^vhDTyp($H,"J4") - Do:+Qty'=0&&'$G(^EWREC("P","INVENTARIS"))&&(Reden'="**") MAILSTCK(PRNr,MailQty,,"C/C",PalId,Reden,User,$D(Mail)) ; Niet bij inventaris en optimalisatie(Reden="**") + Do:+Qty'=0&&('$G(^EWREC("P","INVENTARIS"))||1)&&(Reden'="**") MAILSTCK(PRNr,MailQty,,"C/C",PalId,Reden,User,$D(Mail)) ; Niet bij inventaris en optimalisatie(Reden="**") ;Do:+Qty'=0&'$G(^EWREC("P","INVENTARIS")) MAILSTCK(PRNr,MailQty,,"C/C",PalId,Reden,User,$D(Mail)) ; Niet bij inventaris en optimalisatie(Reden="**") Do ADDSTOCK(PRNr,Qty,ModTyp,$H,Reden,PalId,Qty,User,$S(+$G(C("AUTOCC")):"D",1:"M")) - Do:+Qty'=0&&'$G(^EWREC("P","INVENTARIS"))&&(Reden'="**") MOEDER(PRNr,TempQty,Reden,.Mail,$S(+$G(C("AUTOCC")):"D",1:"M")) ; niet bij inventars en optimalisatie(Reden:"**") + Do:+Qty'=0&&('$G(^EWREC("P","INVENTARIS"))||1)&&(Reden'="**") MOEDER(PRNr,TempQty,Reden,.Mail,$S(+$G(C("AUTOCC")):"D",1:"M")) ; niet bij inventars en optimalisatie(Reden:"**") Quit ; ADDPAL(PRNr,PalId,AddQty) ; Bijvoegen of weghalen van een aantal op een palet @@ -584,7 +592,7 @@ GOODPALID(PRNr,PalId) Quit:PalId="00000000" 0 - Quit 1 ;((PalId?3N1(1"K",1N)4N)||($D(^KPR(PRNr,"J6332"))&($L(PalId)=8)&(PalId?1(2.5"0"2.5A1N,1"0"1"T"6N,3.4N1A3.4N,1"SFS"5N,1"TBX"5N,1"00X"5N,1"TBP"5N)))) + Quit ((PalId?1(8N,3"0"1(1"T",1"K")4N,4"0"1"L"3N,2N1A2N1A2N))||($D(^KPR(PRNr,"J6332"))&&($L(PalId)=8)&&(PalId?1(2.5"0"2.5A1N,1"O1"6N,1"0T"6N,3.4N1A3.4N,1"SFS"5N,1"TBX"5N,1"00X"5N,1"TBP"5N)))) PALID(PRNr,PalId,OpslagPl) Quit:$$GOODPALID(PRNr,PalId)