Index: WV.mac.rou =================================================================== diff -u -r1473 -r2420 --- WV.mac.rou (.../WV.mac.rou) (revision 1473) +++ WV.mac.rou (.../WV.mac.rou) (revision 2420) @@ -312,93 +312,7 @@ . Set Row=$LB($$$objOrefToInt(QHandle),QHandle.%ClassName(1)) Quit -RWSORD - Do RepairWSOrdData - Quit -RepairWSOrdData - s:('$D(ClientIP)) ClientIP="192.168.1.97" - New sDomein,ClientHostIP,arRepair,tmpAr,i -#If $ZCVT($ZUTIL(110),"U")="WWW01" - Set sDomein="www.tandem-box.com" - Set ClientHostIP="192.168.1.%" -#Else - Set sDomein="192.168.1.67" - Set ClientHostIP="192.168.1x.%" -#EndIf - /* - // Domain VHEPN - (LogT.WSOrderID>0) and (LogT.Domein=:sDomein) and (not LogT.KlantNr is null) - and ((LogT.Actie = 'WIZARD_CALC')or(LogT.Actie || LogT.WizardMode = 'MAINPAGECOMPLETE')) - and (LogT.LogTime like '2004-%') and (not LogT.ClientHost like :ClientHostIP) - and (LogT.WSOrderID=OrdHfd.ID) and (OrdHfd.KLNummer is null) - - // Domain HEIN - (LogT.WSOrderID>0) and (LogT.WSOrderID=OrdHfd.ID) and (LogT.Domein='tbx.tandem-box.de') - and ((LogT.Actie = 'WIZARD_CALC')or(LogT.Actie || LogT.WizardMode = 'MAINPAGECOMPLETE')) - and (LogT.LogTime like '2004-%') and (not LogT.ClientHost like :ClientHostIP) - and (not (OrdHfd.IngaveTijdStip like '2004-%')) - */ - - -#If ($ZCVT($ZUTIL(110),"U")'="CACHE01")&&($$$NSpace'="TST-ADMIN1") - &SQL(DECLARE crsRWS CURSOR FOR - SELECT OrdHfd.ID, OrdHfd.IngaveTijdStip, OrdHfd.KLNaam, OrdHfd.KLNummer, LogT.KlantNr - INTO :tmpAr("wsID"), :tmpAr("OrdTime"), :tmpAr("KLNaam"), :tmpAr("KLNr"), :tmpAr("LogKLNr") - FROM WS_TBX.WebOrder OrdHfd, DW_WWW.SysLogTBX LogT - WHERE (LogT.WSOrderID>0) and (LogT.Domein=:sDomein) and (not LogT.KlantNr is null) - and ((LogT.Actie = 'WIZARD_CALC')or(LogT.Actie || LogT.WizardMode = 'MAINPAGECOMPLETE')) - and (LogT.LogTime like '2004-%') and (not LogT.ClientHost like :ClientHostIP) - and (LogT.WSOrderID=OrdHfd.ID) and (OrdHfd.KLNummer is null) - GROUP BY OrdHfd.ID - ORDER BY OrdHfd.ID - ) - &SQL(OPEN crsRWS) - Set i=0 - For &SQL(FETCH crsRWS) Quit:(SQLCODE) Do rwsBuildRepairArray - &SQL(CLOSE crsRWS) - d WL^vhDBG($$$ArrayTT("arRepair")) - Set i="" - For Set i=$O(arRepair("WS",i)) Quit:(i="") Do rwsRepairViaNode(i) -#EndIf - Quit -rwsBuildRepairArray - Set i=i+1 - Merge arRepair("WS",i)=tmpAr - Kill tmpAr - Quit -rwsRepairViaNode(i) -#define DateZDT(%v) $S(%v?5N1","1.5N:$ZDT(%v,3), 1:%v) - New WSOrd,arFullDataOrig,arFullDataNew,nd,wsID,dbgMsg,sc - Set wsID=$G(arRepair("WS",i,"wsID")) - Quit:(wsID="") - If ##class(WS.TBX.Order).%ExistsId(wsID) Set WSOrd=##class(WS.TBX.Order).%OpenId(wsID) - Else Quit - Set arFullDataNew("KLT","IngaveTijdStip")=$$$DateZDT(arRepair("WS",i,"OrdTime")) - Set arFullDataNew("KLT","KLNummer")=$G(arRepair("WS",i,"LogKLNr")) - Set arFullDataNew("KLT","TotAantal")=$$rwsSumQty(WSOrd) - Do WSOrd.DataArrayFromWS(.arFullDataOrig) - For nd="ID","IngaveTijdStip","KLNummer","TotAantal","TotPrijs" Do - . Merge arFullDataNew("TMP","KLT",nd)=arFullDataOrig("KLT",nd) - Set dbgMsg="New values for ID :"_wsID - w !,dbgMsg_$$$ArrayTT("arFullDataNew") ; $Na(arFullDataNew("KLT")) ; arFullDataOrig - d WL^vhDBG(dbgMsg_$$$ArrayTT("arFullDataNew")) ; arFullDataOrig) - Set WSOrd.KLNummer=arFullDataNew("KLT","KLNummer") - Set WSOrd.IngaveTijdStip=arFullDataNew("KLT","IngaveTijdStip") - Set WSOrd.TotAantal=arFullDataNew("KLT","TotAantal") - ;Set sc=WSOrd.%Save() - Write !,$S($D(sc):$E(sc,1)_" "_$$ParseStatus^vhLib(sc), 1:""),! - Quit -rwsSumQty(WSOrd) - Quit:('$G(WSOrd)) "" - New SomAant,WSLn - Set SomAant=0 - Set i="" - For Set WSLn=WSOrd.Lijnen.GetNext(.i) Quit:(i="") Do - . Set:(WSLn.KostPrijs'="ERROR") SomAant=SomAant+WSLn.Qty - Quit $S(SomAant>0:SomAant, 1:"") - - StatTBXUpg(Ref) #define TRIM(%v) $ZSTRIP(%v,"<>w") New arLog,tmpAr,ProdID,KP1,KP2,MK1,MK2,Nd,Cnt