Index: APPS/VisiDot/impl/VHossProductionHelper.cls.xml =================================================================== diff -u -r1749 -r1808 --- APPS/VisiDot/impl/VHossProductionHelper.cls.xml (.../VHossProductionHelper.cls.xml) (revision 1749) +++ APPS/VisiDot/impl/VHossProductionHelper.cls.xml (.../VHossProductionHelper.cls.xml) (revision 1808) @@ -143,7 +143,7 @@ QueueElement - Index: APPS/VisiDot/dto/CaptureInfo.cls.xml =================================================================== diff -u -r1791 -r1808 --- APPS/VisiDot/dto/CaptureInfo.cls.xml (.../CaptureInfo.cls.xml) (revision 1791) +++ APPS/VisiDot/dto/CaptureInfo.cls.xml (.../CaptureInfo.cls.xml) (revision 1808) @@ -12,7 +12,9 @@ -1 + +JBL : XMLSEQUENCE uitgezet omdat volgorde van oude testbestanden niet overeenkwam met volgorde van tags in nieuwe testbestanden. +0 Index: APPS/VisiDot/zTryout.cls.xml =================================================================== diff -u -r1768 -r1808 --- APPS/VisiDot/zTryout.cls.xml (.../zTryout.cls.xml) (revision 1768) +++ APPS/VisiDot/zTryout.cls.xml (.../zTryout.cls.xml) (revision 1808) @@ -31,12 +31,13 @@ ]]> - - -D ##class(APPS.VisiDot.zTryout).%New().Import("c:\","Stage_3_After_DUAL_Before_ERP.xml") -D ##class(APPS.VisiDot.zTryout).%New().End("c:\","Stage_1_Reader_Source.xml") -Dir,FileName - + - +} +*/ +]]> + D ##class(APPS.VisiDot.zTryout).%New().Zijkant() @@ -75,5 +80,83 @@ Quit $$$OK ]]> + + +Dir,FileName +1 +APPS.VisiDot.dto.CaptureInfo + + + + +ProcessedData +1 + + + + + +JBL - hulp method om visueel overzicht op te vragen +Set Dir = "E:\Svn\CACHE\CacheAdminAUnitTests\APPS.VisiDot\Stage2_NormalRead_AllOk\" +Set File = "ReadResults_ReadID00000182_Controller_Gate1_Status00_Time_20110814_153423_890_DUAL_(Stage_3_Before_DB_Insertion).xml" +Set CaptureInfo = ..Import(Dir, File) +d ##class(APPS.VisiDot.zTryout).%New().ShowVHoss(CaptureInfo) +CaptureInfo:APPS.VisiDot.dto.CaptureInfo + + Index: vhUnitTest/APPS/VisiDot/TestVHossXML.cls.xml =================================================================== diff -u -r1791 -r1808 --- vhUnitTest/APPS/VisiDot/TestVHossXML.cls.xml (.../TestVHossXML.cls.xml) (revision 1791) +++ vhUnitTest/APPS/VisiDot/TestVHossXML.cls.xml (.../TestVHossXML.cls.xml) (revision 1808) @@ -29,10 +29,10 @@ Set SlotLabel=0 Set TOENr=234567 Set KLNr=1239 - Set SequenceNr=0 - Set QueueList = "418715;1;1.1\418582;1;1.1\418589;1;1.1\418582;2;1.1\" - Set QueueList = QueueList_"418703;2;1.1\418589;2;1.1\418582;1;1.1\" - Set QueueList = QueueList_"418589;3;1.1\418703;2;1.1" + Set SequenceNr=0 + Set QueueList = "418715;1;1.1\418582;1;1.1\418589;1;1.1\418582;2;1.1\418588;3;1.1\418581;1;1.1\418609;1;1.1\" + Set QueueList = QueueList_"418703;1;1.1\418589;2;1.1\418703;1;1.1\418582;1;1.1\418581;2;1.1\418582;1;1.1\418715;1;1.1\418588;1;1.1" + Set QueueList = QueueList_"418589;3;1.1\418703;2;1.1\418582;1;1.1\418703;1;1.1\418704;1;1.1\418715:1:1.1\418704;1;1.1" Do QueueBuilder.Initialize(BatchID,SlotLabel,TOENr,KLNr,SequenceNr,QueueList) Set BatchID=QueueBuilder.BuildBatch() @@ -78,33 +78,118 @@ ]]> - + + + + + -ActionType:%String,CaptureInfo:APPS.VisiDot.dto.CaptureInfo +ActionType:APPS.VisiDot.enu.ActionCodes,CaptureInfo:APPS.VisiDot.dto.CaptureInfo %Status Bepaald of deze classe geschikt als verwerker 1 -ActionType:%String,Data:APPS.VisiDot.dto.CaptureInfo +ActionType:APPS.VisiDot.enu.ActionCodes,Data:APPS.VisiDot.dto.CaptureInfo %Boolean @@ -63,7 +63,7 @@ - + %Status Index: PV VisiDot.prj.xml =================================================================== diff -u -r1791 -r1808 --- PV VisiDot.prj.xml (.../PV VisiDot.prj.xml) (revision 1791) +++ PV VisiDot.prj.xml (.../PV VisiDot.prj.xml) (revision 1808) @@ -1,6 +1,6 @@ - + @@ -17,7 +17,6 @@ - @@ -45,10 +44,12 @@ + + Index: APPS/VisiDot/Controleur.cls.xml =================================================================== diff -u -r1717 -r1808 --- APPS/VisiDot/Controleur.cls.xml (.../Controleur.cls.xml) (revision 1717) +++ APPS/VisiDot/Controleur.cls.xml (.../Controleur.cls.xml) (revision 1808) @@ -24,7 +24,7 @@ -ActionType:%String,CaptureInfo:APPS.VisiDot.dto.CaptureInfo +ActionType:APPS.VisiDot.enu.ActionCodes,CaptureInfo:APPS.VisiDot.dto.CaptureInfo %Status 1 1 -ActionType:%String,Data:APPS.VisiDot.dto.CaptureInfo +ActionType:APPS.VisiDot.enu.ActionCodes,Data:APPS.VisiDot.dto.CaptureInfo %Boolean @@ -48,7 +48,7 @@ Controleren van de data en aanpassen van deze data met extra informatie 1 -ResultDesc:%String,ProcessedData:APPS.VisiDot.dto.CaptureInfo +ResultDesc:APPS.VisiDot.enu.ActionCodes,ProcessedData:APPS.VisiDot.dto.CaptureInfo %Status Index: APPS/PM/KenmerkenService.cls.xml =================================================================== diff -u -r1771 -r1808 --- APPS/PM/KenmerkenService.cls.xml (.../KenmerkenService.cls.xml) (revision 1771) +++ APPS/PM/KenmerkenService.cls.xml (.../KenmerkenService.cls.xml) (revision 1808) @@ -100,7 +100,7 @@ } Set SQLStatement = SQLStatement_" PRNr In ( "_SQLPRNrs_" )" - //D WLIP^vhDBG(127,SQLStatement) + D WLIP^vhDBG(127,SQLStatement) Do RS.Prepare(SQLStatement) Set tmpStatus = RS.Execute() If $$$ISOK(tmpStatus) Index: APPS/VisiDot/impl/CaptureHelper.cls.xml =================================================================== diff -u -r1791 -r1808 --- APPS/VisiDot/impl/CaptureHelper.cls.xml (.../CaptureHelper.cls.xml) (revision 1791) +++ APPS/VisiDot/impl/CaptureHelper.cls.xml (.../CaptureHelper.cls.xml) (revision 1808) @@ -69,16 +69,23 @@ -FoutType,Titel,Omschrijving +FoutType:APPS.VisiDot.enu.FoutTypes,Titel:%String,Omschrijving:%String + + + + -FoutType +FoutType:APPS.VisiDot.enu.FoutTypes="" @@ -124,6 +138,9 @@ Set ERP=..GeefERP() Do ERP.ErrorMessage.Insert(ErrorMessage) + + /// ERP ReadStatus instellen + Do ..ZetReadStatus(##class(APPS.VisiDot.enu.ResultCodes).Fout()) ]]> @@ -262,5 +279,14 @@ } ]]> + + +Status:APPS.VisiDot.enu.ResultCodes +1 + + Index: vhUnitTest/APPS/VisiDot/TestCaptureHelper.cls.xml =================================================================== diff -u --- vhUnitTest/APPS/VisiDot/TestCaptureHelper.cls.xml (revision 0) +++ vhUnitTest/APPS/VisiDot/TestCaptureHelper.cls.xml (revision 1808) @@ -0,0 +1,127 @@ + + + +1 +vhUnitTest.TestCase +0 + + +APPS.VisiDot.impl.VHossCaptureHelper + + + + +Opzetten van de VHossBuilder +aTestName:%String +%Status + + + + + + + + + + + + + + + + + + + + + + + + Index: APPS/VisiDot/impl/VHossControleurEnd.cls.xml =================================================================== diff -u -r1754 -r1808 --- APPS/VisiDot/impl/VHossControleurEnd.cls.xml (.../VHossControleurEnd.cls.xml) (revision 1754) +++ APPS/VisiDot/impl/VHossControleurEnd.cls.xml (.../VHossControleurEnd.cls.xml) (revision 1808) @@ -33,11 +33,11 @@ -ActionType:%String,CaptureInfo:APPS.VisiDot.dto.CaptureInfo +ActionType:APPS.VisiDot.enu.ActionCodes,CaptureInfo:APPS.VisiDot.dto.CaptureInfo %Status @@ -46,7 +46,7 @@ Bepaald of deze classe geschikt als verwerker 1 -ActionType:%String,Data:APPS.VisiDot.dto.CaptureInfo +ActionType:APPS.VisiDot.enu.ActionCodes,Data:APPS.VisiDot.dto.CaptureInfo %Boolean @@ -55,7 +55,7 @@ - + %Status 0 -,0,5001,5011,5012,5002,5025,5026,5024 +,0,5001,5011,5012,5002,5003,5004,5024,5025,5026,5100,5201,5202 Index: APPS/VisiDot/dto/StatusLight.cls.xml =================================================================== diff -u -r1717 -r1808 --- APPS/VisiDot/dto/StatusLight.cls.xml (.../StatusLight.cls.xml) (revision 1717) +++ APPS/VisiDot/dto/StatusLight.cls.xml (.../StatusLight.cls.xml) (revision 1808) @@ -5,6 +5,7 @@ Created from: c:/stage4.xsd 1 %RegisteredObject,%XML.Adaptor +0 StatusLight @@ -15,7 +16,7 @@ -%String +APPS.VisiDot.enu.DetectionKleur Index: WS/VisiDot/OperatorServer.cls.xml =================================================================== diff -u -r1791 -r1808 --- WS/VisiDot/OperatorServer.cls.xml (.../OperatorServer.cls.xml) (revision 1791) +++ WS/VisiDot/OperatorServer.cls.xml (.../OperatorServer.cls.xml) (revision 1808) @@ -16,6 +16,23 @@ http://www.imageid.zetes.com/OperatorWS/V1 + + + + + + + + APPS.VisiDot.Controleur 1 @@ -32,24 +49,28 @@ - +When the Operator starts communicating with the WS, it first checks that this function returns some value. +The returned value is not validated, but it is written in the Log file of the Operator. +%Integer 1 + - + 1 -ActionType:%String,Data:APPS.VisiDot.dto.CaptureInfo +ActionType:APPS.VisiDot.enu.ActionCodes,Data:APPS.VisiDot.dto.CaptureInfo 1 APPS.VisiDot.Controleur 0 -,SYSTEM,ERROR,WARNING +,SYSTEM,ERROR,WARNING,OK Index: APPS/VisiDot/impl/DetectionHelper.cls.xml =================================================================== diff -u -r1749 -r1808 --- APPS/VisiDot/impl/DetectionHelper.cls.xml (.../DetectionHelper.cls.xml) (revision 1749) +++ APPS/VisiDot/impl/DetectionHelper.cls.xml (.../DetectionHelper.cls.xml) (revision 1808) @@ -32,7 +32,7 @@ -APPS.VisiDot.dto.CaptureInfo +APPS.VisiDot.dto.Detection Index: APPS/VisiDot/dto/DUAL.cls.xml =================================================================== diff -u -r1717 -r1808 --- APPS/VisiDot/dto/DUAL.cls.xml (.../DUAL.cls.xml) (revision 1717) +++ APPS/VisiDot/dto/DUAL.cls.xml (.../DUAL.cls.xml) (revision 1808) @@ -5,6 +5,7 @@ Created from: c:/stage4.xsd 1 %RegisteredObject,%XML.Adaptor +0 DUAL @@ -45,5 +46,12 @@ + + +%String + + + +