Merge branch 'master' of http://blv-rd.tpddns.cn:19000/AUTS

UTS_Core/UTSModule/Test/UtsTester.vb

@@ -338,17 +338,18 @@ Namespace UTSModule.Test
         ''' 开始测试,此函数为正式测试调用
         ''' </summary>
         Public Sub StartTest()
-            RaiseEvent TestStart(Me, New EventArgs())
 
             _userVar.Clear() '清空全局变量
             _testResult.ResetTestResult() '重置测试结果
 
-            '重置测试进度
-            RaiseEvent TestProgressChanged(Me, New TestProgressChangedEventArgs(0))
-
             DebugMode = False
             _exitTest = False
 
+            RaiseEvent TestStart(Me, New EventArgs())
+
+            '重置测试进度
+            RaiseEvent TestProgressChanged(Me, New TestProgressChangedEventArgs(0))
+
             '测试主代码
             TestFunction()
 
@@ -363,16 +364,18 @@ Namespace UTSModule.Test
         ''' 开始调试测试,此函数为正式测试调用
         ''' </summary>
         Public Sub StartDebugTest()
-            RaiseEvent TestStart(Me, New EventArgs())
+            DebugMode = True
+            _exitTest = False
 
             _userVar.Clear() '清空全局变量
             _testResult.ResetTestResult() '重置测试结果
 
+            RaiseEvent TestStart(Me, New EventArgs())
+
             '重置测试进度
             RaiseEvent TestProgressChanged(Me, New TestProgressChangedEventArgs(0))
 
-            DebugMode = True
-            _exitTest = False
+
 
             '测试主代码
             TestFunction()

UTS_Core/bin/Debug/UTS_Core.xml

@@ -6721,6 +6721,12 @@ UTS_Core
  </summary>
  <returns></returns>
 </member>
+<member name="P:UTS_Core.UTSModule.Station.RowNode.IsRetry">
+ <summary>
+ 当前节点是否处于重试状态
+ </summary>
+ <returns></returns>
+</member>
 <member name="M:UTS_Core.UTSModule.Station.RowNode.Expand">
  <summary>
  展开节点

UTS_Core/obj/Debug/UTS_Core.vbproj.CoreCompileInputs.cache

@@ -1 +1 @@
-699509ef63c9fe7d057394fa581db0586651606c65fb3d5880b51f45c10bdd62
+d50386964020d7b08b002230465408748f1be424

UTS_Core/obj/Debug/UTS_Core.vbproj.FileListAbsolute.txt

@@ -111,3 +111,59 @@ D:\ML\Wen\AUTS\UTS_Core\obj\Debug\UTS_Core.vbproj.Up2Date
 D:\ML\Wen\AUTS\UTS_Core\obj\Debug\UTS_Core.dll
 D:\ML\Wen\AUTS\UTS_Core\obj\Debug\UTS_Core.xml
 D:\ML\Wen\AUTS\UTS_Core\obj\Debug\UTS_Core.pdb
+E:\Git\AUTS\UTS_Core\bin\Debug\UTS_Core.dll.config
+E:\Git\AUTS\UTS_Core\bin\Debug\UTS_Core.dll
+E:\Git\AUTS\UTS_Core\bin\Debug\UTS_Core.pdb
+E:\Git\AUTS\UTS_Core\bin\Debug\UTS_Core.xml
+E:\Git\AUTS\UTS_Core\bin\Debug\BouncyCastle.Crypto.dll
+E:\Git\AUTS\UTS_Core\bin\Debug\FlexCell.dll
+E:\Git\AUTS\UTS_Core\bin\Debug\FluentFTP.dll
+E:\Git\AUTS\UTS_Core\bin\Debug\Google.Protobuf.dll
+E:\Git\AUTS\UTS_Core\bin\Debug\K4os.Compression.LZ4.dll
+E:\Git\AUTS\UTS_Core\bin\Debug\K4os.Compression.LZ4.Streams.dll
+E:\Git\AUTS\UTS_Core\bin\Debug\K4os.Hash.xxHash.dll
+E:\Git\AUTS\UTS_Core\bin\Debug\MySql.Data.dll
+E:\Git\AUTS\UTS_Core\bin\Debug\Newtonsoft.Json.dll
+E:\Git\AUTS\UTS_Core\bin\Debug\SharpCompress.dll
+E:\Git\AUTS\UTS_Core\bin\Debug\System.Buffers.dll
+E:\Git\AUTS\UTS_Core\bin\Debug\System.Memory.dll
+E:\Git\AUTS\UTS_Core\bin\Debug\System.Numerics.Vectors.dll
+E:\Git\AUTS\UTS_Core\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll
+E:\Git\AUTS\UTS_Core\bin\Debug\System.Text.Encoding.CodePages.dll
+E:\Git\AUTS\UTS_Core\bin\Debug\TeeChart.dll
+E:\Git\AUTS\UTS_Core\bin\Debug\Ubiety.Dns.Core.dll
+E:\Git\AUTS\UTS_Core\bin\Debug\Zstandard.Net.dll
+E:\Git\AUTS\UTS_Core\bin\Debug\FluentFTP.xml
+E:\Git\AUTS\UTS_Core\bin\Debug\Google.Protobuf.pdb
+E:\Git\AUTS\UTS_Core\bin\Debug\Google.Protobuf.xml
+E:\Git\AUTS\UTS_Core\bin\Debug\K4os.Compression.LZ4.xml
+E:\Git\AUTS\UTS_Core\bin\Debug\K4os.Compression.LZ4.Streams.xml
+E:\Git\AUTS\UTS_Core\bin\Debug\K4os.Hash.xxHash.xml
+E:\Git\AUTS\UTS_Core\bin\Debug\MySql.Data.xml
+E:\Git\AUTS\UTS_Core\bin\Debug\Newtonsoft.Json.xml
+E:\Git\AUTS\UTS_Core\bin\Debug\System.Buffers.xml
+E:\Git\AUTS\UTS_Core\bin\Debug\System.Memory.xml
+E:\Git\AUTS\UTS_Core\bin\Debug\System.Numerics.Vectors.xml
+E:\Git\AUTS\UTS_Core\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml
+E:\Git\AUTS\UTS_Core\bin\Debug\System.Text.Encoding.CodePages.xml
+E:\Git\AUTS\UTS_Core\obj\Debug\UTS_Core.vbprojAssemblyReference.cache
+E:\Git\AUTS\UTS_Core\obj\Debug\UTS_Core.Resources.resources
+E:\Git\AUTS\UTS_Core\obj\Debug\UTS_Core.UTSModule.Login.LoginForm.resources
+E:\Git\AUTS\UTS_Core\obj\Debug\UTS_Core.UTSModule.Project.DlgCreateProject.resources
+E:\Git\AUTS\UTS_Core\obj\Debug\UTS_Core.UTSModule.Project.DlgLoadProject.resources
+E:\Git\AUTS\UTS_Core\obj\Debug\UTS_Core.UTSModule.Project.FrmProject.resources
+E:\Git\AUTS\UTS_Core\obj\Debug\UTS_Core.UserControl1.resources
+E:\Git\AUTS\UTS_Core\obj\Debug\UTS_Core.UTSModule.Station.DlgLoadStation.resources
+E:\Git\AUTS\UTS_Core\obj\Debug\UTS_Core.UTSModule.Station.DlgStationPlanStyle.resources
+E:\Git\AUTS\UTS_Core\obj\Debug\UTS_Core.UTSModule.Station.FrmStationDesign.resources
+E:\Git\AUTS\UTS_Core\obj\Debug\UTS_Core.UTSModule.Station.FrmStationPlan.resources
+E:\Git\AUTS\UTS_Core\obj\Debug\UTS_Core.UTSModule.Test.Controls.UtsInputBox.resources
+E:\Git\AUTS\UTS_Core\obj\Debug\UTS_Core.UTSModule.Test.Controls.utsLabel.resources
+E:\Git\AUTS\UTS_Core\obj\Debug\UTS_Core.UTSModule.Test.Controls.UtsMsgBox.resources
+E:\Git\AUTS\UTS_Core\obj\Debug\UTS_Core.UTSModule.Test.FrmStationTest.resources
+E:\Git\AUTS\UTS_Core\obj\Debug\UTS_Core.vbproj.GenerateResource.cache
+E:\Git\AUTS\UTS_Core\obj\Debug\UTS_Core.vbproj.CoreCompileInputs.cache
+E:\Git\AUTS\UTS_Core\obj\Debug\UTS_Core.vbproj.CopyComplete
+E:\Git\AUTS\UTS_Core\obj\Debug\UTS_Core.dll
+E:\Git\AUTS\UTS_Core\obj\Debug\UTS_Core.xml
+E:\Git\AUTS\UTS_Core\obj\Debug\UTS_Core.pdb

UTS_Core/obj/Debug/UTS_Core.xml

@@ -6721,6 +6721,12 @@ UTS_Core
  </summary>
  <returns></returns>
 </member>
+<member name="P:UTS_Core.UTSModule.Station.RowNode.IsRetry">
+ <summary>
+ 当前节点是否处于重试状态
+ </summary>
+ <returns></returns>
+</member>
 <member name="M:UTS_Core.UTSModule.Station.RowNode.Expand">
  <summary>
  展开节点