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

This commit is contained in:
2024-05-09 00:48:28 +08:00
parent e475a06eb5
commit 90cf520dba
31 changed files with 93 additions and 32 deletions

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)