diff --git a/AUTS_Vendor/FrmMain.vb b/AUTS_Vendor/FrmMain.vb index 62ff06d..8241980 100644 --- a/AUTS_Vendor/FrmMain.vb +++ b/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) diff --git a/AUTS_Vendor/obj/Debug/AUTS_Vendor.vbprojAssemblyReference.cache b/AUTS_Vendor/obj/Debug/AUTS_Vendor.vbprojAssemblyReference.cache index 09f263a..70868fa 100644 Binary files a/AUTS_Vendor/obj/Debug/AUTS_Vendor.vbprojAssemblyReference.cache and b/AUTS_Vendor/obj/Debug/AUTS_Vendor.vbprojAssemblyReference.cache differ diff --git a/AUTS_Vendor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/AUTS_Vendor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 0d527d4..73a5bf2 100644 Binary files a/AUTS_Vendor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/AUTS_Vendor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/AUTS_Win/bin/Debug/AUTS_Win.exe b/AUTS_Win/bin/Debug/AUTS_Win.exe index f0f01ae..fba34c7 100644 Binary files a/AUTS_Win/bin/Debug/AUTS_Win.exe and b/AUTS_Win/bin/Debug/AUTS_Win.exe differ diff --git a/AUTS_Win/bin/Debug/AUTS_Win.pdb b/AUTS_Win/bin/Debug/AUTS_Win.pdb index 737aa54..54a5d27 100644 Binary files a/AUTS_Win/bin/Debug/AUTS_Win.pdb and b/AUTS_Win/bin/Debug/AUTS_Win.pdb differ diff --git a/AUTS_Win/bin/Debug/UTS_Core.dll b/AUTS_Win/bin/Debug/UTS_Core.dll index d661f69..e734304 100644 Binary files a/AUTS_Win/bin/Debug/UTS_Core.dll and b/AUTS_Win/bin/Debug/UTS_Core.dll differ diff --git a/AUTS_Win/bin/Debug/UTS_Core.pdb b/AUTS_Win/bin/Debug/UTS_Core.pdb index 8c7aee2..88f39e8 100644 Binary files a/AUTS_Win/bin/Debug/UTS_Core.pdb and b/AUTS_Win/bin/Debug/UTS_Core.pdb differ diff --git a/AUTS_Win/bin/Debug/UTS_Core.xml b/AUTS_Win/bin/Debug/UTS_Core.xml index 961d202..698c690 100644 --- a/AUTS_Win/bin/Debug/UTS_Core.xml +++ b/AUTS_Win/bin/Debug/UTS_Core.xml @@ -3030,16 +3030,16 @@ UTS_Core 站位索引 + + + 创建时间 + + 更新时间 - - - 记录本版本更改内容 - - 当前包名 @@ -3050,6 +3050,11 @@ UTS_Core 当前包MD5值 + + + 记录本版本更改内容 + + 当前包是否有效 @@ -3080,6 +3085,11 @@ UTS_Core 发布电脑的SID + + + 备注 + + 建表语句 @@ -5196,6 +5206,14 @@ UTS_Core 数据库执行器 项目索引 + + + 获取当前站位所有站包 + + + + + 通过项目索引初始化项目信息 diff --git a/AUTS_Win/obj/Debug/AUTS_Win.FrmMain.resources b/AUTS_Win/obj/Debug/AUTS_Win.FrmMain.resources index 46ccc99..003e09b 100644 Binary files a/AUTS_Win/obj/Debug/AUTS_Win.FrmMain.resources and b/AUTS_Win/obj/Debug/AUTS_Win.FrmMain.resources differ diff --git a/AUTS_Win/obj/Debug/AUTS_Win.exe b/AUTS_Win/obj/Debug/AUTS_Win.exe index f0f01ae..fba34c7 100644 Binary files a/AUTS_Win/obj/Debug/AUTS_Win.exe and b/AUTS_Win/obj/Debug/AUTS_Win.exe differ diff --git a/AUTS_Win/obj/Debug/AUTS_Win.pdb b/AUTS_Win/obj/Debug/AUTS_Win.pdb index 737aa54..54a5d27 100644 Binary files a/AUTS_Win/obj/Debug/AUTS_Win.pdb and b/AUTS_Win/obj/Debug/AUTS_Win.pdb differ diff --git a/AUTS_Win/obj/Debug/AUTS_Win.vbproj.CoreCompileInputs.cache b/AUTS_Win/obj/Debug/AUTS_Win.vbproj.CoreCompileInputs.cache index e6f0544..8903f26 100644 --- a/AUTS_Win/obj/Debug/AUTS_Win.vbproj.CoreCompileInputs.cache +++ b/AUTS_Win/obj/Debug/AUTS_Win.vbproj.CoreCompileInputs.cache @@ -1 +1 @@ -df1d3f7114965014432b234bbfca33ef40f5f41ba0f78e103192034fc19550ae +03cb30df2da50d20e8517b505196ae24ee65e23e diff --git a/AUTS_Win/obj/Debug/AUTS_Win.vbproj.GenerateResource.cache b/AUTS_Win/obj/Debug/AUTS_Win.vbproj.GenerateResource.cache index 3d9bf7e..37c4a35 100644 Binary files a/AUTS_Win/obj/Debug/AUTS_Win.vbproj.GenerateResource.cache and b/AUTS_Win/obj/Debug/AUTS_Win.vbproj.GenerateResource.cache differ diff --git a/AUTS_Win/obj/Debug/AUTS_Win.vbprojAssemblyReference.cache b/AUTS_Win/obj/Debug/AUTS_Win.vbprojAssemblyReference.cache index 1781e4f..bcc748b 100644 Binary files a/AUTS_Win/obj/Debug/AUTS_Win.vbprojAssemblyReference.cache and b/AUTS_Win/obj/Debug/AUTS_Win.vbprojAssemblyReference.cache differ diff --git a/AUTS_Win/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/AUTS_Win/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 34c99ad..dd670f2 100644 Binary files a/AUTS_Win/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/AUTS_Win/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/UTS_Core/UTSModule/DbTableModel/Customer/StationPacketReleaseLogTable.vb b/UTS_Core/UTSModule/DbTableModel/Customer/StationPacketReleaseLogTable.vb index a7b53e3..1840a89 100644 --- a/UTS_Core/UTSModule/DbTableModel/Customer/StationPacketReleaseLogTable.vb +++ b/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.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}`) ") diff --git a/UTS_Core/UTSModule/Project/ProjectInfo.vb b/UTS_Core/UTSModule/Project/ProjectInfo.vb index 6b820de..6bf2087 100644 --- a/UTS_Core/UTSModule/Project/ProjectInfo.vb +++ b/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 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) diff --git a/UTS_Core/bin/Debug/UTS_Core.dll b/UTS_Core/bin/Debug/UTS_Core.dll index d661f69..e734304 100644 Binary files a/UTS_Core/bin/Debug/UTS_Core.dll and b/UTS_Core/bin/Debug/UTS_Core.dll differ diff --git a/UTS_Core/bin/Debug/UTS_Core.pdb b/UTS_Core/bin/Debug/UTS_Core.pdb index 8c7aee2..88f39e8 100644 Binary files a/UTS_Core/bin/Debug/UTS_Core.pdb and b/UTS_Core/bin/Debug/UTS_Core.pdb differ diff --git a/UTS_Core/bin/Debug/UTS_Core.xml b/UTS_Core/bin/Debug/UTS_Core.xml index 961d202..698c690 100644 --- a/UTS_Core/bin/Debug/UTS_Core.xml +++ b/UTS_Core/bin/Debug/UTS_Core.xml @@ -3030,16 +3030,16 @@ UTS_Core 站位索引 + + + 创建时间 + + 更新时间 - - - 记录本版本更改内容 - - 当前包名 @@ -3050,6 +3050,11 @@ UTS_Core 当前包MD5值 + + + 记录本版本更改内容 + + 当前包是否有效 @@ -3080,6 +3085,11 @@ UTS_Core 发布电脑的SID + + + 备注 + + 建表语句 @@ -5196,6 +5206,14 @@ UTS_Core 数据库执行器 项目索引 + + + 获取当前站位所有站包 + + + + + 通过项目索引初始化项目信息 diff --git a/UTS_Core/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/UTS_Core/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 122f6f8..a5408d3 100644 Binary files a/UTS_Core/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/UTS_Core/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/UTS_Core/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/UTS_Core/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 2f09851..5e26c67 100644 Binary files a/UTS_Core/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/UTS_Core/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/UTS_Core/obj/Debug/UTS_Core.UTSModule.Project.FrmProject.resources b/UTS_Core/obj/Debug/UTS_Core.UTSModule.Project.FrmProject.resources index 0981dd8..1410000 100644 Binary files a/UTS_Core/obj/Debug/UTS_Core.UTSModule.Project.FrmProject.resources and b/UTS_Core/obj/Debug/UTS_Core.UTSModule.Project.FrmProject.resources differ diff --git a/UTS_Core/obj/Debug/UTS_Core.UTSModule.Station.FrmStationDesign.resources b/UTS_Core/obj/Debug/UTS_Core.UTSModule.Station.FrmStationDesign.resources index b090835..2f200e8 100644 Binary files a/UTS_Core/obj/Debug/UTS_Core.UTSModule.Station.FrmStationDesign.resources and b/UTS_Core/obj/Debug/UTS_Core.UTSModule.Station.FrmStationDesign.resources differ diff --git a/UTS_Core/obj/Debug/UTS_Core.UTSModule.Station.FrmStationPlan.resources b/UTS_Core/obj/Debug/UTS_Core.UTSModule.Station.FrmStationPlan.resources index 1953947..53a51ad 100644 Binary files a/UTS_Core/obj/Debug/UTS_Core.UTSModule.Station.FrmStationPlan.resources and b/UTS_Core/obj/Debug/UTS_Core.UTSModule.Station.FrmStationPlan.resources differ diff --git a/UTS_Core/obj/Debug/UTS_Core.dll b/UTS_Core/obj/Debug/UTS_Core.dll index d661f69..e734304 100644 Binary files a/UTS_Core/obj/Debug/UTS_Core.dll and b/UTS_Core/obj/Debug/UTS_Core.dll differ diff --git a/UTS_Core/obj/Debug/UTS_Core.pdb b/UTS_Core/obj/Debug/UTS_Core.pdb index 8c7aee2..88f39e8 100644 Binary files a/UTS_Core/obj/Debug/UTS_Core.pdb and b/UTS_Core/obj/Debug/UTS_Core.pdb differ diff --git a/UTS_Core/obj/Debug/UTS_Core.vbproj.CoreCompileInputs.cache b/UTS_Core/obj/Debug/UTS_Core.vbproj.CoreCompileInputs.cache index d018557..6cf9937 100644 --- a/UTS_Core/obj/Debug/UTS_Core.vbproj.CoreCompileInputs.cache +++ b/UTS_Core/obj/Debug/UTS_Core.vbproj.CoreCompileInputs.cache @@ -1 +1 @@ -80b53ed14b554ab37de820a1e7830710a8071fc57fbbe6bf5d3d5c5a8c0891ae +fa48c50e08c98e9923b684614d5c9690453766c9 diff --git a/UTS_Core/obj/Debug/UTS_Core.vbproj.GenerateResource.cache b/UTS_Core/obj/Debug/UTS_Core.vbproj.GenerateResource.cache index a1b00f5..d560a87 100644 Binary files a/UTS_Core/obj/Debug/UTS_Core.vbproj.GenerateResource.cache and b/UTS_Core/obj/Debug/UTS_Core.vbproj.GenerateResource.cache differ diff --git a/UTS_Core/obj/Debug/UTS_Core.vbprojAssemblyReference.cache b/UTS_Core/obj/Debug/UTS_Core.vbprojAssemblyReference.cache index 6dfe9fb..abf5d71 100644 Binary files a/UTS_Core/obj/Debug/UTS_Core.vbprojAssemblyReference.cache and b/UTS_Core/obj/Debug/UTS_Core.vbprojAssemblyReference.cache differ diff --git a/UTS_Core/obj/Debug/UTS_Core.xml b/UTS_Core/obj/Debug/UTS_Core.xml index 961d202..698c690 100644 --- a/UTS_Core/obj/Debug/UTS_Core.xml +++ b/UTS_Core/obj/Debug/UTS_Core.xml @@ -3030,16 +3030,16 @@ UTS_Core 站位索引 + + + 创建时间 + + 更新时间 - - - 记录本版本更改内容 - - 当前包名 @@ -3050,6 +3050,11 @@ UTS_Core 当前包MD5值 + + + 记录本版本更改内容 + + 当前包是否有效 @@ -3080,6 +3085,11 @@ UTS_Core 发布电脑的SID + + + 备注 + + 建表语句 @@ -5196,6 +5206,14 @@ UTS_Core 数据库执行器 项目索引 + + + 获取当前站位所有站包 + + + + + 通过项目索引初始化项目信息