diff --git a/.cr/personal/Editor/Painting/Structural Highlighting.xml b/.cr/personal/Editor/Painting/Structural Highlighting.xml new file mode 100644 index 0000000..347228e --- /dev/null +++ b/.cr/personal/Editor/Painting/Structural Highlighting.xml @@ -0,0 +1,6 @@ + + + + False + + \ No newline at end of file diff --git a/AUTS_Vendor/obj/Debug/AUTS_Vendor.vbprojAssemblyReference.cache b/AUTS_Vendor/obj/Debug/AUTS_Vendor.vbprojAssemblyReference.cache index a485179..846831c 100644 Binary files a/AUTS_Vendor/obj/Debug/AUTS_Vendor.vbprojAssemblyReference.cache and b/AUTS_Vendor/obj/Debug/AUTS_Vendor.vbprojAssemblyReference.cache differ diff --git a/AUTS_Vendor/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/AUTS_Vendor/obj/Debug/DesignTimeResolveAssemblyReferences.cache index ec07e64..4107106 100644 Binary files a/AUTS_Vendor/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/AUTS_Vendor/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/AUTS_Win/AUTS_Win.vbproj b/AUTS_Win/AUTS_Win.vbproj index 866f727..3f9308c 100644 --- a/AUTS_Win/AUTS_Win.vbproj +++ b/AUTS_Win/AUTS_Win.vbproj @@ -26,7 +26,7 @@ false true 0 - 1.8.3.%2a + 1.8.4.%2a false true diff --git a/AUTS_Win/My Project/AssemblyInfo.vb b/AUTS_Win/My Project/AssemblyInfo.vb index e4c5be1..763fd80 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 cc29ea6..a0dc08e 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 7561450..b712392 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 2726812..70fa57c 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 746bb99..a3aac87 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/obj/Debug/AUTS_Win.exe b/AUTS_Win/obj/Debug/AUTS_Win.exe index cc29ea6..a0dc08e 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 7561450..b712392 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 82a02c6..34194be 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 ec07e64..32472c0 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/Project/ProjectInfo.vb b/UTS_Core/UTSModule/Project/ProjectInfo.vb index 6bf2087..ee88bbf 100644 --- a/UTS_Core/UTSModule/Project/ProjectInfo.vb +++ b/UTS_Core/UTSModule/Project/ProjectInfo.vb @@ -549,7 +549,7 @@ Namespace UTSModule.Project colList.Add(DbTableModel.Customer.StationPacketReleaseLogTable.ColNames.PacketMd5.ToString()) colList.Add(DbTableModel.Customer.StationPacketReleaseLogTable.ColNames.Description.ToString()) - Dim condition As String = $"`{DbTableModel.Customer.StationPacketReleaseLogTable.ColNames.ProjectID}` = {pid} & `{DbTableModel.Customer.StationPacketReleaseLogTable.ColNames.StationID}` = {sid}" + Dim condition As String = $"`{DbTableModel.Customer.StationPacketReleaseLogTable.ColNames.ProjectID}` = {pid} and `{DbTableModel.Customer.StationPacketReleaseLogTable.ColNames.StationID}` = {sid}" Dim dtProject As DataTable = db.ExecuteDataTable(db.CmdHelper.Search(colList, tableName, condition), False) Dim packetList As New List(Of StationPacketVo) diff --git a/UTS_Core/UTSModule/Test/Command/ProcessCommand/ProcessExecuteExecutor.vb b/UTS_Core/UTSModule/Test/Command/ProcessCommand/ProcessExecuteExecutor.vb index 1c91e63..f3a08a2 100644 --- a/UTS_Core/UTSModule/Test/Command/ProcessCommand/ProcessExecuteExecutor.vb +++ b/UTS_Core/UTSModule/Test/Command/ProcessCommand/ProcessExecuteExecutor.vb @@ -42,6 +42,7 @@ Dim exeResult As String = "" '进程执行 + If ProcessCommandManager.RunCmdGetReturn(_exePath, _exeArgs, _timeout, _stream, _destSrc, exeResult) = False Then CommandReturn.ExecuteResultTipString = $"进程执行失败,{exeResult}" CommandReturn.ExecuteResult = False diff --git a/UTS_Core/UTSModule/Test/TestRecordGrid.vb b/UTS_Core/UTSModule/Test/TestRecordGrid.vb index 257138f..bc3baf8 100644 --- a/UTS_Core/UTSModule/Test/TestRecordGrid.vb +++ b/UTS_Core/UTSModule/Test/TestRecordGrid.vb @@ -211,7 +211,7 @@ Namespace UTSModule.Test End If If node.RowNodes.Count > 0 Then - SearchRecordName(node.RowNodes) + SearchRecordName(node.RowNodes, isCallNode, localVariable) '2024-05-20 阿标 被调函数有多级节点时，将子级CallNode属性带入函数 End If '如果为Call命令则添加被调用模块下内容 diff --git a/UTS_Core/bin/Debug/UTS_Core.dll b/UTS_Core/bin/Debug/UTS_Core.dll index 2726812..70fa57c 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 746bb99..a3aac87 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/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/UTS_Core/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 472a1bb..0d2a6d9 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 2726812..70fa57c 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 746bb99..a3aac87 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 6dfe9fb..82b425a 100644 Binary files a/UTS_Core/obj/Debug/UTS_Core.vbprojAssemblyReference.cache and b/UTS_Core/obj/Debug/UTS_Core.vbprojAssemblyReference.cache differ