Index: DOM/PM/enu/StockType.cls.xml =================================================================== diff -u --- DOM/PM/enu/StockType.cls.xml (revision 0) +++ DOM/PM/enu/StockType.cls.xml (revision 937) @@ -0,0 +1,38 @@ + + + +datatype +1 +%String +62164,35908.978134 +62159,61293.088729 +0 + + +,S,A,N + + + +;Stock;Afgeleid;Niet stock + + + +1 + + + + +1 + + + + +1 + + + + + Index: DOM/PM/impl/DataM/DataMGroepClassificatie.cls.xml =================================================================== diff -u -r903 -r937 --- DOM/PM/impl/DataM/DataMGroepClassificatie.cls.xml (.../DataMGroepClassificatie.cls.xml) (revision 903) +++ DOM/PM/impl/DataM/DataMGroepClassificatie.cls.xml (.../DataMGroepClassificatie.cls.xml) (revision 937) @@ -1,9 +1,10 @@ - + 1 DOM.PM.Classificatie,%RegisteredObject -62157,52913.108501 +62164,47744.586448 +62159,61822.043699 0 @@ -49,7 +50,7 @@ ]]> - + %Integer @@ -89,5 +90,5 @@ ]]> - + Index: DOM/PM/impl/DataM/DataMProduct.cls.xml =================================================================== diff -u -r903 -r937 --- DOM/PM/impl/DataM/DataMProduct.cls.xml (.../DataMProduct.cls.xml) (revision 903) +++ DOM/PM/impl/DataM/DataMProduct.cls.xml (.../DataMProduct.cls.xml) (revision 937) @@ -1,9 +1,11 @@ - + +BL.Kenm.Common 1 %RegisteredObject -62153,49856.656689 +62164,45096.985816 +62159,61822.534455 0 @@ -182,6 +184,25 @@ Quit IsLanggoed ]]> + + +TECH.Iterator + + - + Index: WS/PM/ProductService.cls.xml =================================================================== diff -u -r913 -r937 --- WS/PM/ProductService.cls.xml (.../ProductService.cls.xml) (revision 913) +++ WS/PM/ProductService.cls.xml (.../ProductService.cls.xml) (revision 937) @@ -1,12 +1,13 @@ - + JBL + 2011-03-03 1 %SOAP.WebService -62157,51826.584939 -1 +62164,35796.6281 +62159,61728.499051 +0 APPS.PM.ProductService @@ -16,13 +17,13 @@ http://vanhoecke.be - + Geef gegeven de criteria een lijst terug met producten (Prod.Product) -Criteria:APPS.PM.dto.SelectCriteria +Criteria:APPS.PM.dto.ZoekCriteria APPS.PM.dto.ProductZoekResultaatList 1 - @@ -35,5 +36,5 @@ ]]> - + Index: BL/Prod/Search.cls.xml =================================================================== diff -u -r901 -r937 --- BL/Prod/Search.cls.xml (.../Search.cls.xml) (revision 901) +++ BL/Prod/Search.cls.xml (.../Search.cls.xml) (revision 937) @@ -1,12 +1,12 @@ - + Search in the product index BL.Prod,%Prod.Product 1 %RegisteredObject -62147,44127.161888 +62164,48652.965688 60207,60266.090772 0 @@ -544,6 +544,8 @@ 1 PRNr:%Integer,pxCriteria:BL.Prod.sub.pxSearchCriteria,lbIndexContent:%List - + Index: Default_JBL.prj.xml =================================================================== diff -u --- Default_JBL.prj.xml (revision 0) +++ Default_JBL.prj.xml (revision 937) @@ -0,0 +1,6 @@ + + + + + + Index: APPS/PM/enu/StockType.cls.xml =================================================================== diff -u -r917 -r937 --- APPS/PM/enu/StockType.cls.xml (.../StockType.cls.xml) (revision 917) +++ APPS/PM/enu/StockType.cls.xml (.../StockType.cls.xml) (revision 937) @@ -1,33 +1,38 @@ - + datatype 1 %String -62154,35434.753636 +62164,37736.998937 +62159,61293.088729 0 -,S,A,N +,Stock,Afgeleid,NietStock + +;Stock;Afgeleid;Niet stock + + 1 - 1 - 1 - - + Index: JBL_ProductKenmerkwijziging_opslaan.prj.xml =================================================================== diff -u --- JBL_ProductKenmerkwijziging_opslaan.prj.xml (revision 0) +++ JBL_ProductKenmerkwijziging_opslaan.prj.xml (revision 937) @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: DOM/PM/impl/ProductImpl.cls.xml =================================================================== diff -u -r903 -r937 --- DOM/PM/impl/ProductImpl.cls.xml (.../ProductImpl.cls.xml) (revision 903) +++ DOM/PM/impl/ProductImpl.cls.xml (.../ProductImpl.cls.xml) (revision 937) @@ -1,9 +1,9 @@ - + 1 %RegisteredObject,DOM.PM.Product -62152,34495.128082 +62164,43954.695222 62129,41516.717135 0 @@ -83,6 +83,12 @@ + + +TECH.Iterator + + - + Index: APPS/PM/dto/kenm/KenmerkMetadata.cls.xml =================================================================== diff -u -r917 -r937 --- APPS/PM/dto/kenm/KenmerkMetadata.cls.xml (.../KenmerkMetadata.cls.xml) (revision 917) +++ APPS/PM/dto/kenm/KenmerkMetadata.cls.xml (.../KenmerkMetadata.cls.xml) (revision 937) @@ -1,9 +1,9 @@ - + 1 %RegisteredObject,%XML.Adaptor -62154,37324.929325 +62164,56480.637302 62153,42300.182934 0 @@ -68,5 +68,5 @@ - + Index: DOM/PM/enu/SoortProductID.cls.xml =================================================================== diff -u --- DOM/PM/enu/SoortProductID.cls.xml (revision 0) +++ DOM/PM/enu/SoortProductID.cls.xml (revision 937) @@ -0,0 +1,79 @@ + + + +datatype +1 +%String +62160,47409.348575 +62164,33508.914771 +0 + + + +K=KortTekst, I=IdentNummer, R=LeveranciereReferentie, T=LangtTekst, B=ProductBoom, + +,K,I,R,T,B + + + +;Korttekst;Identnr;Leveranciersferentie;LangTekst;ProductBoom;Productnr;Dossiernr + + + +1 + + + + +1 + + + + +1 + + + + +1 + + + + +1 + + + + + + + + +1 + + + + + + + + +1 + + + + + Index: vhRtn1.mac.rou =================================================================== diff -u -r734 -r937 --- vhRtn1.mac.rou (.../vhRtn1.mac.rou) (revision 734) +++ vhRtn1.mac.rou (.../vhRtn1.mac.rou) (revision 937) @@ -93,6 +93,17 @@ For I=1:1:$L(String) Set:$E(String,I)?1N S=S_$E(String,I) Quit S +#define UCase(%v) $ZCVT(%v,"U") + + ;Identnummer trimmen tot numeriek + 1e char mag een letter zijn. + ;Is gewoon een uitbreiding op TRIMN() . Een meer specifieke implementatie is ook mogelijk. +TRIMIDENT(String) ; [IDENT] Added by WimV on 11/02/2011 + New S,I + Set S="" + Set:($E(String,1)?1AN) S=S_$$$UCase($E(String,1)) + Set S=S_$$TRIMN($E(String,2,99)) + Quit S + ;Extractie van de initialen INITIAL(String) New S,I FishEye: Tag 937 refers to a dead (removed) revision in file `APPS/PM/enu/Actief.cls.xml'. FishEye: No comparison available. Pass `N' to diff? Index: vhUnitTest/DOM/PM/Classificaties/TestClassificaties.cls.xml =================================================================== diff -u -r915 -r937 --- vhUnitTest/DOM/PM/Classificaties/TestClassificaties.cls.xml (.../TestClassificaties.cls.xml) (revision 915) +++ vhUnitTest/DOM/PM/Classificaties/TestClassificaties.cls.xml (.../TestClassificaties.cls.xml) (revision 937) @@ -1,9 +1,10 @@ - + 1 vhUnitTest.TestCase -62157,54929.420103 +62164,47804.31022 +62159,61415.293941 0 @@ -83,11 +84,11 @@ 1 - + Index: DOM/PM/impl/DataM/DataMProductClassificatie.cls.xml =================================================================== diff -u -r734 -r937 --- DOM/PM/impl/DataM/DataMProductClassificatie.cls.xml (.../DataMProductClassificatie.cls.xml) (revision 734) +++ DOM/PM/impl/DataM/DataMProductClassificatie.cls.xml (.../DataMProductClassificatie.cls.xml) (revision 937) @@ -1,9 +1,10 @@ - + 1 DOM.PM.ProductClassificatie,%RegisteredObject -62055,30794.79197 +62164,42065.033852 +62159,61823.272971 0 @@ -55,5 +56,5 @@ ]]> - + Index: DOM/PM/impl/DataM/DataMProductAPI.cls.xml =================================================================== diff -u -r903 -r937 --- DOM/PM/impl/DataM/DataMProductAPI.cls.xml (.../DataMProductAPI.cls.xml) (revision 903) +++ DOM/PM/impl/DataM/DataMProductAPI.cls.xml (.../DataMProductAPI.cls.xml) (revision 937) @@ -1,10 +1,11 @@ - + TECH.Error 1 DOM.PM.ProductAPI,%RegisteredObject -62157,52761.007521 +62164,43808.024305 +62159,61821.306225 0 @@ -92,6 +93,15 @@ ]]> + +TECH.Iterator + + + ProductSpecificatie:DOM.PM.Maatwerk.Calc.Common.ProductSpecificatie,BerekeningsSpecificatie:DOM.PM.Maatwerk.Calc.Common.BerekeningsSpecificatie,HalffabItemsBoom:DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom,KostItem:DOM.PM.Maatwerk.Calc.Kost.SamengesteldKostItem DOM.PM.Product @@ -125,5 +135,5 @@ ]]> - + Index: APPS/PM/enu/ConvertAPPStoDOMenu.cls.xml =================================================================== diff -u --- APPS/PM/enu/ConvertAPPStoDOMenu.cls.xml (revision 0) +++ APPS/PM/enu/ConvertAPPStoDOMenu.cls.xml (revision 937) @@ -0,0 +1,80 @@ + + + +1 +%RegisteredObject +62164,37210.228817 +0 + + +1 +StockType:APPS.PM.enu.StockType +DOM.PM.enu.StockType + + + + +1 +SoortProductID:APPS.PM.enu.SoortProductID +DOM.PM.enu.SoortProductID + + + + +1 +Type:APPS.PM.enu.CommercieelActiefType +DOM.PM.enu.CommercieelActiefType + + + + + Index: TECH/Error/ErrorAdaptor.cls.xml =================================================================== diff -u -r734 -r937 --- TECH/Error/ErrorAdaptor.cls.xml (.../ErrorAdaptor.cls.xml) (revision 734) +++ TECH/Error/ErrorAdaptor.cls.xml (.../ErrorAdaptor.cls.xml) (revision 937) @@ -1,5 +1,5 @@ - + Deze classe definieert 1 method ErrorHandling. @@ -20,7 +20,8 @@ TECH.Error 1 %RegisteredObject -62109,57825.446346 +62164,59636.684137 +62159,61970.855213 0 @@ -39,5 +40,5 @@ ]]> - + Index: APPS/PM/dto/kenm/ProductKenmerken.cls.xml =================================================================== diff -u -r917 -r937 --- APPS/PM/dto/kenm/ProductKenmerken.cls.xml (.../ProductKenmerken.cls.xml) (revision 917) +++ APPS/PM/dto/kenm/ProductKenmerken.cls.xml (.../ProductKenmerken.cls.xml) (revision 937) @@ -1,12 +1,12 @@ - + JBL + 2011-02-28 1 %RegisteredObject,%XML.Adaptor -62153,29154.023047 +62164,33996.637107 62153,42301.382673 0 @@ -16,8 +16,8 @@ -ProductIDs +APPS.PM.dto.ProductIDs - + Index: APPS/PM/dto/ProductIDsControleResult.cls.xml =================================================================== diff -u --- APPS/PM/dto/ProductIDsControleResult.cls.xml (revision 0) +++ APPS/PM/dto/ProductIDsControleResult.cls.xml (revision 937) @@ -0,0 +1,20 @@ + + + +1 +%RegisteredObject,%XML.Adaptor +62160,31776.526107 +62164,32251.573198 +0 + + +%String + + + +APPS.PM.dto.ProductIDs +list + + + + Index: DOM/PM/Product.cls.xml =================================================================== diff -u -r903 -r937 --- DOM/PM/Product.cls.xml (.../Product.cls.xml) (revision 903) +++ DOM/PM/Product.cls.xml (.../Product.cls.xml) (revision 937) @@ -1,9 +1,9 @@ - + 1 1 -62151,49021.505 +62164,43960.244482 62129,41516.729033 0 @@ -63,6 +63,11 @@ + + +1 +TECH.Iterator + - + Index: vhUnitTest/APPS/PM/TestProductService.cls.xml =================================================================== diff -u -r915 -r937 --- vhUnitTest/APPS/PM/TestProductService.cls.xml (.../TestProductService.cls.xml) (revision 915) +++ vhUnitTest/APPS/PM/TestProductService.cls.xml (.../TestProductService.cls.xml) (revision 937) @@ -1,9 +1,10 @@ - + 1 vhUnitTest.TestCase -62157,55150.790172 +62164,45632.613536 +62159,61432.98957 0 @@ -46,20 +47,29 @@ ]]> + + +Multiple + + + Korttekst:%String,VerwachtAantal:%Integer @@ -68,79 +78,79 @@ - + - + @@ -150,17 +160,17 @@ Set Leverancier = 5005 Set Zoek = "358M" - Set Criteria=##class(APPS.PM.dto.SelectCriteria).%New() - Set Criteria.At="K" - Set Criteria.Actief = "" - Set Criteria.KLNr = "" - Set Criteria.LevNr = Leverancier - Set Criteria.LijnMax="" + Set Criteria=##class(APPS.PM.dto.ZoekCriteria).%New() + Set Criteria.SoortProductID=##class(APPS.PM.enu.SoortProductID).Korttekst() + Set Criteria.CommercieelActief = "" + Set Criteria.GekochtDoorKlantnr = "" + Set Criteria.GeleverdDoorLeveranciernr = Leverancier + Set Criteria.MaxAantalResultaten="" Set Criteria.StockType = "" - Set Criteria.SubAt = "" - Set Criteria.Zoek = Zoek + + Set Criteria.ProductID = Zoek Set ProductService = ##class(APPS.PM.ProductService).%New() - Set ProductenLijst = ProductService.Select(Criteria).Items + Set ProductenLijst = ProductService.ZoekProducten(Criteria).HerkendeProducten Do $$$AssertEquals(ProductenLijst.Count(),200,"Aantal gevonden producten met leverancier "_Leverancier_" is correct.") ]]> @@ -198,5 +208,5 @@ ]]> - + Index: APPS/PM/enu/SoortProductID.cls.xml =================================================================== diff -u --- APPS/PM/enu/SoortProductID.cls.xml (revision 0) +++ APPS/PM/enu/SoortProductID.cls.xml (revision 937) @@ -0,0 +1,62 @@ + + + +datatype +1 +%String +62164,37633.129834 +62164,33508.914771 +0 + + +,Korttekst,Identnr,Leveranciersferentie,LangTekst,ProductBoom,Productnr,Dossiernr + + + +;Korttekst;Identnr;Leveranciersferentie;LangTekst;ProductBoom;Productnr;Dossiernr + + + +1 + + + + +1 + + + + +1 + + + + +1 + + + + +1 + + + + +1 + + + + +1 + + + + + Index: vhUnitTest/APPS/PM/TestKenmerkenService.cls.xml =================================================================== diff -u -r915 -r937 --- vhUnitTest/APPS/PM/TestKenmerkenService.cls.xml (.../TestKenmerkenService.cls.xml) (revision 915) +++ vhUnitTest/APPS/PM/TestKenmerkenService.cls.xml (.../TestKenmerkenService.cls.xml) (revision 937) @@ -1,13 +1,18 @@ - + JBL + 2011-02-28 1 -vhUnitTest.TestCase -62154,37631.393419 +vhUnitTest.TestCase,TECH.Error.ErrorAdaptor +62164,61944.212703 +62159,61432.841501 0 + +%String + + %Status + + + + + + + + + + +Label,Options + + - + Index: DOM/PM/impl/DataM/DataMSubgroepClassificatie.cls.xml =================================================================== diff -u -r903 -r937 --- DOM/PM/impl/DataM/DataMSubgroepClassificatie.cls.xml (.../DataMSubgroepClassificatie.cls.xml) (revision 903) +++ DOM/PM/impl/DataM/DataMSubgroepClassificatie.cls.xml (.../DataMSubgroepClassificatie.cls.xml) (revision 937) @@ -1,9 +1,10 @@ - + 1 DOM.PM.Classificatie,%RegisteredObject -62157,38883.081842 +62164,47733.169127 +62159,61821.551046 0 @@ -50,7 +51,7 @@ ]]> - + %Integer @@ -73,5 +74,5 @@ ]]> - + Index: APPS/PM/dto/ProductIDs.cls.xml =================================================================== diff -u --- APPS/PM/dto/ProductIDs.cls.xml (revision 0) +++ APPS/PM/dto/ProductIDs.cls.xml (revision 937) @@ -0,0 +1,29 @@ + + + + +JBL + 2011-02-28 +1 +%RegisteredObject,%XML.Adaptor +62160,39350.059596 +62164,32246.922722 +0 + + +%String + + + +%String + + + +%String + + + +%String + + + + Index: APPS/PM/dto/kenm/KenmerkMetadataList.cls.xml =================================================================== diff -u -r917 -r937 --- APPS/PM/dto/kenm/KenmerkMetadataList.cls.xml (.../KenmerkMetadataList.cls.xml) (revision 917) +++ APPS/PM/dto/kenm/KenmerkMetadataList.cls.xml (.../KenmerkMetadataList.cls.xml) (revision 937) @@ -1,12 +1,12 @@ - + JBL + 2011-03-03 ifv webservice 1 %RegisteredObject,%XML.Adaptor -62153,29781.28575 +62164,38258.467687 62153,42300.444393 0 @@ -15,5 +15,5 @@ list - + Index: JBL_Product_AMF.prj.xml =================================================================== diff -u -r921 -r937 --- JBL_Product_AMF.prj.xml (.../JBL_Product_AMF.prj.xml) (revision 921) +++ JBL_Product_AMF.prj.xml (.../JBL_Product_AMF.prj.xml) (revision 937) @@ -1,6 +1,6 @@ - - + + @@ -11,20 +11,22 @@ - - + + - - - + + + + + @@ -42,8 +44,11 @@ + + + @@ -70,5 +75,5 @@ - + Index: Prod/Product.cls.xml =================================================================== diff -u -r910 -r937 --- Prod/Product.cls.xml (.../Product.cls.xml) (revision 910) +++ Prod/Product.cls.xml (.../Product.cls.xml) (revision 937) @@ -1,11 +1,11 @@ - + persistent vhLib.Macro DataM %Library.Persistent -62138,49972.170883 +62160,58894.972226 59730,43699.597133 0 @@ -687,14 +687,14 @@ Set vCtrlNr="" ;Input onthouden voor foutmeldigen - New OrigDossier + //New OrigDossier Set OrigDossier=Dossier ;Eventueel reeds geplaatste (foutieve of correcte) punten weghalen Set Dossier=$TR(Dossier,".","") ;Controlecijfer ophalen - New Loop,tmpChar,CtrlNr + //New Loop,tmpChar,CtrlNr Set CtrlNr="" For Loop=$L(Dossier):-1:1 Set tmpChar=$E(Dossier,Loop) Quit:('$IsValidNum(tmpChar)) Do . Set CtrlNr=tmpChar_CtrlNr @@ -704,7 +704,7 @@ Write "Controlecijfer: "_CtrlNr,! ;Controlecijfer van dossier strippen - New Rest + //New Rest Set Rest=$ZSTRIP(Dossier,">N") Quit:(Rest="") "" @@ -713,7 +713,7 @@ Quit:($$CHKDIGIT^HAD(Rest)'=CtrlNr) "" ;Groep (Tandembox,banco,...) strippen (1e char) - New Groep,DossierNr + //New Groep,DossierNr Set Groep=$E(Rest,1) Set DossierNr=$E(Rest,2,99999) @@ -723,7 +723,7 @@ Write "ProdCode: "_DossierNr,! - New DottedProdCode,PCLen + //New DottedProdCode,PCLen Set PCLen=$L(DossierNr) If PCLen<4 Do . Set DottedProdCode=DossierNr @@ -753,7 +753,7 @@ ProdNr:%Library.String %Library.String @@ -830,7 +830,7 @@ code %Library.String @@ -890,7 +890,7 @@ %List %String - + FishEye: Tag 937 refers to a dead (removed) revision in file `APPS/PM/dto/kenm/ProductIDs.cls.xml'. FishEye: No comparison available. Pass `N' to diff? Index: TECH/Concurrency/VhPersistent.cls.xml =================================================================== diff -u -r868 -r937 --- TECH/Concurrency/VhPersistent.cls.xml (.../VhPersistent.cls.xml) (revision 868) +++ TECH/Concurrency/VhPersistent.cls.xml (.../VhPersistent.cls.xml) (revision 937) @@ -1,5 +1,5 @@ - + Persistence methods die via inheritance overgenomen worden. @@ -14,7 +14,7 @@ 1 1 %Persistent -62131,34166.016358 +62161,36689.896368 62013,59285.30253 0 @@ -92,5 +92,5 @@ ]]> - + Index: DOM/PM/enu/CommercieelActiefType.cls.xml =================================================================== diff -u --- DOM/PM/enu/CommercieelActiefType.cls.xml (revision 0) +++ DOM/PM/enu/CommercieelActiefType.cls.xml (revision 937) @@ -0,0 +1,32 @@ + + + +datatype +1 +%String +62160,37269.519385 +62164,33506.947699 +0 + + +,A,N + + + +;Actief,Niet Actief + + + +1 + + + + +1 + + + + + Index: DOM/PM/impl/DataM/DataMHoofdgroepClassificatie.cls.xml =================================================================== diff -u -r903 -r937 --- DOM/PM/impl/DataM/DataMHoofdgroepClassificatie.cls.xml (.../DataMHoofdgroepClassificatie.cls.xml) (revision 903) +++ DOM/PM/impl/DataM/DataMHoofdgroepClassificatie.cls.xml (.../DataMHoofdgroepClassificatie.cls.xml) (revision 937) @@ -1,9 +1,10 @@ - + 1 DOM.PM.Classificatie,%RegisteredObject -62157,52903.140271 +62164,47740.009038 +62159,61822.287586 0 @@ -44,7 +45,7 @@ ]]> - + %Integer @@ -84,5 +85,5 @@ ]]> - + Index: DOM/PM/impl/SubgroepClassicatie.cls.xml =================================================================== diff -u -r903 -r937 --- DOM/PM/impl/SubgroepClassicatie.cls.xml (.../SubgroepClassicatie.cls.xml) (revision 903) +++ DOM/PM/impl/SubgroepClassicatie.cls.xml (.../SubgroepClassicatie.cls.xml) (revision 937) @@ -1,9 +1,10 @@ - + 1 %RegisteredObject,DOM.PM.Classificatie -62157,38769.291379 +62164,47791.404952 +62159,61824.248533 0 @@ -42,7 +43,7 @@ %Integer - @@ -52,5 +53,5 @@ ]]> - + Index: UI/PR/Kenm/MainForm.cls.xml =================================================================== diff -u -r908 -r937 --- UI/PR/Kenm/MainForm.cls.xml (.../MainForm.cls.xml) (revision 908) +++ UI/PR/Kenm/MainForm.cls.xml (.../MainForm.cls.xml) (revision 937) @@ -1,11 +1,11 @@ - + serial ProdCataloogCNTs,ReportErrorCNTs,KeyCodesCNTs,%VHMacro,APPS.PM.OL.Common Default %Library.TMFormClass -62158,40331.058276 +62161,35971.128647 62003,35122 0 @@ -731,8 +731,6 @@ Set HoofdGroep=..GetSelectedMetaGroep() Set PRNr=..GetSelectedPRNr() Quit:((HoofdGroep="") || (PRNr="")) - - Do WLIP^vhDBG(127,PRNr) ; Added by WimV on 18/09/2008 Set:('blnKeepSubID) ..lblActiveSubID.Caption="" @@ -748,7 +746,6 @@ For Set kenmerkRunner=$O(Local(kenmerkRunner)) Quit:(kenmerkRunner="") Do . Set DataDefID=UnID_"||"_HoofdGroep_"||"_kenmerkRunner - . Do WLIP^vhDBG(127,DataDefID) . If ##class(Prod.Kenmerk.DataDefinitie).%ExistsId(DataDefID) Do //Resp. obj bestaat -> combo selectie .. Do ..AddMsgToLog(" - Bezig met het openen van de bestaande DataDefinitie..."_kenmerkRunner_".") .. Set tmpDataDef=##class(Prod.Kenmerk.DataDefinitie).%OpenId(DataDefID) @@ -806,7 +803,6 @@ Set YOffs=20 New tmpStatus - Do WLIP^vhDBG(127,"Filter "_Filter) Set tmpStatus=RS.Execute(Filter) //Error handling voor Execute If $$$ISERR(tmpStatus) Do ..ReportError($$$reStatusError,tmpStatus),RS.%Close() Quit @@ -2964,7 +2960,8 @@ New AlreadyLocked Set AlreadyLocked="False" - Lock +^Prod.Ken.DataDefinitieD(UnID):0 Else Set AlreadyLocked="True" + //JBL tijdelijk in commentaar gezet !!! TO DO + //Lock +^Prod.Ken.DataDefinitieD(UnID):0 Else Set AlreadyLocked="True" If AlreadyLocked="True" Do . Do ..AddMsgToLog(" - LOCK: Product '"_UnID_"' is reeds gelocked.") @@ -3283,25 +3280,33 @@ New translationRunner,MultipleLoop Set (translationRunner,MultipleLoop)="" - If $D(Language(Kenmerk)) Do - . New dataEdit,Edit - . For Set translationRunner=$O(Language(Kenmerk,translationRunner)) Quit:(translationRunner="") Do - .. For Set MultipleLoop=$O(Language(Kenmerk,translationRunner,MultipleLoop)) Quit:(MultipleLoop="") Do - ... Set dataEdit=Local(Kenmerk,$$$ldKenmerkEdit,MultipleLoop) - ... Set Edit=Language(Kenmerk,translationRunner,MultipleLoop,$$$lcEdit) - ... If dataEdit.Text="" Do - .... Set Edit.Text="" - ... Else Do - .... New Value - .... Set Value=dataEdit.Text - .... For Quit:($E(Value,$L(Value))'=" ") Set Value=$E(Value,1,$L(Value)-1) - .... New HoofdGroep - .... Set HoofdGroep=..GetSelectedMetaGroep() - .... Do WLIP^vhDBG(127,"UpdateMultipleTransIndic gepasseerd") - .... Quit:(HoofdGroep="") - .... Do WLIP^vhDBG(127,"UpdateMultipleTransIndic gepasseerd 2") - .... Set Edit.Text=DataDef(Kenmerk).GetLanguages(Value,translationRunner) - Do WLIP^vhDBG(127,"UpdateMultipleTransIndic gepasseerd 3") + If $D(Language(Kenmerk)) { + New dataEdit,Edit + Set translationRunner=$O(Language(Kenmerk,translationRunner)) + While(translationRunner="") + { + Set MultipleLoop=$O(Language(Kenmerk,translationRunner,MultipleLoop)) + While (MultipleLoop=""){ + Set dataEdit=Local(Kenmerk,$$$ldKenmerkEdit,MultipleLoop) + Set Edit=Language(Kenmerk,translationRunner,MultipleLoop,$$$lcEdit) + If dataEdit.Text=""{ + Set Edit.Text="" + } + Else { + New Value + Set Value=dataEdit.Text + For Quit:($E(Value,$L(Value))'=" ") Set Value=$E(Value,1,$L(Value)-1) + New HoofdGroep + Set HoofdGroep=..GetSelectedMetaGroep() + if (HoofdGroep '= ""){ + Set Edit.Text=DataDef(Kenmerk).GetLanguages(Value,translationRunner) + } + + } + } + Set translationRunner=$O(Language(Kenmerk,translationRunner)) + } + } Quit ]]> @@ -4553,5 +4558,5 @@ - + Index: Prod/Kenmerk/MetaDefinitie.cls.xml =================================================================== diff -u -r734 -r937 --- Prod/Kenmerk/MetaDefinitie.cls.xml (.../MetaDefinitie.cls.xml) (revision 734) +++ Prod/Kenmerk/MetaDefinitie.cls.xml (.../MetaDefinitie.cls.xml) (revision 937) @@ -1,10 +1,11 @@ - + persistent %VHMacro +1 %Library.Persistent -61986,38500.680847 +62160,61914.031661 59275,52589.182 0 @@ -176,13 +177,15 @@ +0 %List lbVal:%List +0 %Status IsNew:%Library.Boolean=1 +0 %Library.Status 1 Groep:%String +0 Levert de parameter VertalingsGroep terug +0 %String @@ -267,6 +273,7 @@ FunctieResult: $LB($LB(VertalingsType1,Sleutel1),$LB(VertalingsType2,Sleutel2),...) +0 %String +0 %String 1 ID:%String +0 %String 1 MetaDefID:%String +0 %List - + Index: APPS/PM/KenmerkenService.cls.xml =================================================================== diff -u -r917 -r937 --- APPS/PM/KenmerkenService.cls.xml (.../KenmerkenService.cls.xml) (revision 917) +++ APPS/PM/KenmerkenService.cls.xml (.../KenmerkenService.cls.xml) (revision 937) @@ -1,12 +1,13 @@ - + JBL + 2011-02-28 TECH.Error 1 %RegisteredObject -62158,30116.164885 +62164,61084.207615 +62159,61291.134957 0 @@ -21,30 +22,28 @@ Zoek productkenmerken aan de hand van de opgegeven PRNrs en productgroepen. PRNrs = lijst van integers KenmerkGroepen = lijst van strings -PRNrs:APPS.PM.dto.Kenm.StringList,KenmerkGroepen:APPS.PM.dto.Kenm.StringList +PRNrs:%ListOfDataTypes,KenmerkGroepen:%ListOfDataTypes="" APPS.PM.dto.Kenm.ProductenKenmerken Zoek metadata aan de hand van de opgegeven kenmerkengroepen. KenmerkGroepen = lijst van strings -KenmerkGroepen:APPS.PM.dto.Kenm.StringList +KenmerkGroepen:%ListOfDataTypes="" APPS.PM.dto.Kenm.KenmerkMetadataList ProductenKenmerken:APPS.PM.dto.Kenm.ProductenKenmerken %Status "_ProductKenmerk.Waarden.GetAt(1)) + Set Kenmerk.Waarden = ProductKenmerk.Waarden + Set Status = Kenmerk.%Save() + If $$$ISERR(Status) + { + Set ErrorMsg = "Kenmerk "_ProductKenmerk.Groep_"||"_ProductKenmerk.KenmerkNaam_" voor UnID "_UnID_" kon niet worden gesaved.("_$$ParseStatus^vhLib(Status)_")" + } + + }Else + { + Set ErrorMsg = "Kenmerk "_ProductKenmerk.Groep_"||"_ProductKenmerk.KenmerkNaam_" voor UnID "_UnID_" is niet gevonden." + } + } + } + + If (ErrorMsg = ""){ + Do TxScope.Commit() + }Else{ + Do TxScope.Rollback() + $$$ThrowError($$$errGeneralError,"Rollback KenmerkService->BewaarProductenKenmerk"_ErrorMsg) + } + Quit $$$OK ]]> - + Index: APPS/PM/dto/ZoekCriteria.cls.xml =================================================================== diff -u --- APPS/PM/dto/ZoekCriteria.cls.xml (revision 0) +++ APPS/PM/dto/ZoekCriteria.cls.xml (revision 937) @@ -0,0 +1,48 @@ + + + +1 +%RegisteredObject,%XML.Adaptor +62164,34055.957924 +62164,32251.747389 +0 + + +APPS.PM.enu.StockType + + + +APPS.PM.enu.CommercieelActiefType + + + +%String + + + +%String + + + + +Zoek tekst +%String + + + +APPS.PM.enu.SoortProductID + + + +%Integer + + + + +0,1 of meerdere klassificiaties bijhouden +%String +list + + + + Index: APPS/PM/ProductService.cls.xml =================================================================== diff -u -r917 -r937 --- APPS/PM/ProductService.cls.xml (.../ProductService.cls.xml) (revision 917) +++ APPS/PM/ProductService.cls.xml (.../ProductService.cls.xml) (revision 937) @@ -1,46 +1,49 @@ - + -TECH.Error,vhDBG +TECH.Error 1 %RegisteredObject -62157,55723.407646 +62164,48757.3626 +62159,61291.418178 0 - + Geef gegeven de criteria een lijst terug met producten (Prod.Product) -Criteria:APPS.PM.dto.SelectCriteria -APPS.PM.dto.ProductZoekResultaatList +Criteria:APPS.PM.dto.ZoekCriteria +APPS.PM.dto.ProductIDsControleResult 0) && ($Data(MultipleNrs))){ + for i=1:1:$ll(MultipleNrs) + { + Set ProductZoekResultaat = ##class(APPS.PM.dto.ProductIDs).%New() + Set ProductZoekResultaat.IdentNr = Product.GeefIdentNr() + Set ProductZoekResultaat.Korttekst = Product.GeefKorttekst() + Set ProductZoekResultaat.PRNr = Product.GeefPRNr() + Set ProductZoekResultaat.MultipleNr = $p($lg(MultipleNrs,i),".",2) + Do ProductenLijst.HerkendeProducten.Insert(ProductZoekResultaat) + } + } + } + + If ('HeeftMultipleGroepen) + { + Set ProductZoekResultaat = ##class(APPS.PM.dto.ProductIDs).%New() + Set ProductZoekResultaat.IdentNr = Product.GeefIdentNr() + Set ProductZoekResultaat.Korttekst = Product.GeefKorttekst() + Set ProductZoekResultaat.PRNr = Product.GeefPRNr() + Do ProductenLijst.HerkendeProducten.Insert(ProductZoekResultaat) + } + } + + $$$TECHErrorTrapOff Quit ProductenLijst ]]> @@ -79,7 +106,7 @@ While(HoofdgroepClassificatieIt.HasNext()) { Set HoofdgroepClassificatie = HoofdgroepClassificatieIt.Next() - Set Classificatie = ProductAPI.GeefClassificatie(ClassificatieKey, HoofdgroepClassificatie.GeefKKey()) + Set Classificatie = ProductAPI.GeefClassificatie(ClassificatieKey, HoofdgroepClassificatie.GeefClassificatieKey()) If (Classificatie.GeefECType() '= ##class(DOM.PM.enu.PMECType).NietTonen()) { @@ -91,7 +118,7 @@ While(GroepClassificatieIt.HasNext()) { Set GroepClassificatie = GroepClassificatieIt.Next() - Set Classificatie = ProductAPI.GeefClassificatie(ClassificatieKey, GroepClassificatie.GeefKKey()) + Set Classificatie = ProductAPI.GeefClassificatie(ClassificatieKey, GroepClassificatie.GeefClassificatieKey()) If (Classificatie.GeefECType() '= ##class(DOM.PM.enu.PMECType).NietTonen()) { @@ -103,7 +130,7 @@ While(SubgroepClassificatieIt.HasNext()) { Set SubgroepClassificatie = SubgroepClassificatieIt.Next() - Set Classificatie = ProductAPI.GeefClassificatie(ClassificatieKey, SubgroepClassificatie.GeefKKey()) + Set Classificatie = ProductAPI.GeefClassificatie(ClassificatieKey, SubgroepClassificatie.GeefClassificatieKey()) If (Classificatie.GeefECType() '= ##class(DOM.PM.enu.PMECType).NietTonen()) { @@ -128,10 +155,10 @@ Set Classificatie = ##class(APPS.PM.dto.Classificatie).%New() Set Classificatie.Code = ClassificatieObject.GeefCode() Set Classificatie.Omschrijving = ClassificatieObject.GeefNederlands() - Set Classificatie.KKey = ClassificatieObject.GeefKKey() + Set Classificatie.KKey = ClassificatieObject.GeefClassificatieKey() Quit Classificatie ]]> - + Index: DOM/PM/GroepClassificatie.cls.xml =================================================================== diff -u -r903 -r937 --- DOM/PM/GroepClassificatie.cls.xml (.../GroepClassificatie.cls.xml) (revision 903) +++ DOM/PM/GroepClassificatie.cls.xml (.../GroepClassificatie.cls.xml) (revision 937) @@ -1,11 +1,12 @@ - + ^KPHG1, ^KPSG1, ^KPGR1 1 1 -62157,53047.774617 +62164,47729.298359 +62159,61804.183625 0 @@ -23,7 +24,7 @@ %String - + 1 %Integer @@ -33,5 +34,5 @@ %String - + Index: APPS/PM/dto/SelectCriteria.cls.xml =================================================================== diff -u -r917 -r937 --- APPS/PM/dto/SelectCriteria.cls.xml (.../SelectCriteria.cls.xml) (revision 917) +++ APPS/PM/dto/SelectCriteria.cls.xml (.../SelectCriteria.cls.xml) (revision 937) @@ -1,9 +1,10 @@ - + 1 %RegisteredObject,%XML.Adaptor -62154,36474.412443 +62161,53697.087282 +62159,61291.514718 0 @@ -65,8 +66,8 @@ 0,1 of meerdere klassificiaties bijhouden -APPS.PM.dto.Kenm.StringList +DOM.dto.StringList - + Index: TECH/Error/impl/ErrorHandler/1.int.rou =================================================================== diff -u --- TECH/Error/impl/ErrorHandler/1.int.rou (revision 0) +++ TECH/Error/impl/ErrorHandler/1.int.rou (revision 937) @@ -0,0 +1,145 @@ + ;TECH.Error.impl.ErrorHandler.1 + ;(C)InterSystems, generated for class TECH.Error.impl.ErrorHandler. Do NOT edit. 03/14/2011 04:21:16PM + ;;2A3C27020CA3160E;TECH.Error.impl.ErrorHandler + Quit + ; +%ClassName(fullname) public { Quit $select($get(fullname,0):"TECH.Error.impl.ErrorHandler",1:"ErrorHandler") } +%Close(%this) Quit ..%Close() +%ConstructClone(%this,deep,cloned) public { Set deep=$get(deep,0) Set object=%this + If $data(cloned(+object)) Do (cloned(+object)).%IncrementCount() Quit cloned(+object) + Set %this=$zobjnew("TECH.Error.impl.ErrorHandler") + Set cloned(+object)=%this,cloned(+object,0)=object + Quit %this } +%Extends(isclass) public { Quit "~TECH.Error.impl.ErrorHandler~%Library.RegisteredObject~"[("~"_$s(isclass[".":isclass,$e(isclass)'="%":"User."_isclass,1:"%Library."_$e(isclass,2,$l(isclass)))_"~") } +%GetParameter(paramname) public { Set paramname=$get(paramname) Quit $case(paramname,"PROPERTYVALIDATION":0,:"") } +%IncrementCount(%this) Quit ..%IncrementCount() +%IsA(isclass) public { Quit "~TECH.Error.impl.ErrorHandler~%Library.RegisteredObject~"[("~"_$s(isclass[".":isclass,$e(isclass)'="%":"User."_isclass,1:"%Library."_$e(isclass,2,$l(isclass)))_"~") } +%IsModified(%this) public { Quit 1 } +%New(initvalue) public { Quit ##class(TECH.Error.impl.ErrorHandler).%New($get(initvalue)) +} +%NormalizeObject(%this) Quit 1 +%ObjectModified(%this) public { Quit 1 } +%PackageName() Quit "TECH.Error.impl" +%SerializeObject(%this,serial,partial) Set partial=$get(partial,0) New %objOBJ,sc,id + Set $Ztrap = "%SerializeObjectERR" + Set sc=..%ValidateObject() If ('sc) { Ztrap "SO" } + Set sc=..%NormalizeObject() If ('sc) { Ztrap "SO" } + Quit sc +%SerializeObjectERR Set $ZTrap="" If $extract($zerror,1,5)'="" Set sc=$$Error^%apiOBJ(5002,$ZE) + Quit sc +%AddToSaveSet(%this,depth,refresh,norecurseon) public { Set depth=$get(depth,3),refresh=$get(refresh,0),norecurseon=$get(norecurseon) If ($data(%objTX(1,+%this))) && ('refresh) Quit 1 + Set sc=1,intOref=+%this + If refresh { + Set intPoref=$order(%objTX(1,intOref,2,"")) + While intPoref'="" { Kill %objTX(1,intPoref,3,intOref),%objTX(1,intOref,2,intPoref) Set intPoref=$order(%objTX(1,intOref,2,intPoref)) } + } + Set tDepth=$select(depth'=2:depth,1:1) + Set %objTX(2,intOref)=0 +exit Quit sc } +%RemoveFromSaveSet(%this) public { + If '($data(%objTX(1,+%this))) Quit 1 + Set intRef=+%this + Set intSucc="" For Set intSucc=$order(%objTX(1,intRef,3,intSucc)) Quit:intSucc="" Kill %objTX(1,intSucc,2,intRef) + Set intPred="" For Set intPred=$order(%objTX(1,intRef,2,intPred)) Quit:intPred="" Kill %objTX(1,intPred,3,intRef) + Kill %objTX(1,intRef),%objTX(2,intRef) + Quit 1 } +%SetModified(%this,value) public { Quit 1 } +%ValidateObject(%this,force) Set force=$get(force,0) Quit 1 +zCrashDuringErrorHandling(sc) public { set From = """"_"TECH Error Handler"_""" " + Set Body="Bij het versturen van de errormail heeft zich een fout voorgedaan waardoor de mail niet kon verstuurd worden" + Set:$G(sc) Body=Body_$C(13,10)_$$ParseStatus^vhLib(sc) + Set Subj="TECH - ErrorHandler : Crash during error handling" + Set To=$listbuild(##class(TECH.Config.ConfigMgr).Instance().GetString("TECH.Error.impl.ErrorHandler_DefaultMailAddress")) + Set sc=$$SendMiniMail^vhLib(From,To,Subj,Body,,,,,) } +zGetInfo(Label) public { Set Error=##class(TECH.Error.dto.ErrorInfo).%New() + Set Error.Label=$G(Label) + Set Error.ErrorCode=$ZERROR + Set:Error.ErrorCode["" Error.ErrorCode2=$ECODE + ;Set $ECODE = "" // $ECODE op leeg zetten anders gaat hij verder den boom in :) + Set Error.TrapHandler=$ETrap + Set:$G(%objlasterror)'="" Error.ObjectLastError=$$ParseStatus^vhLib(%objlasterror) + Set Error.StackTrace=##class(TECH.Error.impl.ErrorHandler).StackTrace(3) + Set Error.Device=$I + Set Error.Job=$J + Set Error.Server=$ZU(110) + Set Error.NameSpace=$ZU(5) + Do ##class(TECH.Error.impl.ErrorHandler).SetRemoteIP(Error) + Do ##class(TECH.Error.impl.ErrorHandler).UserText(Error) + Quit Error } +zGetMailAddress(Error) public { Set User=$Case($P(Error.RemoteIP,".",4), 15:"pv", 27:"cw", 97:"wv", 127:"jbl", 138:"wro", 150:"pra", 191:"csc" , 195:"jcl", 204:"fma" , 205:"csc", :"") + Set:(User="") User=$Select($P($P(Error.Device,"|TNT|",2),"_",1)?1(1"pv",1"cw",1"wv",1"jbl",1"wro",1"pra",1"jcl",1"fma",1"csc"):$P($P(Error.Device,"|TNT|",2),"_",1), 1:"") + Quit:($Length(User)) User_"@vanhoecke.be" + set Default = ##class(TECH.Config.ConfigMgr).Instance().GetString("TECH.Error.impl.ErrorHandler_DefaultMailAddress") + Quit Default } +zHandler(Label,Options) public { Set %ErrorObject=##class(TECH.Error.impl.ErrorHandler).GetInfo(.Label) + Do:($ZCVT($G(Options),"U")'["NOMAIL") ##class(TECH.Error.impl.ErrorHandler).MailError(%ErrorObject) + Do:($ZCVT($G(Options),"U")'["NOLOG") ##class(TECH.Error.impl.ErrorHandler).LogError(%ErrorObject) } +zLogError(Error) public { Do Error.XMLExportToString(.Info,,"literal,indent") + if $Data(%vhLastError) { + set LastErrorInfo = ##class(%Library.GlobalCharacterStream).%New() + do LastErrorInfo.WriteLine(%vhLastError.%ClassName(1)) + do %vhLastError.XMLExportToStream(.LastErrorInfo,,"literal,indent") + } + Set Logger=##class(vhLib.Logger).%New("TECH.Error") + if $data(LastErrorInfo) { + Set Log=Logger.Error($S(Error.Label="":"NoLabel",1:Error.Label), LastErrorInfo) + } + Set Log=Logger.Error($S(Error.Label="":"NoLabel",1:Error.Label), Info) } +zMailError(Error) public { //Quit:($$$UCase(Error.Server)="CACHE02")&&($$$UCase(Error.NameSpace)?1(1"DEV-ADMIN1")) + set Body = ##class(%Library.GlobalCharacterStream).%New() + do Body.WriteLine("Errors:") + if Error.ErrorCode'="" do Body.WriteLine(" $ZERROR: "_Error.ErrorCode) + if Error.ErrorCode2'="" do Body.WriteLine(" $ECODE: "_Error.ErrorCode2) + if Error.ObjectLastError'="" do Body.WriteLine(" ObjectLastError: "_Error.ObjectLastError) + do Body.WriteLine() + do Body.WriteLine("TrapHandler: "_Error.TrapHandler) + do Body.WriteLine("Stack: "_Error.StackTrace) + do Body.WriteLine() + do Body.WriteLine("RemoteIP: "_Error.RemoteIP) + do Body.WriteLine() + do Body.WriteLine("Device: "_Error.Device_" Job: "_Error.Job) + do Body.WriteLine("Server: "_Error.Server_" NameSpace: "_Error.NameSpace) + do Body.WriteLine() + do Body.WriteLine("Variabelen : ") + set Var = "%" + for { set Var = $order(@Var) quit:Var="" + ;continue:Var="%vhLastError" + ;continue:Var="%ErrorObject" + ;continue:Var="%this" + do Body.WriteLine(Var_" : "_@Var) + if $IsObject(@Var) { + //do Body.WriteLine($$ObjToText^vhLib(@Var)) + } + } + Set From=""""_"TECH ErrorHandler"_""" " + Set Subj="TECH - ErrorHandler : " _ + $select($length(Error.Label):Error.Label_" : ",1:"") _ Error.ErrorCode _ + $select($length(Error.ErrorCode2):" | "_Error.ErrorCode2,1:"") + Set To = $listbuild(##class(TECH.Error.impl.ErrorHandler).GetMailAddress(Error)) + Set sc=$$SendMiniMail^vhLib(From,To,Subj,Body,1,,,,) + If ('sc) { + Do ##class(TECH.Error.impl.ErrorHandler).CrashDuringErrorHandling(sc) + } + Quit } +zSetRemoteIP(Error) public { If ($IsObject($G(%request)))&&(%request.%IsA("%CSP.Request")) { + Set %RemoteIP=$G(%request.CgiEnvs("REMOTE_ADDR")) + Set Error.RemoteIP=%RemoteIP + } + Quit } +zStackTrace(From) public { Set From=$get(From,1) Set Txt="" + For i=From:1:$ESTACK Set Txt=Txt_$C(13,10)_" "_$STACK($STACK-i)_" : "_$STACK($STACK-i,"PLACE")_" -> "_$STACK($STACK-i,"MCODE") + Quit Txt } +zTrapHandler(Label,Options) public { Set $ETRAP="Do ##class(TECH.Error.impl.ErrorHandler).CrashDuringErrorHandling()" + If '$isObject($G(%ErrorObject)) + { + Do ##class(TECH.Error.impl.ErrorHandler).Handler(.Label,.Options) + } + Set $ETRAP="" } +zUserText(Error) public { Set Delim=$E(Error.ErrorCode) + If $L($Piece(Error.ErrorCode,Delim,5)) + { + Set UserText=$Piece(Error.ErrorCode,Delim,5,99) + Set:($Length(UserText))&&($E(UserText,$Length(UserText))=Delim) $E(UserText,$Length(UserText))="" + Set Error.UserText=UserText + } + Quit } \ No newline at end of file Index: APPS/PM/enu/CommercieelActiefType.cls.xml =================================================================== diff -u --- APPS/PM/enu/CommercieelActiefType.cls.xml (revision 0) +++ APPS/PM/enu/CommercieelActiefType.cls.xml (revision 937) @@ -0,0 +1,32 @@ + + + +datatype +1 +%String +62164,37715.198576 +62164,33506.947699 +0 + + +,Actief,NietActief + + + +;Actief,Niet Actief + + + +1 + + + + +1 + + + + + Index: Prod/Kenmerk/DataDefinitie.cls.xml =================================================================== diff -u -r910 -r937 --- Prod/Kenmerk/DataDefinitie.cls.xml (.../DataDefinitie.cls.xml) (revision 910) +++ Prod/Kenmerk/DataDefinitie.cls.xml (.../DataDefinitie.cls.xml) (revision 937) @@ -1,5 +1,5 @@ - + Vaste leggen van de kenmerken per product. @@ -9,11 +9,19 @@ moeten voor een bepaald product alle waarden verzameld worden. persistent %VHMacro -%Library.Persistent -62150,59282.768952 +1 +TECH.Concurrency.VhPersistent +62161,42938.382223 59232,54592 0 + + + + Prod.Kenmerk.MetaDefinitie @@ -58,6 +66,7 @@ IsNew:%Library.Boolean=1 +0 %Library.Status @@ -89,6 +98,7 @@ Verwijderen van de DataIndex objecten 1 Oid:%Library.ObjectIdentity +0 %Library.Status 1 GroepID,UnID,Kenmerk,Values,Delimiter,UserID,Formule:%String="" +0 %Status 1 GroepID,UnID,Kenmerk +1 @@ -250,6 +263,7 @@ GroepID is optioneel 1 UnID,GroepID +0 %Boolean Intern:%Library.String,Type:%Library.String +0 %Library.String 1 Params:%Library.String +0 %Library.String @@ -532,6 +548,7 @@ Interne volgorde van de list Waarden wordt gewijzigd (dus in de storage), voor het gekozen kenmerk, voor alle producten. 1 GroepID:%Library.String,Kenmerk:%Library.String +0 %Status LBX:%Library.String,ListSep:%Library.String,Taal:%Library.String="N",TextType:%Library.String="L",DoNotConvert2Html:%Boolean +0 %Library.String X:%Library.String,Taal:%Library.String="N",TextType:%Library.String="L",ClearCharEmpty:%Library.Boolean=0,DoNotConvert2Html:%Boolean +0 %Library.String Formule + +InstanceVersion + - + FishEye: Tag 937 refers to a dead (removed) revision in file `APPS/PM/dto/kenm/StringList.cls.xml'. FishEye: No comparison available. Pass `N' to diff? Index: WS/PM/KenmerkenService.cls.xml =================================================================== diff -u -r913 -r937 --- WS/PM/KenmerkenService.cls.xml (.../KenmerkenService.cls.xml) (revision 913) +++ WS/PM/KenmerkenService.cls.xml (.../KenmerkenService.cls.xml) (revision 937) @@ -1,21 +1,18 @@ - + JBL + 2011-03-03 1 -%SOAP.WebService -62153,47470.559241 +WS.WebService +62164,60952.223751 +62159,61728.27553 0 APPS.PM.KenmerkenService - -http://tempuri.org - - 2011-03-02 : JBL : Deze ingestelde VeldBreedteInTekens is een tijdelijke oplossing. Later moet dit als data worden opgeslaan. @@ -28,10 +25,14 @@ Zoek productkenmerken aan de hand van de opgegeven PRNrs en productgroepen. PRNrs = lijst van integers KenmerkGroepen = lijst van strings -PRNrs:APPS.PM.dto.Kenm.StringList,KenmerkGroepen:APPS.PM.dto.Kenm.StringList +PRNrs:%ListOfDataTypes,KenmerkGroepen:%ListOfDataTypes APPS.PM.dto.Kenm.ProductenKenmerken 1 - @@ -40,12 +41,31 @@ Zoek metadata aan de hand van de opgegeven kenmerkengroepen. KenmerkGroepen = lijst van strings 1 -KenmerkGroepen:APPS.PM.dto.Kenm.StringList +KenmerkGroepen:%ListOfDataTypes APPS.PM.dto.Kenm.KenmerkMetadataList 1 - + + + +De opgegeven ProductenKenmerken bewaren +1 +ProductenKenmerken:APPS.PM.dto.Kenm.ProductenKenmerken +%Status +1 + + - + Index: vhUnitTest/DOM/PM/OL/Gamma/TestData.cls.xml =================================================================== diff -u -r793 -r937 --- vhUnitTest/DOM/PM/OL/Gamma/TestData.cls.xml (.../TestData.cls.xml) (revision 793) +++ vhUnitTest/DOM/PM/OL/Gamma/TestData.cls.xml (.../TestData.cls.xml) (revision 937) @@ -1,10 +1,11 @@ - + vhLib.Macro,vhUnitTest.DOM.PM.OL.Gamma 1 %RegisteredObject -62125,35719.177107 +62164,42728.555302 +62159,61416.449762 0 @@ -32,7 +33,6 @@ do BLDIND^PRODUKT2(PRNr) do ..SetKenmerkWaarden(PRNr) ; - } do ..AddGroepSleutelsToMetaDef() ]]> @@ -592,5 +592,5 @@ ]]> - +