UTS/AUTS_OLD
Archived
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复工艺站包版本选择异常问题

Browse Source
This commit is contained in:
Momo
2024-05-09 00:48:28 +08:00
parent e475a06eb5
commit 90cf520dba
31 changed files with 93 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
UTS_Core/UTSModule/DbTableModel/Customer/StationPacketReleaseLogTable.vb
View File

@@ -101,17 +101,17 @@ Namespace UTSModule.DbTableModel.Customer
builder.Append($"`{ColNames.CreateTime}` datetime NOT NULL DEFAULT current_timestamp() COMMENT '创建时间',")
builder.Append($"`{ColNames.UpdateTime}` datetime NOT NULL DEFAULT current_timestamp() COMMENT '更新时间',")
builder.Append($"`{ColNames.Description}` varchar(254) DEFAULT NULL COMMENT '版本说明',")
builder.Append($"`{ColNames.Description}` text NOT NULL COMMENT '版本说明',")
builder.Append($"`{ColNames.Remark}` varchar(128) DEFAULT NULL COMMENT ' 备注',")
builder.Append($"`{ColNames.PacketName}` varchar(128) DEFAULT NULL COMMENT '工艺站包包名',")
builder.Append($"`{ColNames.PacketMd5}` varchar(32) DEFAULT NULL COMMENT '工艺站包MD5值',")
builder.Append($"`{ColNames.IsValid}` tinyint(4) not NULL DEFAULT 1 COMMENT '是否有效',")
builder.Append($"`{ColNames.PacketName}` varchar(128) NOT NULL COMMENT '工艺站包包名',")
builder.Append($"`{ColNames.PacketMd5}` varchar(32) NOT NULL COMMENT '工艺站包MD5值',")
builder.Append($"`{ColNames.IsValid}` tinyint(4) NOT NULL DEFAULT 1 COMMENT '是否有效',")
builder.Append($"`{ColNames.UserID}` int(11) NOT NULL COMMENT '登录用户索引',")
builder.Append($"`{ColNames.UserName}` varchar(64) NOT NULL COMMENT '登录用户名称',")
builder.Append($"`{ColNames.PublicIP}` int(64) NOT NULL COMMENT '发布电脑的公网IP',")
builder.Append($"`{ColNames.ComputerName}` int(64) NOT NULL COMMENT '发布电脑用户名',")
builder.Append($"`{ColNames.SID}` varchar(64) DEFAULT NULL COMMENT '发布电脑的SID',")
builder.Append($"`{ColNames.UserName}` varchar(254) NOT NULL COMMENT '登录用户名称',")
builder.Append($"`{ColNames.PublicIP}` varchar(64) NOT NULL COMMENT '发布电脑的公网IP',")
builder.Append($"`{ColNames.ComputerName}` varchar(254) NOT NULL COMMENT '发布电脑用户名',")
builder.Append($"`{ColNames.SID}` varchar(64) NOT NULL COMMENT '发布电脑的SID',")
builder.Append($"PRIMARY KEY (`{ColNames.ID}`) ")

17
UTS_Core/UTSModule/Project/ProjectInfo.vb
View File

@@ -542,17 +542,24 @@ Namespace UTSModule.Project
Private Function LoadStationPackets(db As DbExecutor, pid As Integer, sid As Integer) As List(Of StationPacketVo)
Dim tableName As String = DbTableModel.Customer.StationPacketReleaseLogTable.TableName
Dim condition As String = $"`{DbTableModel.Customer.StationPacketReleaseLogTable.ColNames.ProjectID}` = {pid} && `{DbTableModel.Customer.StationPacketReleaseLogTable.ColNames.StationID}` = {sid}"
Dim dtProject As DataTable = db.ExecuteDataTable(db.CmdHelper.SearchAll(tableName, condition))
Dim colList As New List(Of String)
colList.Add(DbTableModel.Customer.StationPacketReleaseLogTable.ColNames.ProjectID.ToString())
colList.Add(DbTableModel.Customer.StationPacketReleaseLogTable.ColNames.StationID.ToString())
colList.Add(DbTableModel.Customer.StationPacketReleaseLogTable.ColNames.PacketName.ToString())
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 dtProject As DataTable = db.ExecuteDataTable(db.CmdHelper.Search(colList, tableName, condition), False)
Dim packetList As New List(Of StationPacketVo)
For Each row As DataRow In dtProject.Rows
Dim packet As New StationPacketVo With {
.ProjectID = CInt(row(DbTableModel.Customer.StationPacketReleaseLogTable.ColNames.ProjectID.ToString())),
.StationID = CInt(row(DbTableModel.Customer.StationPacketReleaseLogTable.ColNames.StationID.ToString())),
.PacketName = row(DbTableModel.Customer.StationPacketReleaseLogTable.ColNames.StationID.ToString()).ToString(),
.PacketMd5 = row(DbTableModel.Customer.StationPacketReleaseLogTable.ColNames.StationID.ToString()).ToString(),
.Description = row(DbTableModel.Customer.StationPacketReleaseLogTable.ColNames.StationID.ToString()).ToString()
.PacketName = row(DbTableModel.Customer.StationPacketReleaseLogTable.ColNames.PacketName.ToString()).ToString(),
.PacketMd5 = row(DbTableModel.Customer.StationPacketReleaseLogTable.ColNames.PacketMd5.ToString()).ToString(),
.Description = row(DbTableModel.Customer.StationPacketReleaseLogTable.ColNames.Description.ToString()).ToString()
}
packetList.Insert(0, packet)