Index: EWORDS.mac.rou
===================================================================
diff -u -r74876 -r74962
--- EWORDS.mac.rou	(.../EWORDS.mac.rou)	(revision 74876)
+++ EWORDS.mac.rou	(.../EWORDS.mac.rou)	(revision 74962)
@@ -143,7 +143,7 @@
  Quit
  ;
 FETCH(KLNr,ORDNr,Optie) 
- New R,Count,OLNr,MarkOrd,OLUNr,EwmsVerw,VerzW,Lock,VerzZ,GewGemWv,PRNr,Beloofd,IsTBX,StockNiveauService
+ New R,Count,OLNr,MarkOrd,OLUNr,EwmsVerw,VerzW,Lock,VerzZ,GewGemWv,PRNr,Beloofd,IsTBX,StockNiveauService,VkpKinderen
  New LevTerm,BufferW,Week,DynTheoS,KomOrd,StockUpd,FysStock,PraStock,TeoStock,Aantal,ResWMS,Order,OrderStaatVolledigBijVanHoecke
  Set KLNr=$G(KLNr),ORDNr=$G(ORDNr),Optie=$G(Optie),VerzW="",(Beloofd,IsTBX)=0
  If ORDNr Set KLNr=$P(^KO1(ORDNr,"F"),D),VerzW=$$DEFVERZW(KLNr,ORDNr),Beloofd=$$Beloofd(KLNr,ORDNr),IsTBX=$$ISTBX^FLOWCHK("O",ORDNr)
@@ -187,7 +187,11 @@
  ...Set R=^KPR(PRNr,R),LevTerm=$P(R,D,7)
  ...Set WeekDat=(LevTerm+BufferW)*7+$H
  ...Set WVStock=$$CV2MAG^MRP(PRNr,$P($G(^PRSTOCK("D",PRNr)),D,5)) Set:WVStock<0 WVStock=0
- ...Set WVRes=$$CV2MAG^MRP(PRNr,$P($$VerkoopKinderen^PRODUKT4(PRNr,WeekDat),"\",2))
+ ...If $$GeenMaatWerkCheck(PRNr) Do ;het maatwerk is gemaakt, niet meer op de kinderen controleren
+ ....Set VkpKinderen = "0\0\0"
+ ...else  Do
+ ....Set VkpKinderen = $$VerkoopKinderen^PRODUKT4(PRNr,WeekDat)
+ ...Set WVRes=$$CV2MAG^MRP(PRNr,$P(VkpKinderen,"\",2))
  ...Set WVTekort=$S(KLNr=$$$KlantHalux:"",WVStock<WVRes:WVRes-WVStock,1:"")
  ...Set Week=$$EXTDATE^vhLib.DataTypes(WeekDat,"DW"),DynTheoS=$$DYNSTOCK^PRODUKT4(PRNr,"T",Week)-WVTekort Set:DynTheoS<0 DynTheoS=0
  ...Set:GewGemWv*(LevTerm+BufferW)'<DynTheoS DynTheoS=DynTheoS_"#!"
@@ -218,6 +222,16 @@
  Do DISPLAY^vhScherm("EWORDSH",,,,"VERZWIJZE;GERAAPT;VERZZONE;VERZDATUM",1)
  Quit
  ;
+ 
+GeenMaatWerkCheck(PRNr)
+ New ProductTypeApi
+ Set ProductTypeApi = ##class(DOM.DomeinContext).Instance().GeefProductTypeAPI()
+ ;in deze volgorde te controleren.
+ Quit:(ProductTypeApi.IsOrgaluxOpMaat(PRNr)) 0
+ Quit:(ProductTypeApi.IsOrgaluxProduct(PRNr)) 0
+ Quit:(ProductTypeApi.IsMaatwerkProduct(PRNr)) 1
+ Quit 0
+ 
 GETVERZW(KLNr,ORDNr,VerzW,Beloofd,IsTBX) 
  New R,VerzZ
  Set Beloofd=$G(Beloofd),IsTBX=$G(IsTBX)
@@ -349,6 +363,28 @@
  Set D="\",Count=+$O(^HULP(%J,"Q",""),-1),MaxCount=MaxCount+Count
  If Count Do  Goto NEXTKL1:KLNr="EOF" 
  .Set KLNr=^HULP(%J,"Q",Count)
+ ;.Set:KLNr'="EOF" KlantInd=^KK1(KLNr)
+ Else  Set KLNr=1 ;niet blanco, anders 0 node die geen data bevat.
+
+ For  Set KLNr=$O(^KOD(KLNr)) Quit:KLNr=""  Do  Quit:Count=MaxCount
+ .If '$D(^HULP(%J)) Set Count=MaxCount Quit
+ .;Set KLNr=$P(^KKL(KlantInd,0),D)
+ .Quit:'$$CHKORD^EWORDS5(%J,KLNr)
+ .If '$D(^HULP(%J)) Set Count=MaxCount Quit
+ .Set Count=Count+1,^HULP(%J,"Q",Count)=KLNr
+ Set:KLNr="" Count=Count+1,^HULP(%J,"Q",Count)="EOF"
+NEXTKL1 Lock -^HULP(%J,"Q")
+ Quit
+ ;
+
+NEXTKLOrg(%J,MaxCount) 
+ New D,I,Count,KLNr,KlantInd,Kriteria
+ Lock +^HULP(%J,"Q"):0 Else  Quit
+ Merge Kriteria=^HULP(%J,"S")
+ Set MaxCount=$G(MaxCount,$G(^HULP(%J,"MAXCOUNT"),1))
+ Set D="\",Count=+$O(^HULP(%J,"Q",""),-1),MaxCount=MaxCount+Count
+ If Count Do  Goto NEXTKL1Org:KLNr="EOF" 
+ .Set KLNr=^HULP(%J,"Q",Count)
  .Set:KLNr'="EOF" KlantInd=^KK1(KLNr)
  Else  Set KlantInd=0
  For  Set KlantInd=$O(^KKL(KlantInd)) Quit:KlantInd=""  Do  Quit:Count=MaxCount
@@ -358,9 +394,10 @@
  .If '$D(^HULP(%J)) Set Count=MaxCount Quit
  .Set Count=Count+1,^HULP(%J,"Q",Count)=KLNr
  Set:KlantInd="" Count=Count+1,^HULP(%J,"Q",Count)="EOF"
-NEXTKL1 Lock -^HULP(%J,"Q")
+NEXTKL1Org Lock -^HULP(%J,"Q")
  Quit
  ;
+
 DISPTOER(ToerRef) 
  If $L(ToerRef) Do
  .If $D(^RES("EWORDS","PI","TOER","D",ToerRef)) Do