1，修正Johao数据库结构（代码无关）

2，修正函数调用大于一层时Load失败
3，修正 “LoadStationPackets”中SQL语句条件连接符号 &-》and

.cr/personal/Editor/Painting/Structural Highlighting.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Root Type="DevExpress.CodeRush.VisualizePlugins.StructuralHighlighting.Options.StructuralHighlightingOptions">
+  <Options Language="Neutral">
+    <Enabled>False</Enabled>
+  </Options>
+</Root>

AUTS_Win/AUTS_Win.vbproj

@@ -26,7 +26,7 @@
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.8.3.%2a</ApplicationVersion>
+    <ApplicationVersion>1.8.4.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>

AUTS_Win/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 '通过使用 "*"，如下所示:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.8.3.0")>
+<Assembly: AssemblyVersion("1.8.4.0")>
-<Assembly: AssemblyFileVersion("1.8.3.0")>
+<Assembly: AssemblyFileVersion("1.8.4.0")>

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)

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

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命令则添加被调用模块下内容