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

AUTS_Vendor/FrmMain.vb

@@ -210,7 +210,7 @@ Public Class FrmMain
 
         '2023-06-07 add MO'''''''''''
         'sqlCmd.Append($"Create Procedure `{dbName}`.`UpdateSnListBarcode`(in code varchar(32),in snOrder int,in startTime datetime,in result int,in a1String varchar(254))," & vbCrLf)
-        sqlCmd.Append($"Create Procedure `{dbName}`.`UpdateSnListBarcode_MO`(in code varchar(32),in snOrder int,in startTime datetime,in result int,in a1String varchar(254),in MoId int" & vbCrLf)
+        sqlCmd.Append($"Create Procedure `{dbName}`.`UpdateSnListBarcode_MO`(in code varchar(32),in snOrder int,in startTime datetime,in result int,in a1String varchar(254),in MoId int)" & vbCrLf)
         ''''''''''''''''''''''''''''''
         sqlCmd.Append("begin " & vbCrLf)
         sqlCmd.Append("DECLARE msg int default -1; " & vbCrLf)
@@ -267,7 +267,7 @@ Public Class FrmMain
         sqlCmd.Clear()
         sqlCmd.Append($"Drop Procedure If Exists `{dbName}`.`UpdateSnListBarcode`;" & vbCrLf)
 
-        sqlCmd.Append($"Create Procedure `{dbName}`.`UpdateSnListBarcode`(in code varchar(32),in snOrder int,in startTime datetime,in result int,in a1String varchar(254))," & vbCrLf)
+        sqlCmd.Append($"Create Procedure `{dbName}`.`UpdateSnListBarcode`(in code varchar(32),in snOrder int,in startTime datetime,in result int,in a1String varchar(254))" & vbCrLf)
         sqlCmd.Append("begin " & vbCrLf)
         sqlCmd.Append("DECLARE msg int default -1; " & vbCrLf)
         sqlCmd.Append("set @cmd = Concat('select S',snOrder,',count(1) into @l_tm,@l_ct from `TBL_SnList` where `BarCode` = ''',code,''''); " & vbCrLf)

AUTS_Win/bin/Debug/UTS_Core.xml

@@ -3030,16 +3030,16 @@ UTS_Core
  站位索引
  </summary>
 </member>
+<member name="F:UTS_Core.UTSModule.DbTableModel.Customer.StationPacketReleaseLogTable.ColNames.CreateTime">
+ <summary>
+ 创建时间
+ </summary>
+</member>
 <member name="F:UTS_Core.UTSModule.DbTableModel.Customer.StationPacketReleaseLogTable.ColNames.UpdateTime">
  <summary>
  更新时间
  </summary>
 </member>
-<member name="F:UTS_Core.UTSModule.DbTableModel.Customer.StationPacketReleaseLogTable.ColNames.Remark">
- <summary>
- 记录本版本更改内容
- </summary>
-</member>
 <member name="F:UTS_Core.UTSModule.DbTableModel.Customer.StationPacketReleaseLogTable.ColNames.PacketName">
  <summary>
  当前包名
@@ -3050,6 +3050,11 @@ UTS_Core
  当前包MD5值
  </summary>
 </member>
+<member name="F:UTS_Core.UTSModule.DbTableModel.Customer.StationPacketReleaseLogTable.ColNames.Description">
+ <summary>
+ 记录本版本更改内容
+ </summary>
+</member>
 <member name="F:UTS_Core.UTSModule.DbTableModel.Customer.StationPacketReleaseLogTable.ColNames.IsValid">
  <summary>
  当前包是否有效
@@ -3080,6 +3085,11 @@ UTS_Core
  发布电脑的SID
  </summary>
 </member>
+<member name="F:UTS_Core.UTSModule.DbTableModel.Customer.StationPacketReleaseLogTable.ColNames.Remark">
+ <summary>
+ 备注
+ </summary>
+</member>
 <member name="M:UTS_Core.UTSModule.DbTableModel.Customer.StationPacketReleaseLogTable.CreateTableString(System.String,UTS_Core.Database.DbExecutor.DbTypeEnum)">
  <summary>
  建表语句
@@ -5196,6 +5206,14 @@ UTS_Core
  <param name="db">数据库执行器</param>
  <param name="projectId">项目索引</param>
 </member>
+<member name="M:UTS_Core.UTSModule.Project.ProjectInfo.LoadLocalDbStationPackets(System.Int32,System.Int32)">
+ <summary>
+ 获取当前站位所有站包
+ </summary>
+ <param name="pid"></param>
+ <param name="sid"></param>
+ <returns></returns>
+</member>
 <member name="M:UTS_Core.UTSModule.Project.ProjectInfo.LoadProjectInfo(UTS_Core.Database.DbExecutor,System.Int32)">
  <summary>
  通过项目索引初始化项目信息

AUTS_Win/obj/Debug/AUTS_Win.vbproj.CoreCompileInputs.cache

@@ -1 +1 @@
-df1d3f7114965014432b234bbfca33ef40f5f41ba0f78e103192034fc19550ae
+03cb30df2da50d20e8517b505196ae24ee65e23e

UTS_Core/UTSModule/DbTableModel/Customer/StationPacketReleaseLogTable.vb

@@ -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.PacketName}` varchar(128) NOT NULL COMMENT '工艺站包包名',")
-                builder.Append($"`{ColNames.PacketMd5}` varchar(32) DEFAULT NULL COMMENT '工艺站包MD5值',")
+                builder.Append($"`{ColNames.PacketMd5}` varchar(32) NOT NULL COMMENT '工艺站包MD5值',")
-                builder.Append($"`{ColNames.IsValid}` tinyint(4) not NULL DEFAULT 1 COMMENT '是否有效',")
+                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.UserName}` varchar(254) NOT NULL COMMENT '登录用户名称',")
-                builder.Append($"`{ColNames.PublicIP}` int(64) NOT NULL COMMENT '发布电脑的公网IP',")
+                builder.Append($"`{ColNames.PublicIP}` varchar(64) NOT NULL COMMENT '发布电脑的公网IP',")
-                builder.Append($"`{ColNames.ComputerName}` int(64) NOT NULL COMMENT '发布电脑用户名',")
+                builder.Append($"`{ColNames.ComputerName}` varchar(254) NOT NULL COMMENT '发布电脑用户名',")
-                builder.Append($"`{ColNames.SID}` varchar(64) DEFAULT NULL COMMENT '发布电脑的SID',")
+                builder.Append($"`{ColNames.SID}` varchar(64) NOT NULL COMMENT '发布电脑的SID',")
 
                 builder.Append($"PRIMARY KEY (`{ColNames.ID}`) ")
 

UTS_Core/UTSModule/Project/ProjectInfo.vb

@@ -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 colList As New List(Of String)
-            Dim dtProject As DataTable = db.ExecuteDataTable(db.CmdHelper.SearchAll(tableName, condition))
+            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(),
+                    .PacketName = row(DbTableModel.Customer.StationPacketReleaseLogTable.ColNames.PacketName.ToString()).ToString(),
-                    .PacketMd5 = row(DbTableModel.Customer.StationPacketReleaseLogTable.ColNames.StationID.ToString()).ToString(),
+                    .PacketMd5 = row(DbTableModel.Customer.StationPacketReleaseLogTable.ColNames.PacketMd5.ToString()).ToString(),
-                    .Description = row(DbTableModel.Customer.StationPacketReleaseLogTable.ColNames.StationID.ToString()).ToString()
+                    .Description = row(DbTableModel.Customer.StationPacketReleaseLogTable.ColNames.Description.ToString()).ToString()
                 }
 
                 packetList.Insert(0, packet)

UTS_Core/bin/Debug/UTS_Core.xml

@@ -3030,16 +3030,16 @@ UTS_Core
  站位索引
  </summary>
 </member>
+<member name="F:UTS_Core.UTSModule.DbTableModel.Customer.StationPacketReleaseLogTable.ColNames.CreateTime">
+ <summary>
+ 创建时间
+ </summary>
+</member>
 <member name="F:UTS_Core.UTSModule.DbTableModel.Customer.StationPacketReleaseLogTable.ColNames.UpdateTime">
  <summary>
  更新时间
  </summary>
 </member>
-<member name="F:UTS_Core.UTSModule.DbTableModel.Customer.StationPacketReleaseLogTable.ColNames.Remark">
- <summary>
- 记录本版本更改内容
- </summary>
-</member>
 <member name="F:UTS_Core.UTSModule.DbTableModel.Customer.StationPacketReleaseLogTable.ColNames.PacketName">
  <summary>
  当前包名
@@ -3050,6 +3050,11 @@ UTS_Core
  当前包MD5值
  </summary>
 </member>
+<member name="F:UTS_Core.UTSModule.DbTableModel.Customer.StationPacketReleaseLogTable.ColNames.Description">
+ <summary>
+ 记录本版本更改内容
+ </summary>
+</member>
 <member name="F:UTS_Core.UTSModule.DbTableModel.Customer.StationPacketReleaseLogTable.ColNames.IsValid">
  <summary>
  当前包是否有效
@@ -3080,6 +3085,11 @@ UTS_Core
  发布电脑的SID
  </summary>
 </member>
+<member name="F:UTS_Core.UTSModule.DbTableModel.Customer.StationPacketReleaseLogTable.ColNames.Remark">
+ <summary>
+ 备注
+ </summary>
+</member>
 <member name="M:UTS_Core.UTSModule.DbTableModel.Customer.StationPacketReleaseLogTable.CreateTableString(System.String,UTS_Core.Database.DbExecutor.DbTypeEnum)">
  <summary>
  建表语句
@@ -5196,6 +5206,14 @@ UTS_Core
  <param name="db">数据库执行器</param>
  <param name="projectId">项目索引</param>
 </member>
+<member name="M:UTS_Core.UTSModule.Project.ProjectInfo.LoadLocalDbStationPackets(System.Int32,System.Int32)">
+ <summary>
+ 获取当前站位所有站包
+ </summary>
+ <param name="pid"></param>
+ <param name="sid"></param>
+ <returns></returns>
+</member>
 <member name="M:UTS_Core.UTSModule.Project.ProjectInfo.LoadProjectInfo(UTS_Core.Database.DbExecutor,System.Int32)">
  <summary>
  通过项目索引初始化项目信息

UTS_Core/obj/Debug/UTS_Core.vbproj.CoreCompileInputs.cache

@@ -1 +1 @@
-80b53ed14b554ab37de820a1e7830710a8071fc57fbbe6bf5d3d5c5a8c0891ae
+fa48c50e08c98e9923b684614d5c9690453766c9

UTS_Core/obj/Debug/UTS_Core.xml

@@ -3030,16 +3030,16 @@ UTS_Core
  站位索引
  </summary>
 </member>
+<member name="F:UTS_Core.UTSModule.DbTableModel.Customer.StationPacketReleaseLogTable.ColNames.CreateTime">
+ <summary>
+ 创建时间
+ </summary>
+</member>
 <member name="F:UTS_Core.UTSModule.DbTableModel.Customer.StationPacketReleaseLogTable.ColNames.UpdateTime">
  <summary>
  更新时间
  </summary>
 </member>
-<member name="F:UTS_Core.UTSModule.DbTableModel.Customer.StationPacketReleaseLogTable.ColNames.Remark">
- <summary>
- 记录本版本更改内容
- </summary>
-</member>
 <member name="F:UTS_Core.UTSModule.DbTableModel.Customer.StationPacketReleaseLogTable.ColNames.PacketName">
  <summary>
  当前包名
@@ -3050,6 +3050,11 @@ UTS_Core
  当前包MD5值
  </summary>
 </member>
+<member name="F:UTS_Core.UTSModule.DbTableModel.Customer.StationPacketReleaseLogTable.ColNames.Description">
+ <summary>
+ 记录本版本更改内容
+ </summary>
+</member>
 <member name="F:UTS_Core.UTSModule.DbTableModel.Customer.StationPacketReleaseLogTable.ColNames.IsValid">
  <summary>
  当前包是否有效
@@ -3080,6 +3085,11 @@ UTS_Core
  发布电脑的SID
  </summary>
 </member>
+<member name="F:UTS_Core.UTSModule.DbTableModel.Customer.StationPacketReleaseLogTable.ColNames.Remark">
+ <summary>
+ 备注
+ </summary>
+</member>
 <member name="M:UTS_Core.UTSModule.DbTableModel.Customer.StationPacketReleaseLogTable.CreateTableString(System.String,UTS_Core.Database.DbExecutor.DbTypeEnum)">
  <summary>
  建表语句
@@ -5196,6 +5206,14 @@ UTS_Core
  <param name="db">数据库执行器</param>
  <param name="projectId">项目索引</param>
 </member>
+<member name="M:UTS_Core.UTSModule.Project.ProjectInfo.LoadLocalDbStationPackets(System.Int32,System.Int32)">
+ <summary>
+ 获取当前站位所有站包
+ </summary>
+ <param name="pid"></param>
+ <param name="sid"></param>
+ <returns></returns>
+</member>
 <member name="M:UTS_Core.UTSModule.Project.ProjectInfo.LoadProjectInfo(UTS_Core.Database.DbExecutor,System.Int32)">
  <summary>
  通过项目索引初始化项目信息