diff --git a/AUTS_Win/AUTS_Win.vbproj b/AUTS_Win/AUTS_Win.vbproj index 3f9308c..cab1da3 100644 --- a/AUTS_Win/AUTS_Win.vbproj +++ b/AUTS_Win/AUTS_Win.vbproj @@ -26,7 +26,7 @@ false true 0 - 1.8.4.%2a + 1.8.5.%2a false true diff --git a/AUTS_Win/My Project/AssemblyInfo.vb b/AUTS_Win/My Project/AssemblyInfo.vb index 763fd80..2bc8253 100644 --- a/AUTS_Win/My Project/AssemblyInfo.vb +++ b/AUTS_Win/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices '通过使用 "*"，如下所示: ' - - + + diff --git a/AUTS_Win/bin/Debug/AUTS_Win.exe b/AUTS_Win/bin/Debug/AUTS_Win.exe index a0dc08e..c4be42e 100644 Binary files a/AUTS_Win/bin/Debug/AUTS_Win.exe and b/AUTS_Win/bin/Debug/AUTS_Win.exe differ diff --git a/AUTS_Win/bin/Debug/AUTS_Win.pdb b/AUTS_Win/bin/Debug/AUTS_Win.pdb index b712392..f7e1937 100644 Binary files a/AUTS_Win/bin/Debug/AUTS_Win.pdb and b/AUTS_Win/bin/Debug/AUTS_Win.pdb differ diff --git a/AUTS_Win/bin/Debug/UTS_Core.dll b/AUTS_Win/bin/Debug/UTS_Core.dll index 63456ab..77499ed 100644 Binary files a/AUTS_Win/bin/Debug/UTS_Core.dll and b/AUTS_Win/bin/Debug/UTS_Core.dll differ diff --git a/AUTS_Win/bin/Debug/UTS_Core.pdb b/AUTS_Win/bin/Debug/UTS_Core.pdb index 081f67a..d380e5c 100644 Binary files a/AUTS_Win/bin/Debug/UTS_Core.pdb and b/AUTS_Win/bin/Debug/UTS_Core.pdb differ diff --git a/AUTS_Win/bin/Debug/UTS_Core.xml b/AUTS_Win/bin/Debug/UTS_Core.xml index 0af166c..5e44c60 100644 --- a/AUTS_Win/bin/Debug/UTS_Core.xml +++ b/AUTS_Win/bin/Debug/UTS_Core.xml @@ -7883,6 +7883,9 @@ UTS_Core 测试节点完成事件 + +测试节点结果变化事件 + 测试时间变更事件 diff --git a/AUTS_Win/obj/Debug/AUTS_Win.exe b/AUTS_Win/obj/Debug/AUTS_Win.exe index a0dc08e..c4be42e 100644 Binary files a/AUTS_Win/obj/Debug/AUTS_Win.exe and b/AUTS_Win/obj/Debug/AUTS_Win.exe differ diff --git a/AUTS_Win/obj/Debug/AUTS_Win.pdb b/AUTS_Win/obj/Debug/AUTS_Win.pdb index b712392..f7e1937 100644 Binary files a/AUTS_Win/obj/Debug/AUTS_Win.pdb and b/AUTS_Win/obj/Debug/AUTS_Win.pdb differ diff --git a/AUTS_Win/obj/Debug/AUTS_Win.vbprojAssemblyReference.cache b/AUTS_Win/obj/Debug/AUTS_Win.vbprojAssemblyReference.cache index 8cdbcae..4f9d393 100644 Binary files a/AUTS_Win/obj/Debug/AUTS_Win.vbprojAssemblyReference.cache and b/AUTS_Win/obj/Debug/AUTS_Win.vbprojAssemblyReference.cache differ diff --git a/AUTS_Win/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/AUTS_Win/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 32472c0..4107106 100644 Binary files a/AUTS_Win/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/AUTS_Win/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/UTS_Core/UTSModule/IUtsTest.vb b/UTS_Core/UTSModule/IUtsTest.vb index 3380f0e..04a48a6 100644 --- a/UTS_Core/UTSModule/IUtsTest.vb +++ b/UTS_Core/UTSModule/IUtsTest.vb @@ -20,6 +20,8 @@ Namespace UTSModule Sub TestNodeCompleted(sender As Object, e As TestNodeCompletedEventArgs) + Sub TestNodeResultChanged(sender As Object, e As TestNodeResultChangedEventArgs) + Sub TestCountChanged(sender As Object, e As TestCountChangedEventArgs) Sub TestStatusChanged(sender As Object, e As TestStatusChangedEventArgs) diff --git a/UTS_Core/UTSModule/Station/FrmStationPlan.vb b/UTS_Core/UTSModule/Station/FrmStationPlan.vb index b31ccda..c1b31b8 100644 --- a/UTS_Core/UTSModule/Station/FrmStationPlan.vb +++ b/UTS_Core/UTSModule/Station/FrmStationPlan.vb @@ -394,6 +394,29 @@ Namespace UTSModule.Station _planGrid.TestNodeChanged(e.Node) End Sub + + Private Sub TestNodeResultChanged(sender As Object, e As TestNodeResultChangedEventArgs) Implements IUtsTest.TestNodeResultChanged + If _tester.DebugMode = False Then Return + If GrdStationPlan.InvokeRequired Then '判断是否需要开委托 + GrdStationPlan.Invoke(New Action(Of Object, TestNodeResultChangedEventArgs)(AddressOf TestNodeResultChanged), New Object() {sender, e}) + Return + End If + + Dim cor As Color + If e.TestReturn.ExecuteResult Then + cor = Color.Green + Else + cor = Color.Red + End If + 'Dim txt As String = $"Result:{e.TestReturn.ExecuteResult};Retrun:{e.TestReturn.RecordValue};Lower:{e.TestReturn.LowerLimit};Upper:{e.TestReturn.UpperLimit};Tip:{e.TestReturn.ExecuteResultTipString}{vbCrLf}" + 'Momo 2023-12-15 提示信息增加两个标准显示 + Dim txt As String = $"Result:{e.TestReturn.ExecuteResult}; Retrun:{e.TestReturn.RecordValue}; Lower_1:{e.TestReturn.LowerLimit};Upper_1:{e.TestReturn.UpperLimit}; Lower_2:{e.TestReturn.LowerLimit_2};Upper_2:{e.TestReturn.UpperLimit_2}; Tip:{e.TestReturn.ExecuteResultTipString}{vbCrLf}" + + AppendText(cor, txt) + + _planGrid.NodeCompleted(e.Node, e.TestReturn) + End Sub + Private Sub TestNodeCompleted(sender As Object, e As TestNodeCompletedEventArgs) Implements IUtsTest.TestNodeCompleted If _tester.DebugMode = False Then Return If GrdStationPlan.InvokeRequired Then '判断是否需要开委托 @@ -494,6 +517,7 @@ Namespace UTSModule.Station AddHandler _tester.TestNodeChanged, AddressOf TestNodeChanged AddHandler _tester.TestNodeCompleted, AddressOf TestNodeCompleted + AddHandler _tester.TestNodeResultChanged, AddressOf TestNodeResultChanged AddHandler _tester.TestProgressChanged, AddressOf TestProgressChanged AddHandler _tester.RetryProgressChanged, AddressOf RetryProgressChanged diff --git a/UTS_Core/UTSModule/Test/FrmStationTest.vb b/UTS_Core/UTSModule/Test/FrmStationTest.vb index 0ea0eb6..a32792c 100644 --- a/UTS_Core/UTSModule/Test/FrmStationTest.vb +++ b/UTS_Core/UTSModule/Test/FrmStationTest.vb @@ -795,6 +795,7 @@ Namespace UTSModule.Test AddHandler _tester.TestNodeChanged, AddressOf IUtsTest_TestNodeChanged AddHandler _tester.TestNodeCompleted, AddressOf IUtsTest_TestNodeCompleted + AddHandler _tester.TestNodeResultChanged, AddressOf IUtsTest_TestNodeResultChanged AddHandler _tester.TestProgressChanged, AddressOf IUtsTest_TestProgressChanged AddHandler _tester.RetryProgressChanged, AddressOf IUtsTest_RetryProgressChanged @@ -907,6 +908,13 @@ Namespace UTSModule.Test _recordGrid.UpdateTestRecord(e.Node, e.TestReturn) End Sub + Public Sub IUtsTest_TestNodeResultChanged(sender As Object, e As TestNodeResultChangedEventArgs) Implements IUtsTest.TestNodeResultChanged + If _tester.DebugMode Then Return + If _tester.TestFiexdModule <> FixedModuleEnum.Main Then Return + + _recordGrid.UpdateTestRecord(e.Node, e.TestReturn) + End Sub + Public Sub IUtsTest_TestStatusChanged(sender As Object, e As TestStatusChangedEventArgs) Implements IUtsTest.TestStatusChanged If _tester.DebugMode Then Return UpdateTestStatus(e.Status) diff --git a/UTS_Core/UTSModule/Test/TestRecordGrid.vb b/UTS_Core/UTSModule/Test/TestRecordGrid.vb index bc3baf8..65a5257 100644 --- a/UTS_Core/UTSModule/Test/TestRecordGrid.vb +++ b/UTS_Core/UTSModule/Test/TestRecordGrid.vb @@ -386,9 +386,11 @@ Namespace UTSModule.Test If _callNodeUpdateCount.ContainsKey(node) Then If _lastNode IsNot Nothing AndAlso _lastNode.RowListIndex <> node.RowListIndex AndAlso node.IsRetry = False Then _callNodeUpdateCount(node) += 1 + Console.WriteLine($"Node:{node.Description} Count:{_callNodeUpdateCount(node)}") End If Else _callNodeUpdateCount.Add(node, 0) + Console.WriteLine($"Node:{node.Description} Count:{_callNodeUpdateCount(node)}") End If row = _callNodeList(node)(_callNodeUpdateCount(node)) diff --git a/UTS_Core/UTSModule/Test/UtsTester.vb b/UTS_Core/UTSModule/Test/UtsTester.vb index c59a4df..b21fc47 100644 --- a/UTS_Core/UTSModule/Test/UtsTester.vb +++ b/UTS_Core/UTSModule/Test/UtsTester.vb @@ -23,6 +23,18 @@ Namespace UTSModule.Test Public Property TestReturn() As TestCommandReturn End Class + Public Class TestNodeResultChangedEventArgs + Inherits EventArgs + + Sub New(node As RowNode, testReturn As TestCommandReturn) + Me.Node = node + Me.TestReturn = testReturn + End Sub + + Public Property Node() As RowNode + + Public Property TestReturn() As TestCommandReturn + End Class Public Class TestNodeChangedEventArgs Inherits EventArgs @@ -136,6 +148,9 @@ Namespace UTSModule.Test '''测试节点完成事件 Public Event TestNodeCompleted(sender As Object, e As TestNodeCompletedEventArgs) + '''测试节点结果变化事件 + Public Event TestNodeResultChanged(sender As Object, e As TestNodeResultChangedEventArgs) + '''测试时间变更事件 Public Event TestTimeChanged(sender As Object, e As TestTimeEventArgs) @@ -599,6 +614,10 @@ Namespace UTSModule.Test '判断节点是否为重试状态 If retry > 0 Then node.IsRetry = True + If localVariable IsNot Nothing AndAlso localVariable.ContainsKey("CH") Then + Console.WriteLine($"CH:{localVariable("CH")} Label:{node.Label} Desc:{node.Description} RetryCount:{retry} IsRetry:{node.IsRetry}") + End If + '重置模块测试结果 result.ExecuteResult = True @@ -617,6 +636,8 @@ Namespace UTSModule.Test Thread.Sleep(node.RetryInterval) '执行失败,休眠重试间隔 Next + node.IsRetry = True 'todo:临时解决call命令调用函数时多层级模块 节点变更与节点完成的非唯一节点bug + Return result End Function @@ -762,6 +783,7 @@ Namespace UTSModule.Test '执行成功一次则判定成功,退出执行 result = executor.Execute() + RaiseEvent TestNodeResultChanged(Me, New TestNodeResultChangedEventArgs(node, result)) If result.ExecuteResult Then Exit For '执行失败,休眠重试间隔 diff --git a/UTS_Core/bin/Debug/UTS_Core.dll b/UTS_Core/bin/Debug/UTS_Core.dll index 63456ab..77499ed 100644 Binary files a/UTS_Core/bin/Debug/UTS_Core.dll and b/UTS_Core/bin/Debug/UTS_Core.dll differ diff --git a/UTS_Core/bin/Debug/UTS_Core.pdb b/UTS_Core/bin/Debug/UTS_Core.pdb index 081f67a..d380e5c 100644 Binary files a/UTS_Core/bin/Debug/UTS_Core.pdb and b/UTS_Core/bin/Debug/UTS_Core.pdb differ diff --git a/UTS_Core/bin/Debug/UTS_Core.xml b/UTS_Core/bin/Debug/UTS_Core.xml index 0af166c..5e44c60 100644 --- a/UTS_Core/bin/Debug/UTS_Core.xml +++ b/UTS_Core/bin/Debug/UTS_Core.xml @@ -7883,6 +7883,9 @@ UTS_Core 测试节点完成事件 + +测试节点结果变化事件 + 测试时间变更事件 diff --git a/UTS_Core/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/UTS_Core/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 0d2a6d9..14f6850 100644 Binary files a/UTS_Core/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/UTS_Core/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/UTS_Core/obj/Debug/UTS_Core.dll b/UTS_Core/obj/Debug/UTS_Core.dll index 63456ab..77499ed 100644 Binary files a/UTS_Core/obj/Debug/UTS_Core.dll and b/UTS_Core/obj/Debug/UTS_Core.dll differ diff --git a/UTS_Core/obj/Debug/UTS_Core.pdb b/UTS_Core/obj/Debug/UTS_Core.pdb index 081f67a..d380e5c 100644 Binary files a/UTS_Core/obj/Debug/UTS_Core.pdb and b/UTS_Core/obj/Debug/UTS_Core.pdb differ diff --git a/UTS_Core/obj/Debug/UTS_Core.vbprojAssemblyReference.cache b/UTS_Core/obj/Debug/UTS_Core.vbprojAssemblyReference.cache index 93c34ef..2ede900 100644 Binary files a/UTS_Core/obj/Debug/UTS_Core.vbprojAssemblyReference.cache and b/UTS_Core/obj/Debug/UTS_Core.vbprojAssemblyReference.cache differ diff --git a/UTS_Core/obj/Debug/UTS_Core.xml b/UTS_Core/obj/Debug/UTS_Core.xml index 0af166c..5e44c60 100644 --- a/UTS_Core/obj/Debug/UTS_Core.xml +++ b/UTS_Core/obj/Debug/UTS_Core.xml @@ -7883,6 +7883,9 @@ UTS_Core 测试节点完成事件 + +测试节点结果变化事件 + 测试时间变更事件