1,修正Johao数据库结构(代码无关)

2,修正函数调用大于一层时Load失败
3,修正 “LoadStationPackets”中SQL语句条件连接符号 &-》and
This commit is contained in:
2024-05-20 22:20:51 +08:00
parent 985fec2287
commit 8077acf6bf
22 changed files with 12 additions and 5 deletions

View File

@@ -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)

View File

@@ -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

View File

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