diff --git a/AUTS_AOI/AUTS_AOI.vbproj b/AUTS_AOI/AUTS_AOI.vbproj index 8bdd9e3..f58610c 100644 --- a/AUTS_AOI/AUTS_AOI.vbproj +++ b/AUTS_AOI/AUTS_AOI.vbproj @@ -201,6 +201,12 @@ false + + + {33c6456c-f00d-41ac-a6fb-db0601495c6a} + UTS_Core + + diff --git a/AUTS_AOI/obj/Debug/AUTS_AOI.vbproj.AssemblyReference.cache b/AUTS_AOI/obj/Debug/AUTS_AOI.vbproj.AssemblyReference.cache index bac2b6d..bfc058e 100644 Binary files a/AUTS_AOI/obj/Debug/AUTS_AOI.vbproj.AssemblyReference.cache and b/AUTS_AOI/obj/Debug/AUTS_AOI.vbproj.AssemblyReference.cache differ diff --git a/AUTS_AOI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/AUTS_AOI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 5368928..8b51d4b 100644 Binary files a/AUTS_AOI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/AUTS_AOI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/AUTS_Assembly/AUTS_Assembly.vbproj b/AUTS_Assembly/AUTS_Assembly.vbproj index 8cacb85..8360617 100644 --- a/AUTS_Assembly/AUTS_Assembly.vbproj +++ b/AUTS_Assembly/AUTS_Assembly.vbproj @@ -137,5 +137,11 @@ + + + {33c6456c-f00d-41ac-a6fb-db0601495c6a} + UTS_Core + + \ No newline at end of file diff --git a/AUTS_ProductEntry/AUTS_ProductEntry.vbproj b/AUTS_ProductEntry/AUTS_ProductEntry.vbproj index f0d4396..5a05479 100644 --- a/AUTS_ProductEntry/AUTS_ProductEntry.vbproj +++ b/AUTS_ProductEntry/AUTS_ProductEntry.vbproj @@ -130,5 +130,11 @@ + + + {33c6456c-f00d-41ac-a6fb-db0601495c6a} + UTS_Core + + \ No newline at end of file diff --git a/AUTS_ProductEntry/bin/Debug/AUTS_ProductEntry.exe b/AUTS_ProductEntry/bin/Debug/AUTS_ProductEntry.exe index ae92da1..b66ea6f 100644 Binary files a/AUTS_ProductEntry/bin/Debug/AUTS_ProductEntry.exe and b/AUTS_ProductEntry/bin/Debug/AUTS_ProductEntry.exe differ diff --git a/AUTS_ProductEntry/bin/Debug/AUTS_ProductEntry.pdb b/AUTS_ProductEntry/bin/Debug/AUTS_ProductEntry.pdb index be458e5..ede3b39 100644 Binary files a/AUTS_ProductEntry/bin/Debug/AUTS_ProductEntry.pdb and b/AUTS_ProductEntry/bin/Debug/AUTS_ProductEntry.pdb differ diff --git a/AUTS_ProductEntry/bin/Debug/UTS_Core.dll b/AUTS_ProductEntry/bin/Debug/UTS_Core.dll index 4700a98..577a391 100644 Binary files a/AUTS_ProductEntry/bin/Debug/UTS_Core.dll and b/AUTS_ProductEntry/bin/Debug/UTS_Core.dll differ diff --git a/AUTS_ProductEntry/bin/Debug/UTS_Core.pdb b/AUTS_ProductEntry/bin/Debug/UTS_Core.pdb index ebf911a..ea001cd 100644 Binary files a/AUTS_ProductEntry/bin/Debug/UTS_Core.pdb and b/AUTS_ProductEntry/bin/Debug/UTS_Core.pdb differ diff --git a/AUTS_ProductEntry/bin/Debug/UTS_Core.xml b/AUTS_ProductEntry/bin/Debug/UTS_Core.xml index 7aa1e04..f18a684 100644 --- a/AUTS_ProductEntry/bin/Debug/UTS_Core.xml +++ b/AUTS_ProductEntry/bin/Debug/UTS_Core.xml @@ -631,6 +631,12 @@ UTS_Core + + + 打开数据库连接 + + + 关闭数据库连接 @@ -649,6 +655,13 @@ UTS_Core 执行的数据库命令文本 + + + 运行非查询语句,返回执行该语句受到影响的行数 + + 执行的数据库命令文本 + + 使用命令参数模式执行非查询语句,返回执行该语句受到影响的行数 @@ -657,6 +670,14 @@ UTS_Core 执行的数据库命令参数 + + + 使用命令参数模式执行非查询语句,返回执行该语句受到影响的行数 + + 执行的数据库命令文本 + 执行的数据库命令参数 + + 执行数据库语句,返回数据库读取流的句柄 @@ -664,6 +685,13 @@ UTS_Core 执行的数据库命令文本 + + + 执行数据库语句,返回数据库读取流的句柄 + + 执行的数据库命令文本 + + 使用命令参数模式执行数据库语句,返回数据库读取流的句柄 @@ -672,6 +700,14 @@ UTS_Core 执行的数据库命令参数 + + + 使用命令参数模式执行数据库语句,返回数据库读取流的句柄 + + 执行的数据库命令文本 + 执行的数据库命令参数 + + 执行数据库语句,返回查询结果的第一行第一列的内容 @@ -679,6 +715,13 @@ UTS_Core 执行的数据库命令文本 + + + 执行数据库语句,返回查询结果的第一行第一列的内容 + + 执行的数据库命令文本 + + 使用命令参数模式执行数据库语句,返回查询结果的第一行第一列的内容 @@ -687,6 +730,14 @@ UTS_Core 执行的数据库命令参数 + + + 使用命令参数模式执行数据库语句,返回查询结果的第一行第一列的内容 + + 执行的数据库命令文本 + 执行的数据库命令参数 + + 执行数据库语句,返回执行结果返回的数据表,常用于查询命令 @@ -1462,53 +1513,48 @@ UTS_Core - - - 运行一条需要记录在撤销栈的命令 - - - + 重做命令 - + 撤销命令 - + 运行命令，并将命令添加至撤销堆栈 - + 将命令添加至撤销堆栈 - + 清空撤销命令堆栈 - + 清空重做命令堆栈 - + 清空撤销与重做命令堆栈 - + 执行撤销命令 - + 执行重做命令 @@ -6020,15 +6066,57 @@ UTS_Core + + + 修改前的节点 + + + + + + 修改类型 + + + 测试流程所关联的项目站包信息 + + 表格控件对象 + + + 表格树状目录起始节点 + + + 起始绘制列 + + + 起始绘制行 + + + 调试模式是否开启 + + + 是否显示节点图标 + 处于更新表格状态中,不触发表格单元格修改事件 多个参数间的分割符号 + + 测试命令管理器 + + + 错误代码管理器 + + + 表格标签字段字典 + + + 表格记录名称字段字典 + 当前活动节点 @@ -6038,11 +6126,31 @@ UTS_Core 节点文本被修改事件 - - 测试命令管理器 + + 节点执行可撤销事件 - - 错误代码管理器 + + 粘贴操作计时器 + + + 计时器超时时间 + + + + 构造函数 + + + + + 表格内容改变处理事件 + + + + + 粘贴操作计时器超时处理事件 + + + @@ -6050,9 +6158,107 @@ UTS_Core - + - 对第二行的Action执行一遍操作，以触发更新事件 + 向后导航 + + + + + 向前导航 + + + + + 是否可以后退 + + + + + + + 是否可以前进 + + + + + + + + + + + + 当前模块名是否已存在 + + + + + + + 当前字段名 + + + + + + + 清空标签名称 + + + + + 清空记录名称 + + + + + 添加标签名称 + + 标签名称 + 行号 + + + + 添加记录名称 + + 记录名 + 行号 + + + + 移出标签名称 + + 标签名称 + + + + 移出记录名称 + + 记录名称 + + + + 获取标签名称行号 + + + + + + + 获取记录名称行号 + + + + + + + 从表格中重载标签名称 + + + + + 从表格中重载记录名称 @@ -6065,38 +6271,16 @@ UTS_Core 光标进入grd表格时，原底色切换到选中行 - - - 根据CmdType 和 isAction 返回该行字体颜色 - - - 鼠标移动到节点位置时所有子节点背景着色 - + - FixModule节点Action变化时子节点字体重新着色 + 节点类型变更，修改节点行样式 - - - - - FixModule节点Action变化时子节点字体重新着色 - - - - - 根据总表状态对单元格字体重新着色 - - - - - 遍历表格，并更新到全局数组 - - + @@ -6115,16 +6299,6 @@ UTS_Core 选定行使能或清除Action选项 - - - 更新表格内容到缓存，但是并不重新着色 - - - - - 更新ActionEn信息 - - 光标移动时，所在行底色高亮 @@ -6171,18 +6345,24 @@ UTS_Core 初始化测试站表格 + + + 加载测试文件后更新表格 + + + 展开行节点 - + 节点升级 - + 节点降级 @@ -6841,6 +7021,12 @@ UTS_Core + + + 允许移动节点移动 + + + 当前节点是否处于重试状态 @@ -9723,6 +9909,46 @@ UTS系列App与UtsCore交互为避免重复书写产生的中间类 + + + 是否正在执行导航操作 + + + + + + 是否可以后退 + + + + + + 是否可以前进 + + + + + + + 添加导航 + 导航 + + + + + + + + + + 向后导航 + + + + + 向前导航 + + 解析模式，并且确定有关参数 diff --git a/AUTS_ProductEntry/obj/Debug/AUTS_ProductEntry.exe b/AUTS_ProductEntry/obj/Debug/AUTS_ProductEntry.exe index ae92da1..b66ea6f 100644 Binary files a/AUTS_ProductEntry/obj/Debug/AUTS_ProductEntry.exe and b/AUTS_ProductEntry/obj/Debug/AUTS_ProductEntry.exe differ diff --git a/AUTS_ProductEntry/obj/Debug/AUTS_ProductEntry.pdb b/AUTS_ProductEntry/obj/Debug/AUTS_ProductEntry.pdb index be458e5..ede3b39 100644 Binary files a/AUTS_ProductEntry/obj/Debug/AUTS_ProductEntry.pdb and b/AUTS_ProductEntry/obj/Debug/AUTS_ProductEntry.pdb differ diff --git a/AUTS_ProductEntry/obj/Debug/AUTS_ProductEntry.vbproj.AssemblyReference.cache b/AUTS_ProductEntry/obj/Debug/AUTS_ProductEntry.vbproj.AssemblyReference.cache index c7cca1f..ce6144c 100644 Binary files a/AUTS_ProductEntry/obj/Debug/AUTS_ProductEntry.vbproj.AssemblyReference.cache and b/AUTS_ProductEntry/obj/Debug/AUTS_ProductEntry.vbproj.AssemblyReference.cache differ diff --git a/AUTS_ProductEntry/obj/Debug/AUTS_ProductEntry.vbproj.CoreCompileInputs.cache b/AUTS_ProductEntry/obj/Debug/AUTS_ProductEntry.vbproj.CoreCompileInputs.cache index 41e8f1f..430dae4 100644 --- a/AUTS_ProductEntry/obj/Debug/AUTS_ProductEntry.vbproj.CoreCompileInputs.cache +++ b/AUTS_ProductEntry/obj/Debug/AUTS_ProductEntry.vbproj.CoreCompileInputs.cache @@ -1 +1 @@ -77b918b156a866c382b181d57c6af8b89ddf49c4d4ce2db2a565d316becdb019 +47852b526cd4d95af06fa67187205a4f4944888d4102f4f45b3e0d33d6b45850 diff --git a/AUTS_ProductEntry/obj/Debug/AUTS_ProductEntry.vbproj.FileListAbsolute.txt b/AUTS_ProductEntry/obj/Debug/AUTS_ProductEntry.vbproj.FileListAbsolute.txt index 70e9d4c..a4c5bbc 100644 --- a/AUTS_ProductEntry/obj/Debug/AUTS_ProductEntry.vbproj.FileListAbsolute.txt +++ b/AUTS_ProductEntry/obj/Debug/AUTS_ProductEntry.vbproj.FileListAbsolute.txt @@ -336,3 +336,56 @@ D:\ML\Wen\AUTS\AUTS_ProductEntry\bin\Debug\ZstdSharp.dll D:\ML\Wen\AUTS\AUTS_ProductEntry\bin\Debug\System.Threading.Tasks.Extensions.dll D:\ML\Wen\AUTS\AUTS_ProductEntry\bin\Debug\SharpCompress.pdb D:\ML\Wen\AUTS\AUTS_ProductEntry\bin\Debug\System.Threading.Tasks.Extensions.xml +C:\Project\AUTS_ProductEntry\obj\Debug\AUTS_ProductEntry.vbproj.AssemblyReference.cache +C:\Project\AUTS_ProductEntry\obj\Debug\AUTS_ProductEntry.exe.config +C:\Project\AUTS_ProductEntry\obj\Debug\AUTS_ProductEntry.FrmMain.resources +C:\Project\AUTS_ProductEntry\obj\Debug\AUTS_ProductEntry.Resources.resources +C:\Project\AUTS_ProductEntry\obj\Debug\AUTS_ProductEntry.vbproj.GenerateResource.cache +C:\Project\AUTS_ProductEntry\obj\Debug\AUTS_ProductEntry.vbproj.CoreCompileInputs.cache +C:\Project\AUTS_ProductEntry\obj\Debug\AUTS_ProductEntry.exe +C:\Project\AUTS_ProductEntry\obj\Debug\AUTS_ProductEntry.xml +C:\Project\AUTS_ProductEntry\obj\Debug\AUTS_ProductEntry.pdb +C:\Project\AUTS_ProductEntry\bin\Debug\x64\SQLite.Interop.dll +C:\Project\AUTS_ProductEntry\bin\Debug\x86\SQLite.Interop.dll +C:\Project\AUTS_ProductEntry\bin\Debug\AUTS_ProductEntry.exe.config +C:\Project\AUTS_ProductEntry\bin\Debug\AUTS_ProductEntry.exe +C:\Project\AUTS_ProductEntry\bin\Debug\AUTS_ProductEntry.pdb +C:\Project\AUTS_ProductEntry\bin\Debug\AUTS_ProductEntry.xml +C:\Project\AUTS_ProductEntry\bin\Debug\UTS_Core.dll +C:\Project\AUTS_ProductEntry\bin\Debug\SharpCompress.dll +C:\Project\AUTS_ProductEntry\bin\Debug\FluentFTP.dll +C:\Project\AUTS_ProductEntry\bin\Debug\FlexCell.dll +C:\Project\AUTS_ProductEntry\bin\Debug\Newtonsoft.Json.dll +C:\Project\AUTS_ProductEntry\bin\Debug\TeeChart.dll +C:\Project\AUTS_ProductEntry\bin\Debug\MySql.Data.dll +C:\Project\AUTS_ProductEntry\bin\Debug\System.Memory.dll +C:\Project\AUTS_ProductEntry\bin\Debug\System.Buffers.dll +C:\Project\AUTS_ProductEntry\bin\Debug\ZstdSharp.dll +C:\Project\AUTS_ProductEntry\bin\Debug\Google.Protobuf.dll +C:\Project\AUTS_ProductEntry\bin\Debug\Zstandard.Net.dll +C:\Project\AUTS_ProductEntry\bin\Debug\K4os.Compression.LZ4.Streams.dll +C:\Project\AUTS_ProductEntry\bin\Debug\BouncyCastle.Crypto.dll +C:\Project\AUTS_ProductEntry\bin\Debug\Ubiety.Dns.Core.dll +C:\Project\AUTS_ProductEntry\bin\Debug\System.Numerics.Vectors.dll +C:\Project\AUTS_ProductEntry\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll +C:\Project\AUTS_ProductEntry\bin\Debug\System.Threading.Tasks.Extensions.dll +C:\Project\AUTS_ProductEntry\bin\Debug\K4os.Compression.LZ4.dll +C:\Project\AUTS_ProductEntry\bin\Debug\K4os.Hash.xxHash.dll +C:\Project\AUTS_ProductEntry\bin\Debug\UTS_Core.pdb +C:\Project\AUTS_ProductEntry\bin\Debug\UTS_Core.xml +C:\Project\AUTS_ProductEntry\bin\Debug\UTS_Core.dll.config +C:\Project\AUTS_ProductEntry\bin\Debug\SharpCompress.pdb +C:\Project\AUTS_ProductEntry\bin\Debug\FluentFTP.xml +C:\Project\AUTS_ProductEntry\bin\Debug\Newtonsoft.Json.xml +C:\Project\AUTS_ProductEntry\bin\Debug\MySql.Data.xml +C:\Project\AUTS_ProductEntry\bin\Debug\System.Memory.xml +C:\Project\AUTS_ProductEntry\bin\Debug\System.Buffers.xml +C:\Project\AUTS_ProductEntry\bin\Debug\Google.Protobuf.pdb +C:\Project\AUTS_ProductEntry\bin\Debug\Google.Protobuf.xml +C:\Project\AUTS_ProductEntry\bin\Debug\K4os.Compression.LZ4.Streams.xml +C:\Project\AUTS_ProductEntry\bin\Debug\System.Numerics.Vectors.xml +C:\Project\AUTS_ProductEntry\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml +C:\Project\AUTS_ProductEntry\bin\Debug\System.Threading.Tasks.Extensions.xml +C:\Project\AUTS_ProductEntry\bin\Debug\K4os.Compression.LZ4.xml +C:\Project\AUTS_ProductEntry\bin\Debug\K4os.Hash.xxHash.xml +C:\Project\AUTS_ProductEntry\obj\Debug\AUTS_Pro.0CE47F12.Up2Date diff --git a/AUTS_ProductEntry/obj/Debug/AUTS_ProductEntry.vbproj.GenerateResource.cache b/AUTS_ProductEntry/obj/Debug/AUTS_ProductEntry.vbproj.GenerateResource.cache index 31f6c1e..3c5c4ad 100644 Binary files a/AUTS_ProductEntry/obj/Debug/AUTS_ProductEntry.vbproj.GenerateResource.cache and b/AUTS_ProductEntry/obj/Debug/AUTS_ProductEntry.vbproj.GenerateResource.cache differ diff --git a/AUTS_ProductEntry/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/AUTS_ProductEntry/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 369855c..65d7990 100644 Binary files a/AUTS_ProductEntry/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/AUTS_ProductEntry/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/AUTS_Repair/bin/Debug/AUTS_Repair.exe b/AUTS_Repair/bin/Debug/AUTS_Repair.exe index e185385..427aeb8 100644 Binary files a/AUTS_Repair/bin/Debug/AUTS_Repair.exe and b/AUTS_Repair/bin/Debug/AUTS_Repair.exe differ diff --git a/AUTS_Repair/bin/Debug/AUTS_Repair.pdb b/AUTS_Repair/bin/Debug/AUTS_Repair.pdb index e18ec59..b3f6d8e 100644 Binary files a/AUTS_Repair/bin/Debug/AUTS_Repair.pdb and b/AUTS_Repair/bin/Debug/AUTS_Repair.pdb differ diff --git a/AUTS_Repair/bin/Debug/UTS_Core.dll b/AUTS_Repair/bin/Debug/UTS_Core.dll index 4700a98..577a391 100644 Binary files a/AUTS_Repair/bin/Debug/UTS_Core.dll and b/AUTS_Repair/bin/Debug/UTS_Core.dll differ diff --git a/AUTS_Repair/bin/Debug/UTS_Core.pdb b/AUTS_Repair/bin/Debug/UTS_Core.pdb index ebf911a..ea001cd 100644 Binary files a/AUTS_Repair/bin/Debug/UTS_Core.pdb and b/AUTS_Repair/bin/Debug/UTS_Core.pdb differ diff --git a/AUTS_Repair/bin/Debug/UTS_Core.xml b/AUTS_Repair/bin/Debug/UTS_Core.xml index 7aa1e04..f18a684 100644 --- a/AUTS_Repair/bin/Debug/UTS_Core.xml +++ b/AUTS_Repair/bin/Debug/UTS_Core.xml @@ -631,6 +631,12 @@ UTS_Core + + + 打开数据库连接 + + + 关闭数据库连接 @@ -649,6 +655,13 @@ UTS_Core 执行的数据库命令文本 + + + 运行非查询语句,返回执行该语句受到影响的行数 + + 执行的数据库命令文本 + + 使用命令参数模式执行非查询语句,返回执行该语句受到影响的行数 @@ -657,6 +670,14 @@ UTS_Core 执行的数据库命令参数 + + + 使用命令参数模式执行非查询语句,返回执行该语句受到影响的行数 + + 执行的数据库命令文本 + 执行的数据库命令参数 + + 执行数据库语句,返回数据库读取流的句柄 @@ -664,6 +685,13 @@ UTS_Core 执行的数据库命令文本 + + + 执行数据库语句,返回数据库读取流的句柄 + + 执行的数据库命令文本 + + 使用命令参数模式执行数据库语句,返回数据库读取流的句柄 @@ -672,6 +700,14 @@ UTS_Core 执行的数据库命令参数 + + + 使用命令参数模式执行数据库语句,返回数据库读取流的句柄 + + 执行的数据库命令文本 + 执行的数据库命令参数 + + 执行数据库语句,返回查询结果的第一行第一列的内容 @@ -679,6 +715,13 @@ UTS_Core 执行的数据库命令文本 + + + 执行数据库语句,返回查询结果的第一行第一列的内容 + + 执行的数据库命令文本 + + 使用命令参数模式执行数据库语句,返回查询结果的第一行第一列的内容 @@ -687,6 +730,14 @@ UTS_Core 执行的数据库命令参数 + + + 使用命令参数模式执行数据库语句,返回查询结果的第一行第一列的内容 + + 执行的数据库命令文本 + 执行的数据库命令参数 + + 执行数据库语句,返回执行结果返回的数据表,常用于查询命令 @@ -1462,53 +1513,48 @@ UTS_Core - - - 运行一条需要记录在撤销栈的命令 - - - + 重做命令 - + 撤销命令 - + 运行命令，并将命令添加至撤销堆栈 - + 将命令添加至撤销堆栈 - + 清空撤销命令堆栈 - + 清空重做命令堆栈 - + 清空撤销与重做命令堆栈 - + 执行撤销命令 - + 执行重做命令 @@ -6020,15 +6066,57 @@ UTS_Core + + + 修改前的节点 + + + + + + 修改类型 + + + 测试流程所关联的项目站包信息 + + 表格控件对象 + + + 表格树状目录起始节点 + + + 起始绘制列 + + + 起始绘制行 + + + 调试模式是否开启 + + + 是否显示节点图标 + 处于更新表格状态中,不触发表格单元格修改事件 多个参数间的分割符号 + + 测试命令管理器 + + + 错误代码管理器 + + + 表格标签字段字典 + + + 表格记录名称字段字典 + 当前活动节点 @@ -6038,11 +6126,31 @@ UTS_Core 节点文本被修改事件 - - 测试命令管理器 + + 节点执行可撤销事件 - - 错误代码管理器 + + 粘贴操作计时器 + + + 计时器超时时间 + + + + 构造函数 + + + + + 表格内容改变处理事件 + + + + + 粘贴操作计时器超时处理事件 + + + @@ -6050,9 +6158,107 @@ UTS_Core - + - 对第二行的Action执行一遍操作，以触发更新事件 + 向后导航 + + + + + 向前导航 + + + + + 是否可以后退 + + + + + + + 是否可以前进 + + + + + + + + + + + + 当前模块名是否已存在 + + + + + + + 当前字段名 + + + + + + + 清空标签名称 + + + + + 清空记录名称 + + + + + 添加标签名称 + + 标签名称 + 行号 + + + + 添加记录名称 + + 记录名 + 行号 + + + + 移出标签名称 + + 标签名称 + + + + 移出记录名称 + + 记录名称 + + + + 获取标签名称行号 + + + + + + + 获取记录名称行号 + + + + + + + 从表格中重载标签名称 + + + + + 从表格中重载记录名称 @@ -6065,38 +6271,16 @@ UTS_Core 光标进入grd表格时，原底色切换到选中行 - - - 根据CmdType 和 isAction 返回该行字体颜色 - - - 鼠标移动到节点位置时所有子节点背景着色 - + - FixModule节点Action变化时子节点字体重新着色 + 节点类型变更，修改节点行样式 - - - - - FixModule节点Action变化时子节点字体重新着色 - - - - - 根据总表状态对单元格字体重新着色 - - - - - 遍历表格，并更新到全局数组 - - + @@ -6115,16 +6299,6 @@ UTS_Core 选定行使能或清除Action选项 - - - 更新表格内容到缓存，但是并不重新着色 - - - - - 更新ActionEn信息 - - 光标移动时，所在行底色高亮 @@ -6171,18 +6345,24 @@ UTS_Core 初始化测试站表格 + + + 加载测试文件后更新表格 + + + 展开行节点 - + 节点升级 - + 节点降级 @@ -6841,6 +7021,12 @@ UTS_Core + + + 允许移动节点移动 + + + 当前节点是否处于重试状态 @@ -9723,6 +9909,46 @@ UTS系列App与UtsCore交互为避免重复书写产生的中间类 + + + 是否正在执行导航操作 + + + + + + 是否可以后退 + + + + + + 是否可以前进 + + + + + + + 添加导航 + 导航 + + + + + + + + + + 向后导航 + + + + + 向前导航 + + 解析模式，并且确定有关参数 diff --git a/AUTS_Repair/obj/Debug/AUTS_Repair.vbproj.AssemblyReference.cache b/AUTS_Repair/obj/Debug/AUTS_Repair.vbproj.AssemblyReference.cache index 5f90d10..72c5f9e 100644 Binary files a/AUTS_Repair/obj/Debug/AUTS_Repair.vbproj.AssemblyReference.cache and b/AUTS_Repair/obj/Debug/AUTS_Repair.vbproj.AssemblyReference.cache differ diff --git a/AUTS_Repair/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/AUTS_Repair/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index c806014..6727f17 100644 Binary files a/AUTS_Repair/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/AUTS_Repair/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/AUTS_ServiceControler/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/AUTS_ServiceControler/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 9032a2f..c9bb319 100644 Binary files a/AUTS_ServiceControler/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/AUTS_ServiceControler/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/AUTS_Studio/obj/Debug/AUTS_Studio.vbproj.FileListAbsolute.txt b/AUTS_Studio/obj/Debug/AUTS_Studio.vbproj.FileListAbsolute.txt index 9d44f4c..69dfbd3 100644 --- a/AUTS_Studio/obj/Debug/AUTS_Studio.vbproj.FileListAbsolute.txt +++ b/AUTS_Studio/obj/Debug/AUTS_Studio.vbproj.FileListAbsolute.txt @@ -394,3 +394,56 @@ G:\Git\AUTS\AUTS_Studio\obj\Debug\AUTS_Stu.1BA4C2FE.Up2Date G:\Git\AUTS\AUTS_Studio\obj\Debug\AUTS_Studio.exe G:\Git\AUTS\AUTS_Studio\obj\Debug\AUTS_Studio.xml G:\Git\AUTS\AUTS_Studio\obj\Debug\AUTS_Studio.pdb +C:\Project\AUTS_Studio\bin\Debug\x64\SQLite.Interop.dll +C:\Project\AUTS_Studio\bin\Debug\x86\SQLite.Interop.dll +C:\Project\AUTS_Studio\bin\Debug\AUTS_Studio.exe.config +C:\Project\AUTS_Studio\bin\Debug\AUTS_Studio.exe +C:\Project\AUTS_Studio\bin\Debug\AUTS_Studio.pdb +C:\Project\AUTS_Studio\bin\Debug\AUTS_Studio.xml +C:\Project\AUTS_Studio\bin\Debug\MySql.Data.dll +C:\Project\AUTS_Studio\bin\Debug\UTS_Core.dll +C:\Project\AUTS_Studio\bin\Debug\SharpCompress.dll +C:\Project\AUTS_Studio\bin\Debug\FluentFTP.dll +C:\Project\AUTS_Studio\bin\Debug\FlexCell.dll +C:\Project\AUTS_Studio\bin\Debug\Newtonsoft.Json.dll +C:\Project\AUTS_Studio\bin\Debug\TeeChart.dll +C:\Project\AUTS_Studio\bin\Debug\System.Data.SQLite.dll +C:\Project\AUTS_Studio\bin\Debug\Google.Protobuf.dll +C:\Project\AUTS_Studio\bin\Debug\Zstandard.Net.dll +C:\Project\AUTS_Studio\bin\Debug\K4os.Compression.LZ4.Streams.dll +C:\Project\AUTS_Studio\bin\Debug\BouncyCastle.Crypto.dll +C:\Project\AUTS_Studio\bin\Debug\Ubiety.Dns.Core.dll +C:\Project\AUTS_Studio\bin\Debug\System.Memory.dll +C:\Project\AUTS_Studio\bin\Debug\System.Buffers.dll +C:\Project\AUTS_Studio\bin\Debug\ZstdSharp.dll +C:\Project\AUTS_Studio\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll +C:\Project\AUTS_Studio\bin\Debug\K4os.Compression.LZ4.dll +C:\Project\AUTS_Studio\bin\Debug\K4os.Hash.xxHash.dll +C:\Project\AUTS_Studio\bin\Debug\System.Numerics.Vectors.dll +C:\Project\AUTS_Studio\bin\Debug\System.Threading.Tasks.Extensions.dll +C:\Project\AUTS_Studio\bin\Debug\UTS_Core.pdb +C:\Project\AUTS_Studio\bin\Debug\UTS_Core.xml +C:\Project\AUTS_Studio\bin\Debug\UTS_Core.dll.config +C:\Project\AUTS_Studio\bin\Debug\MySql.Data.xml +C:\Project\AUTS_Studio\bin\Debug\SharpCompress.pdb +C:\Project\AUTS_Studio\bin\Debug\FluentFTP.xml +C:\Project\AUTS_Studio\bin\Debug\Newtonsoft.Json.xml +C:\Project\AUTS_Studio\bin\Debug\Google.Protobuf.pdb +C:\Project\AUTS_Studio\bin\Debug\Google.Protobuf.xml +C:\Project\AUTS_Studio\bin\Debug\K4os.Compression.LZ4.Streams.xml +C:\Project\AUTS_Studio\bin\Debug\System.Memory.xml +C:\Project\AUTS_Studio\bin\Debug\System.Buffers.xml +C:\Project\AUTS_Studio\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml +C:\Project\AUTS_Studio\bin\Debug\K4os.Compression.LZ4.xml +C:\Project\AUTS_Studio\bin\Debug\K4os.Hash.xxHash.xml +C:\Project\AUTS_Studio\bin\Debug\System.Numerics.Vectors.xml +C:\Project\AUTS_Studio\bin\Debug\System.Threading.Tasks.Extensions.xml +C:\Project\AUTS_Studio\obj\Debug\AUTS_Studio.vbproj.AssemblyReference.cache +C:\Project\AUTS_Studio\obj\Debug\AUTS_Studio.FrmMain.resources +C:\Project\AUTS_Studio\obj\Debug\AUTS_Studio.Resources.resources +C:\Project\AUTS_Studio\obj\Debug\AUTS_Studio.vbproj.GenerateResource.cache +C:\Project\AUTS_Studio\obj\Debug\AUTS_Studio.vbproj.CoreCompileInputs.cache +C:\Project\AUTS_Studio\obj\Debug\AUTS_Stu.1BA4C2FE.Up2Date +C:\Project\AUTS_Studio\obj\Debug\AUTS_Studio.exe +C:\Project\AUTS_Studio\obj\Debug\AUTS_Studio.xml +C:\Project\AUTS_Studio\obj\Debug\AUTS_Studio.pdb diff --git a/AUTS_Studio/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/AUTS_Studio/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index edb8a6b..6494e7a 100644 Binary files a/AUTS_Studio/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/AUTS_Studio/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/AUTS_Win/bin/Debug/AUTS_Win.exe b/AUTS_Win/bin/Debug/AUTS_Win.exe index a4fddb9..3858cf1 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 fe01cf3..fd4e33d 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 a2dcdcd..bd9ec5d 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 e3827c3..ac7d2d0 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/obj/Debug/AUTS_Win.exe b/AUTS_Win/obj/Debug/AUTS_Win.exe index a4fddb9..3858cf1 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 fe01cf3..fd4e33d 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.AssemblyReference.cache b/AUTS_Win/obj/Debug/AUTS_Win.vbproj.AssemblyReference.cache index a700135..e58674b 100644 Binary files a/AUTS_Win/obj/Debug/AUTS_Win.vbproj.AssemblyReference.cache and b/AUTS_Win/obj/Debug/AUTS_Win.vbproj.AssemblyReference.cache differ diff --git a/AUTS_Win/obj/Debug/AUTS_Win.vbproj.CoreCompileInputs.cache b/AUTS_Win/obj/Debug/AUTS_Win.vbproj.CoreCompileInputs.cache index 7fa10d5..b62e9bf 100644 --- a/AUTS_Win/obj/Debug/AUTS_Win.vbproj.CoreCompileInputs.cache +++ b/AUTS_Win/obj/Debug/AUTS_Win.vbproj.CoreCompileInputs.cache @@ -1 +1 @@ -f016d1be56f6fedc61741e9fdbb1f0d49638d13457a53b051aea0362c5491bcc +c3886199ae22c3f880bce6f672a51ae51def76056da39af819cd26fad1c0b813 diff --git a/AUTS_Win/obj/Debug/AUTS_Win.vbproj.FileListAbsolute.txt b/AUTS_Win/obj/Debug/AUTS_Win.vbproj.FileListAbsolute.txt index 5d1a601..d3b9556 100644 --- a/AUTS_Win/obj/Debug/AUTS_Win.vbproj.FileListAbsolute.txt +++ b/AUTS_Win/obj/Debug/AUTS_Win.vbproj.FileListAbsolute.txt @@ -196,3 +196,56 @@ G:\Git\AUTS\AUTS_Win\bin\Debug\Google.Protobuf.xml G:\Git\AUTS\AUTS_Win\bin\Debug\K4os.Compression.LZ4.Streams.xml G:\Git\AUTS\AUTS_Win\bin\Debug\K4os.Compression.LZ4.xml G:\Git\AUTS\AUTS_Win\bin\Debug\K4os.Hash.xxHash.xml +C:\Project\AUTS_Win\bin\Debug\x64\SQLite.Interop.dll +C:\Project\AUTS_Win\bin\Debug\x86\SQLite.Interop.dll +C:\Project\AUTS_Win\bin\Debug\AUTS_Win.exe.config +C:\Project\AUTS_Win\bin\Debug\AUTS_Win.exe +C:\Project\AUTS_Win\bin\Debug\AUTS_Win.pdb +C:\Project\AUTS_Win\bin\Debug\UTS_Core.dll +C:\Project\AUTS_Win\bin\Debug\Newtonsoft.Json.dll +C:\Project\AUTS_Win\bin\Debug\UTS_Core.pdb +C:\Project\AUTS_Win\obj\Debug\AUTS_Win.vbproj.AssemblyReference.cache +C:\Project\AUTS_Win\obj\Debug\AUTS_Win.FrmMain.resources +C:\Project\AUTS_Win\obj\Debug\AUTS_Win.FrmSettings.resources +C:\Project\AUTS_Win\obj\Debug\AUTS_Win.Resources.resources +C:\Project\AUTS_Win\obj\Debug\AUTS_Win.vbproj.GenerateResource.cache +C:\Project\AUTS_Win\obj\Debug\AUTS_Win.vbproj.CoreCompileInputs.cache +C:\Project\AUTS_Win\obj\Debug\AUTS_Win.vbproj.Up2Date +C:\Project\AUTS_Win\obj\Debug\AUTS_Win.exe +C:\Project\AUTS_Win\obj\Debug\AUTS_Win.pdb +C:\Project\AUTS_Win\bin\Debug\FlexCell.dll +C:\Project\AUTS_Win\bin\Debug\SharpCompress.dll +C:\Project\AUTS_Win\bin\Debug\FluentFTP.dll +C:\Project\AUTS_Win\bin\Debug\TeeChart.dll +C:\Project\AUTS_Win\bin\Debug\MySql.Data.dll +C:\Project\AUTS_Win\bin\Debug\System.Data.SQLite.dll +C:\Project\AUTS_Win\bin\Debug\System.Memory.dll +C:\Project\AUTS_Win\bin\Debug\System.Buffers.dll +C:\Project\AUTS_Win\bin\Debug\ZstdSharp.dll +C:\Project\AUTS_Win\bin\Debug\Google.Protobuf.dll +C:\Project\AUTS_Win\bin\Debug\Zstandard.Net.dll +C:\Project\AUTS_Win\bin\Debug\K4os.Compression.LZ4.Streams.dll +C:\Project\AUTS_Win\bin\Debug\BouncyCastle.Crypto.dll +C:\Project\AUTS_Win\bin\Debug\Ubiety.Dns.Core.dll +C:\Project\AUTS_Win\bin\Debug\System.Numerics.Vectors.dll +C:\Project\AUTS_Win\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll +C:\Project\AUTS_Win\bin\Debug\System.Threading.Tasks.Extensions.dll +C:\Project\AUTS_Win\bin\Debug\K4os.Compression.LZ4.dll +C:\Project\AUTS_Win\bin\Debug\K4os.Hash.xxHash.dll +C:\Project\AUTS_Win\bin\Debug\UTS_Core.xml +C:\Project\AUTS_Win\bin\Debug\UTS_Core.dll.config +C:\Project\AUTS_Win\bin\Debug\SharpCompress.pdb +C:\Project\AUTS_Win\bin\Debug\FluentFTP.xml +C:\Project\AUTS_Win\bin\Debug\Newtonsoft.Json.xml +C:\Project\AUTS_Win\bin\Debug\MySql.Data.xml +C:\Project\AUTS_Win\bin\Debug\System.Memory.xml +C:\Project\AUTS_Win\bin\Debug\System.Buffers.xml +C:\Project\AUTS_Win\bin\Debug\Google.Protobuf.pdb +C:\Project\AUTS_Win\bin\Debug\Google.Protobuf.xml +C:\Project\AUTS_Win\bin\Debug\K4os.Compression.LZ4.Streams.xml +C:\Project\AUTS_Win\bin\Debug\System.Numerics.Vectors.xml +C:\Project\AUTS_Win\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml +C:\Project\AUTS_Win\bin\Debug\System.Threading.Tasks.Extensions.xml +C:\Project\AUTS_Win\bin\Debug\K4os.Compression.LZ4.xml +C:\Project\AUTS_Win\bin\Debug\K4os.Hash.xxHash.xml +C:\Project\AUTS_Win\obj\Debug\AUTS_Win.exe.config diff --git a/AUTS_Win/obj/Debug/AUTS_Win.vbproj.GenerateResource.cache b/AUTS_Win/obj/Debug/AUTS_Win.vbproj.GenerateResource.cache index 2e0780c..22540aa 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/DesignTimeResolveAssemblyReferencesInput.cache b/AUTS_Win/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index f3c0fdc..38e5094 100644 Binary files a/AUTS_Win/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/AUTS_Win/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/Control/FlexCell.NET.msi b/Control/FlexCell.NET.msi new file mode 100644 index 0000000..6a9bc85 Binary files /dev/null and b/Control/FlexCell.NET.msi differ diff --git a/SQLliteReading/FrmMain.vb b/SQLliteReading/FrmMain.vb index a499d40..af07fed 100644 --- a/SQLliteReading/FrmMain.vb +++ b/SQLliteReading/FrmMain.vb @@ -1,16 +1,6 @@ -Imports UTS_Core.UTSModule -Imports UTS_Core.UTSModule.Test -Imports System.ComponentModel -Imports System.IO.Ports -Imports UTS_Core.UTSModule.DbTableModel.Customer -Imports UTS_Core.UTSModule.DbConnect +Imports UTS_Core.Database Imports UTS_Core.DebugLog -Imports UTS_Core.UTSModule.Test.Controls -Imports Newtonsoft.Json -Imports UTS_Core.Database -Imports UTS_Core.UTSModule.Project -Imports UTS_Core.UTSModule.Station -Imports System.Diagnostics +Imports UTS_Core.UTSModule Public Class FrmMain Implements IProcessStation @@ -269,7 +259,6 @@ Public Class FrmMain End If TestlogTable.Range(TestlogTable.ActiveCell.Row, 0, TestlogTable.ActiveCell.Row, TestlogTable.Cols - 1).FontStrikeout = True TestlogTable.Range(TestlogTable.ActiveCell.Row, 0, TestlogTable.ActiveCell.Row, TestlogTable.Cols - 1).BackColor = Color.Red - ' TestlogTable.RemoveItem(TestlogTable.ActiveCell.Row) End Sub Public Function QueryRowIndex(rowid As Integer) As String @@ -292,9 +281,7 @@ Public Class FrmMain db.Open() db.BeginTransaction() - Dim dicFiled As Dictionary(Of String, String) Dim cmdText As String - Dim colName As String Dim colNames As New List(Of String) For Each inten In ModifyList @@ -305,7 +292,6 @@ Public Class FrmMain db.ExecuteNonQuery(cmdText) '执行语句 db.ClearDbParameter() Catch ex As Exception - 'WriteErrorLogToFile($"[{i}]Write LogQueue To Remote DB Error: {ex.Message}") IsSaveChangesFlag = False MsgBox($"保存修改失败！详情：{ex}") Try diff --git a/SQLliteReading/SQLliteReading.vbproj b/SQLliteReading/SQLliteReading.vbproj index cc9e1dc..598a0ba 100644 --- a/SQLliteReading/SQLliteReading.vbproj +++ b/SQLliteReading/SQLliteReading.vbproj @@ -174,5 +174,11 @@ + + + {33c6456c-f00d-41ac-a6fb-db0601495c6a} + UTS_Core + + \ No newline at end of file diff --git a/SQLliteReading/bin/Debug/AUTS_ProductEntry.pdb b/SQLliteReading/bin/Debug/AUTS_ProductEntry.pdb index 4f3bee0..4728604 100644 Binary files a/SQLliteReading/bin/Debug/AUTS_ProductEntry.pdb and b/SQLliteReading/bin/Debug/AUTS_ProductEntry.pdb differ diff --git a/SQLliteReading/bin/Debug/UTS_Core.dll b/SQLliteReading/bin/Debug/UTS_Core.dll index 4700a98..577a391 100644 Binary files a/SQLliteReading/bin/Debug/UTS_Core.dll and b/SQLliteReading/bin/Debug/UTS_Core.dll differ diff --git a/SQLliteReading/bin/Debug/UTS_Core.pdb b/SQLliteReading/bin/Debug/UTS_Core.pdb index ebf911a..ea001cd 100644 Binary files a/SQLliteReading/bin/Debug/UTS_Core.pdb and b/SQLliteReading/bin/Debug/UTS_Core.pdb differ diff --git a/SQLliteReading/bin/Debug/UTS_Core.xml b/SQLliteReading/bin/Debug/UTS_Core.xml index 7aa1e04..f18a684 100644 --- a/SQLliteReading/bin/Debug/UTS_Core.xml +++ b/SQLliteReading/bin/Debug/UTS_Core.xml @@ -631,6 +631,12 @@ UTS_Core + + + 打开数据库连接 + + + 关闭数据库连接 @@ -649,6 +655,13 @@ UTS_Core 执行的数据库命令文本 + + + 运行非查询语句,返回执行该语句受到影响的行数 + + 执行的数据库命令文本 + + 使用命令参数模式执行非查询语句,返回执行该语句受到影响的行数 @@ -657,6 +670,14 @@ UTS_Core 执行的数据库命令参数 + + + 使用命令参数模式执行非查询语句,返回执行该语句受到影响的行数 + + 执行的数据库命令文本 + 执行的数据库命令参数 + + 执行数据库语句,返回数据库读取流的句柄 @@ -664,6 +685,13 @@ UTS_Core 执行的数据库命令文本 + + + 执行数据库语句,返回数据库读取流的句柄 + + 执行的数据库命令文本 + + 使用命令参数模式执行数据库语句,返回数据库读取流的句柄 @@ -672,6 +700,14 @@ UTS_Core 执行的数据库命令参数 + + + 使用命令参数模式执行数据库语句,返回数据库读取流的句柄 + + 执行的数据库命令文本 + 执行的数据库命令参数 + + 执行数据库语句,返回查询结果的第一行第一列的内容 @@ -679,6 +715,13 @@ UTS_Core 执行的数据库命令文本 + + + 执行数据库语句,返回查询结果的第一行第一列的内容 + + 执行的数据库命令文本 + + 使用命令参数模式执行数据库语句,返回查询结果的第一行第一列的内容 @@ -687,6 +730,14 @@ UTS_Core 执行的数据库命令参数 + + + 使用命令参数模式执行数据库语句,返回查询结果的第一行第一列的内容 + + 执行的数据库命令文本 + 执行的数据库命令参数 + + 执行数据库语句,返回执行结果返回的数据表,常用于查询命令 @@ -1462,53 +1513,48 @@ UTS_Core - - - 运行一条需要记录在撤销栈的命令 - - - + 重做命令 - + 撤销命令 - + 运行命令，并将命令添加至撤销堆栈 - + 将命令添加至撤销堆栈 - + 清空撤销命令堆栈 - + 清空重做命令堆栈 - + 清空撤销与重做命令堆栈 - + 执行撤销命令 - + 执行重做命令 @@ -6020,15 +6066,57 @@ UTS_Core + + + 修改前的节点 + + + + + + 修改类型 + + + 测试流程所关联的项目站包信息 + + 表格控件对象 + + + 表格树状目录起始节点 + + + 起始绘制列 + + + 起始绘制行 + + + 调试模式是否开启 + + + 是否显示节点图标 + 处于更新表格状态中,不触发表格单元格修改事件 多个参数间的分割符号 + + 测试命令管理器 + + + 错误代码管理器 + + + 表格标签字段字典 + + + 表格记录名称字段字典 + 当前活动节点 @@ -6038,11 +6126,31 @@ UTS_Core 节点文本被修改事件 - - 测试命令管理器 + + 节点执行可撤销事件 - - 错误代码管理器 + + 粘贴操作计时器 + + + 计时器超时时间 + + + + 构造函数 + + + + + 表格内容改变处理事件 + + + + + 粘贴操作计时器超时处理事件 + + + @@ -6050,9 +6158,107 @@ UTS_Core - + - 对第二行的Action执行一遍操作，以触发更新事件 + 向后导航 + + + + + 向前导航 + + + + + 是否可以后退 + + + + + + + 是否可以前进 + + + + + + + + + + + + 当前模块名是否已存在 + + + + + + + 当前字段名 + + + + + + + 清空标签名称 + + + + + 清空记录名称 + + + + + 添加标签名称 + + 标签名称 + 行号 + + + + 添加记录名称 + + 记录名 + 行号 + + + + 移出标签名称 + + 标签名称 + + + + 移出记录名称 + + 记录名称 + + + + 获取标签名称行号 + + + + + + + 获取记录名称行号 + + + + + + + 从表格中重载标签名称 + + + + + 从表格中重载记录名称 @@ -6065,38 +6271,16 @@ UTS_Core 光标进入grd表格时，原底色切换到选中行 - - - 根据CmdType 和 isAction 返回该行字体颜色 - - - 鼠标移动到节点位置时所有子节点背景着色 - + - FixModule节点Action变化时子节点字体重新着色 + 节点类型变更，修改节点行样式 - - - - - FixModule节点Action变化时子节点字体重新着色 - - - - - 根据总表状态对单元格字体重新着色 - - - - - 遍历表格，并更新到全局数组 - - + @@ -6115,16 +6299,6 @@ UTS_Core 选定行使能或清除Action选项 - - - 更新表格内容到缓存，但是并不重新着色 - - - - - 更新ActionEn信息 - - 光标移动时，所在行底色高亮 @@ -6171,18 +6345,24 @@ UTS_Core 初始化测试站表格 + + + 加载测试文件后更新表格 + + + 展开行节点 - + 节点升级 - + 节点降级 @@ -6841,6 +7021,12 @@ UTS_Core + + + 允许移动节点移动 + + + 当前节点是否处于重试状态 @@ -9723,6 +9909,46 @@ UTS系列App与UtsCore交互为避免重复书写产生的中间类 + + + 是否正在执行导航操作 + + + + + + 是否可以后退 + + + + + + 是否可以前进 + + + + + + + 添加导航 + 导航 + + + + + + + + + + 向后导航 + + + + + 向前导航 + + 解析模式，并且确定有关参数 diff --git a/SQLliteReading/obj/Debug/AUTS_ProductEntry.FrmMain.resources b/SQLliteReading/obj/Debug/AUTS_ProductEntry.FrmMain.resources index ef3cfe2..38d5874 100644 Binary files a/SQLliteReading/obj/Debug/AUTS_ProductEntry.FrmMain.resources and b/SQLliteReading/obj/Debug/AUTS_ProductEntry.FrmMain.resources differ diff --git a/SQLliteReading/obj/Debug/AUTS_ProductEntry.exe b/SQLliteReading/obj/Debug/AUTS_ProductEntry.exe index 99144b7..a05aa67 100644 Binary files a/SQLliteReading/obj/Debug/AUTS_ProductEntry.exe and b/SQLliteReading/obj/Debug/AUTS_ProductEntry.exe differ diff --git a/SQLliteReading/obj/Debug/AUTS_ProductEntry.pdb b/SQLliteReading/obj/Debug/AUTS_ProductEntry.pdb index 4f3bee0..4728604 100644 Binary files a/SQLliteReading/obj/Debug/AUTS_ProductEntry.pdb and b/SQLliteReading/obj/Debug/AUTS_ProductEntry.pdb differ diff --git a/SQLliteReading/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/SQLliteReading/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index b9f87ea..0adf54f 100644 Binary files a/SQLliteReading/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/SQLliteReading/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/SQLliteReading/obj/Debug/SQLliteReading.vbproj.AssemblyReference.cache b/SQLliteReading/obj/Debug/SQLliteReading.vbproj.AssemblyReference.cache index 35f536c..eae2a4b 100644 Binary files a/SQLliteReading/obj/Debug/SQLliteReading.vbproj.AssemblyReference.cache and b/SQLliteReading/obj/Debug/SQLliteReading.vbproj.AssemblyReference.cache differ diff --git a/SQLliteReading/obj/Debug/SQLliteReading.vbproj.CoreCompileInputs.cache b/SQLliteReading/obj/Debug/SQLliteReading.vbproj.CoreCompileInputs.cache index 06cd3b3..886c92f 100644 --- a/SQLliteReading/obj/Debug/SQLliteReading.vbproj.CoreCompileInputs.cache +++ b/SQLliteReading/obj/Debug/SQLliteReading.vbproj.CoreCompileInputs.cache @@ -1 +1 @@ -86145609ae4e278126b1513a8d7bcc6e8b126d6182ad8e4d9bc96e6128318529 +5f5ba153640a4dff2f48567a68d3399ad14c6243da5c9356d1d73b1771bec3b4 diff --git a/SQLliteReading/obj/Debug/SQLliteReading.vbproj.FileListAbsolute.txt b/SQLliteReading/obj/Debug/SQLliteReading.vbproj.FileListAbsolute.txt index 5384268..20556e1 100644 --- a/SQLliteReading/obj/Debug/SQLliteReading.vbproj.FileListAbsolute.txt +++ b/SQLliteReading/obj/Debug/SQLliteReading.vbproj.FileListAbsolute.txt @@ -206,3 +206,59 @@ D:\ML\Wen\AUTS\SQLliteReading\bin\Debug\ZstdSharp.dll D:\ML\Wen\AUTS\SQLliteReading\bin\Debug\System.Threading.Tasks.Extensions.dll D:\ML\Wen\AUTS\SQLliteReading\bin\Debug\SharpCompress.pdb D:\ML\Wen\AUTS\SQLliteReading\bin\Debug\System.Threading.Tasks.Extensions.xml +C:\Project\SQLliteReading\obj\Debug\SQLliteReading.vbproj.AssemblyReference.cache +C:\Project\SQLliteReading\obj\Debug\AUTS_ProductEntry.exe.config +C:\Project\SQLliteReading\obj\Debug\AUTS_ProductEntry.FrmMain.resources +C:\Project\SQLliteReading\obj\Debug\AUTS_ProductEntry.Resources.resources +C:\Project\SQLliteReading\obj\Debug\SQLliteReading.vbproj.GenerateResource.cache +C:\Project\SQLliteReading\obj\Debug\SQLliteReading.vbproj.CoreCompileInputs.cache +C:\Project\SQLliteReading\obj\Debug\AUTS_ProductEntry.exe +C:\Project\SQLliteReading\obj\Debug\AUTS_ProductEntry.xml +C:\Project\SQLliteReading\obj\Debug\AUTS_ProductEntry.pdb +C:\Project\SQLliteReading\bin\Debug\x64\SQLite.Interop.dll +C:\Project\SQLliteReading\bin\Debug\x86\SQLite.Interop.dll +C:\Project\SQLliteReading\bin\Debug\AUTS_ProductEntry.exe.config +C:\Project\SQLliteReading\bin\Debug\AUTS_ProductEntry.exe +C:\Project\SQLliteReading\bin\Debug\AUTS_ProductEntry.pdb +C:\Project\SQLliteReading\bin\Debug\AUTS_ProductEntry.xml +C:\Project\SQLliteReading\bin\Debug\FlexCell.dll +C:\Project\SQLliteReading\bin\Debug\Newtonsoft.Json.Bson.dll +C:\Project\SQLliteReading\bin\Debug\Newtonsoft.Json.dll +C:\Project\SQLliteReading\bin\Debug\UTS_Core.dll +C:\Project\SQLliteReading\bin\Debug\SharpCompress.dll +C:\Project\SQLliteReading\bin\Debug\FluentFTP.dll +C:\Project\SQLliteReading\bin\Debug\TeeChart.dll +C:\Project\SQLliteReading\bin\Debug\MySql.Data.dll +C:\Project\SQLliteReading\bin\Debug\System.Memory.dll +C:\Project\SQLliteReading\bin\Debug\System.Buffers.dll +C:\Project\SQLliteReading\bin\Debug\ZstdSharp.dll +C:\Project\SQLliteReading\bin\Debug\Google.Protobuf.dll +C:\Project\SQLliteReading\bin\Debug\Zstandard.Net.dll +C:\Project\SQLliteReading\bin\Debug\K4os.Compression.LZ4.Streams.dll +C:\Project\SQLliteReading\bin\Debug\BouncyCastle.Crypto.dll +C:\Project\SQLliteReading\bin\Debug\Ubiety.Dns.Core.dll +C:\Project\SQLliteReading\bin\Debug\System.Numerics.Vectors.dll +C:\Project\SQLliteReading\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll +C:\Project\SQLliteReading\bin\Debug\System.Threading.Tasks.Extensions.dll +C:\Project\SQLliteReading\bin\Debug\K4os.Compression.LZ4.dll +C:\Project\SQLliteReading\bin\Debug\K4os.Hash.xxHash.dll +C:\Project\SQLliteReading\bin\Debug\UTS_Core.pdb +C:\Project\SQLliteReading\bin\Debug\UTS_Core.xml +C:\Project\SQLliteReading\bin\Debug\UTS_Core.dll.config +C:\Project\SQLliteReading\bin\Debug\Newtonsoft.Json.xml +C:\Project\SQLliteReading\bin\Debug\Newtonsoft.Json.Bson.pdb +C:\Project\SQLliteReading\bin\Debug\Newtonsoft.Json.Bson.xml +C:\Project\SQLliteReading\bin\Debug\SharpCompress.pdb +C:\Project\SQLliteReading\bin\Debug\FluentFTP.xml +C:\Project\SQLliteReading\bin\Debug\MySql.Data.xml +C:\Project\SQLliteReading\bin\Debug\System.Memory.xml +C:\Project\SQLliteReading\bin\Debug\System.Buffers.xml +C:\Project\SQLliteReading\bin\Debug\Google.Protobuf.pdb +C:\Project\SQLliteReading\bin\Debug\Google.Protobuf.xml +C:\Project\SQLliteReading\bin\Debug\K4os.Compression.LZ4.Streams.xml +C:\Project\SQLliteReading\bin\Debug\System.Numerics.Vectors.xml +C:\Project\SQLliteReading\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml +C:\Project\SQLliteReading\bin\Debug\System.Threading.Tasks.Extensions.xml +C:\Project\SQLliteReading\bin\Debug\K4os.Compression.LZ4.xml +C:\Project\SQLliteReading\bin\Debug\K4os.Hash.xxHash.xml +C:\Project\SQLliteReading\obj\Debug\SQLliteR.4BCD7BEC.Up2Date diff --git a/SQLliteReading/obj/Debug/SQLliteReading.vbproj.GenerateResource.cache b/SQLliteReading/obj/Debug/SQLliteReading.vbproj.GenerateResource.cache index 9987421..ccb9024 100644 Binary files a/SQLliteReading/obj/Debug/SQLliteReading.vbproj.GenerateResource.cache and b/SQLliteReading/obj/Debug/SQLliteReading.vbproj.GenerateResource.cache differ diff --git a/UTS_Core/UTSModule/DbConnect/DbConnector.vb b/UTS_Core/UTSModule/DbConnect/DbConnector.vb index 789bc65..13dff08 100644 --- a/UTS_Core/UTSModule/DbConnect/DbConnector.vb +++ b/UTS_Core/UTSModule/DbConnect/DbConnector.vb @@ -734,7 +734,7 @@ Namespace UTSModule.DbConnect Dim sqlText As String = $"Call `{dbName}`.`UpdateSnListBarcode`('{result.DUT_SN}',{station.SnListOrder},'{timeString}',{logResult},'{a1String}');" - ''’CZH 2023 06 07 增加SN_list MoId + 'CZH 2023 06 07 增加SN_list MoId If result.CustomRecord.ContainsKey("InternalNo") And result.TestResult = TestResult.TestResultEnum.Pass Then MoId = result.CustomRecord("OrderID") sqlText = $"Call `{dbName}`.`UpdateSnListBarcode_MO`('{result.DUT_SN}',{station.SnListOrder},'{timeString}',{logResult},'{a1String}',{MoId});" @@ -764,7 +764,7 @@ Namespace UTSModule.DbConnect Dim MoId As String = "-1" 'A类型站额外更新组装字段 If station.StationType = ProcessStation.StationTypeEnum.Assem Then - ‘a1String = result.CustomRecord("AssemblySn") + 'a1String = result.CustomRecord("AssemblySn") updateString &= $",`{SnListTable.ColNames.AssemblySn}` = '{a1String}',`{SnListTable.ColNames.AssemblyTime}` = '{timeString}'" End If @@ -774,7 +774,7 @@ Namespace UTSModule.DbConnect If saveCache Then cmdText = $"Call `{UtsDb.RemotePrivateDb}`.`UpdateSnListBarcode`('{result.DUT_SN}',{station.SnListOrder},'{timeString}',{logResult},'{a1String}');" - ''’CZH 2023 06 07 增加SN_list MoId + 'CZH 2023 06 07 增加SN_list MoId If result.CustomRecord.ContainsKey("OrderID") Then MoId = result.CustomRecord("OrderID") cmdText = $"Call `{dbName}`.`UpdateSnListBarcode_MO`('{result.DUT_SN}',{station.SnListOrder},'{timeString}',{logResult},'{a1String}',{MoId});" @@ -796,6 +796,46 @@ Namespace UTSModule.DbConnect End If End Sub + ''' + ''' 更新SNList表指定字段名称的值 + ''' + ''' + ''' + ''' + ''' + ''' + Public Shared Sub UpdateSnListTableToLocal(db As DbExecutor, dbName As String, filedNames As List(Of String), filedValues As List(Of String), Optional saveCache As Boolean = True) + Dim timeString As String = $"{result.StartTime:yyyy-MM-dd HH:mm:ss}" + Dim logResult As Integer = CInt(IIf(result.TestResult = TestResult.TestResultEnum.Pass, 1, 0)) + Dim a1String As String = "" + + Dim localDbName As String = UtsFilterDbName(db.DatabaseType, dbName) '过滤库名 + Dim updateString As String = $"`S{Station.SnListOrder}` = '{timeString}',`Result{Station.SnListOrder}` = {logResult}" + Dim MoId As String = "-1" + 'A类型站额外更新组装字段 + If Station.StationType = ProcessStation.StationTypeEnum.Assem Then + 'a1String = result.CustomRecord("AssemblySn") + updateString &= $",`{SnListTable.ColNames.AssemblySn}` = '{a1String}',`{SnListTable.ColNames.AssemblyTime}` = '{timeString}'" + End If + + Dim condition As String = $"`{SnListTable.ColNames.ProductID}` = '{Station.ParentProject.Index}' and `{SnListTable.ColNames.BarCode}` = '{result.DUT_SN}'" + Dim cmdText As String = db.CmdHelper.DbUpdate(localDbName, SnListTable.TableName, updateString, condition) + db.ExecuteNonQuery(cmdText) + + If saveCache Then + cmdText = $"Call `{UtsDb.RemotePrivateDb}`.`UpdateSnListBarcode`('{result.DUT_SN}',{Station.SnListOrder},'{timeString}',{logResult},'{a1String}');" + 'CZH 2023 06 07 增加SN_list MoId + If result.CustomRecord.ContainsKey("OrderID") Then + MoId = result.CustomRecord("OrderID") + cmdText = $"Call `{dbName}`.`UpdateSnListBarcode_MO`('{result.DUT_SN}',{Station.SnListOrder},'{timeString}',{logResult},'{a1String}',{MoId});" + End If + '''''''''''''''''' + + SaveCmdStringToCacheTable(db, cmdText) + End If + End Sub + + ''' ''' 更新本地SN总表的测试记录(用于处理组播写入Sn总表操作) ''' diff --git a/UTS_Core/UTSModule/Station/StationPlanGrid.vb b/UTS_Core/UTSModule/Station/StationPlanGrid.vb index 546418c..90c7b20 100644 --- a/UTS_Core/UTSModule/Station/StationPlanGrid.vb +++ b/UTS_Core/UTSModule/Station/StationPlanGrid.vb @@ -1,9 +1,6 @@ -Imports System.Diagnostics.Eventing.Reader -Imports System.Drawing -Imports System.Web.UI.WebControls +Imports System.Drawing Imports System.Windows.Forms Imports FlexCell -Imports FluentFTP Imports UTS_Core.UTSModule.Production Imports UTS_Core.UTSModule.Test.Command Imports UTS_Core.UTSModule.Test.StatusMonitor @@ -2050,7 +2047,6 @@ Namespace UTSModule.Station Public Sub Grid_RowNodeTextChanged(sender As Object, e As RowNodeChangedEventArgs) Dim row As Integer = e.Node.RowListIndex Dim node As RowNode = e.Node - Dim cmd As ICommand _uploading = True With _grd @@ -2103,15 +2099,6 @@ Namespace UTSModule.Station End With OnUserAction(e.BeforeNode) OnUserActionEnd(e.Node) - 'If CommandManager.IsRuning = False Then - - - ' Dim dic As New Dictionary(Of Integer, TextChangedRowNode) From { - ' {row, New TextChangedRowNode With {.BeforeRowNode = e.BeforeNode.Clone, .AfterRowNode = e.Node.Clone}} - ' } - ' CommandManager.AddUndoCommand(New GridNodeTextChangedCommand(Me, dic)) - ' RaiseEvent PlanGridCommandChanged(Nothing, Nothing) - 'End If StationEditStatusMonitor.StationEditStatus = StationEditStatusMonitor.StationEditStatusEnum.Changed diff --git a/UTS_Core/UTSModule/Test/Command/CompareFunction-冲突-张虹_Win7.vb b/UTS_Core/UTSModule/Test/Command/CompareFunction-冲突-张虹_Win7.vb deleted file mode 100644 index d8288bf..0000000 --- a/UTS_Core/UTSModule/Test/Command/CompareFunction-冲突-张虹_Win7.vb +++ /dev/null @@ -1,279 +0,0 @@ -Namespace UTSModule.Test.Command - ''' - ''' UTS串口通讯返回值比较函数静态类 - ''' - Public Class CompareFunction - -#Region "String" - ''' - ''' 仅一个参数字符串比较,忽略大小写 - ''' - ''' 测试命令返回集合 - ''' - Public Shared Function StringCompare(testReturn As TestCommandReturn) As Boolean - Return StringCompare(testReturn.RecordValue, testReturn.LowerLimit, testReturn.UpperLimit) - End Function - - ''' - ''' 仅一个参数字符串是否包含关系,忽略大小写，下限则为目标字符串包含下限，上限则为上限字符串包含目标字符串 - ''' - ''' - Public Shared Function StringContain(value As String, lowerLimit As String, upperLimit As String) As Boolean - Dim result As Boolean = True - - If String.IsNullOrWhiteSpace(lowerLimit) = False Then '需要比较下限 - If value.Contains(lowerLimit) = False Then '不符合条件 - result = False - Return result '失败则不用比较上限 - End If - End If - - If String.IsNullOrWhiteSpace(upperLimit) = False Then '需要比较上限 - If upperLimit.Contains(value) = False Then '不符合条件 - result = False - End If - End If - - Return result - End Function - - ''' - ''' 仅一个参数字符串比较,忽略大小写 - ''' - ''' 当前值 - ''' 下限 - ''' 上限 - ''' - Public Shared Function StringCompare(value As String, lowerLimit As String, upperLimit As String) As Boolean - Dim result As Boolean = True - - If String.IsNullOrWhiteSpace(lowerLimit) = False Then '需要比较下限 - If String.Compare(value, lowerLimit, True) < 0 Then '不符合条件 - result = False - Return result '失败则不用比较上限 - End If - End If - - - If String.IsNullOrWhiteSpace(upperLimit) = False Then '需要比较上限 - If String.Compare(value, upperLimit, True) > 0 Then '不符合条件 - result = False - End If - End If - - Return result - End Function - - ''' - ''' 多参数字符串列表比较上下限 - ''' - ''' 参数列表 - ''' 下限字符串,切割时按冒号切割,位数不足则默认不比较 - ''' 上限字符串,切割时按冒号切割,位数不足则默认不比较 - ''' - Public Shared Function ParamStringListCompare(param As List(Of String), lowerLimit As String, upperLimit As String) As Boolean - Dim lowerList As String() = lowerLimit.Split(":"c) - Dim upperList As String() = upperLimit.Split(":"c) - Dim lower As String - Dim upper As String - - If param.Count() = 0 Then - If StringCompare("", lowerList(0), upperList(0)) = False Then Return False - End If - - For i As Integer = 0 To param.Count - 1 - If i = lowerList.Count() Then - lower = String.Empty - Else - lower = lowerList(i) - End If - - If i = upperList.Count() Then - upper = String.Empty - Else - upper = upperList(i) - End If - - - If StringCompare(param(i), lower, upper) = False Then Return False - Next - - Return True - End Function - -#End Region - -#Region "Double" - ''' - ''' 浮点型比较方式 - ''' - ''' - ''' - Public Shared Function DoubleCompare(testReturn As TestCommandReturn) As Boolean - - Return DoubleCompare(testReturn.RecordValue, testReturn.LowerLimit, testReturn.UpperLimit) - End Function - - - ''' - ''' 仅一个参数浮点型比较 - ''' - ''' 当前值 - ''' 下限 - ''' 上限 - ''' - Public Shared Function DoubleCompare(value As String, lowerLimit As String, upperLimit As String) As Boolean - Dim result As Boolean = True - - Dim compareLower As Boolean = IsNumeric(lowerLimit) - Dim compareUpper As Boolean = IsNumeric(upperLimit) - - If IsNumeric(value) = False Then - If compareLower OrElse compareUpper Then result = False - Else - Dim val As Double = CDbl(value) - - If compareLower Then - If val < CDbl(lowerLimit) Then - result = False - Return result '失败则不用比较上限 - End If - End If - - If compareUpper Then - If val > CDbl(upperLimit) Then result = False - End If - End If - - Return result - End Function - - - - - ''' - ''' 多参数浮点型列表比较上下限 - ''' - ''' 参数列表 - ''' 下限字符串,切割时按冒号切割,位数不足则默认不比较 - ''' 上限字符串,切割时按冒号切割,位数不足则默认不比较 - ''' - Public Shared Function ParamDoubleListCompare(param As List(Of String), lowerLimit As String, upperLimit As String) As Boolean - Dim lowerList As String() = lowerLimit.Split(":"c) - Dim upperList As String() = upperLimit.Split(":"c) - Dim lower As String - Dim upper As String - - If param.Count = 0 Then - If DoubleCompare("", lowerList(0), upperList(0)) = False Then Return False - End If - - For i As Integer = 0 To param.Count - 1 - If i = lowerList.Count() Then - lower = String.Empty - Else - lower = lowerList(i) - End If - - If i = upperList.Count() Then - upper = String.Empty - Else - upper = upperList(i) - End If - - - If DoubleCompare(param(i), lower, upper) = False Then Return False - Next - - Return True - End Function -#End Region - -#Region "Integer" - ''' - ''' 整数型比较方式 - ''' - ''' - ''' - Public Shared Function IntegerCompare(testReturn As TestCommandReturn) As Boolean - - Return IntegerCompare(testReturn.RecordValue, testReturn.LowerLimit, testReturn.UpperLimit) - End Function - - - ''' - ''' 仅一个参数整数比较,忽略大小写 - ''' - ''' 当前值 - ''' 下限 - ''' 上限 - ''' - Public Shared Function IntegerCompare(value As String, lowerLimit As String, upperLimit As String) As Boolean - Dim result As Boolean = True - - Dim compareLower As Boolean = IsNumeric(lowerLimit) - Dim compareUpper As Boolean = IsNumeric(upperLimit) - - If IsNumeric(value) = False Then - If compareLower OrElse compareUpper Then result = False - Else - Dim val As Double = CInt(value) - - If compareLower Then - If val < CInt(lowerLimit) Then - result = False - Return result '失败则不用比较上限 - End If - End If - - If compareUpper Then - If val > CInt(upperLimit) Then result = False - End If - End If - - Return result - End Function - - - - - ''' - ''' 多参数整数型列表比较上下限 - ''' - ''' 参数列表 - ''' 下限字符串,切割时按冒号切割,位数不足则默认不比较 - ''' 上限字符串,切割时按冒号切割,位数不足则默认不比较 - ''' - Public Shared Function ParamIntegerListCompare(param As List(Of String), lowerLimit As String, upperLimit As String) As Boolean - Dim lowerList As String() = lowerLimit.Split(":"c) - Dim upperList As String() = upperLimit.Split(":"c) - Dim lower As String - Dim upper As String - - If param.Count = 0 Then - If IntegerCompare("", lowerList(0), upperList(0)) = False Then Return False - End If - - For i As Integer = 0 To param.Count - 1 - If i = lowerList.Count() Then - lower = String.Empty - Else - lower = lowerList(i) - End If - - If i = upperList.Count() Then - upper = String.Empty - Else - upper = upperList(i) - End If - - - If IntegerCompare(param(i), lower, upper) = False Then Return False - Next - - Return True - End Function -#End Region - - End Class -End Namespace \ No newline at end of file diff --git a/UTS_Core/UTSModule/Test/Command/DBCommand/CombindRecordCommand.vb b/UTS_Core/UTSModule/Test/Command/DBCommand/CombindRecordCommand.vb new file mode 100644 index 0000000..b1a6130 --- /dev/null +++ b/UTS_Core/UTSModule/Test/Command/DBCommand/CombindRecordCommand.vb @@ -0,0 +1,20 @@ +Imports UTS_Core.UTSModule.Test.Command + +Public Class CombindRecordCommand + Inherits TestCommandExecutor + + Sub New(command As TestCommand) + MyBase.New(command) + + + End Sub + + Public Overrides Function Execute() As TestCommandReturn + '链接本地库 + '获取本地库数据 + + '链接云端库 + '获取云端库数据 + '失败则写入同步表格 + End Function +End Class diff --git a/UTS_Core/UTSModule/Test/Command/DBCommand/DatabaseCommandManager.vb b/UTS_Core/UTSModule/Test/Command/DBCommand/DatabaseCommandManager.vb new file mode 100644 index 0000000..173fa18 --- /dev/null +++ b/UTS_Core/UTSModule/Test/Command/DBCommand/DatabaseCommandManager.vb @@ -0,0 +1,18 @@ +Namespace UTSModule.Test.Command.DatabaseCommand + Public Class DatabaseCommandManager + Public Shared Function CreateExecutor(command As TestCommand) As TestCommandExecutor + Dim executor As TestCommandExecutor + Select Case command.Name + Case "GetRecord" + Return New GetRecordCommand(command) + Case "SetRecord" + Return New SetRecordCommand(command) + Case "CombindRecord" + Return New CombindRecordCommand(command) + Case Else + Throw New Exception($"Database集,未知命令 ：{command.Name}") + End Select + Return executor + End Function + End Class +End Namespace diff --git a/UTS_Core/UTSModule/Test/Command/DBCommand/GetRecordCommand.vb b/UTS_Core/UTSModule/Test/Command/DBCommand/GetRecordCommand.vb new file mode 100644 index 0000000..fc82c56 --- /dev/null +++ b/UTS_Core/UTSModule/Test/Command/DBCommand/GetRecordCommand.vb @@ -0,0 +1,25 @@ +Imports UTS_Core.UTSModule.Test.Command + +Public Class GetRecordCommand + Inherits TestCommandExecutor + + + Private _sn As String + Private dbFiledName As String + + Sub New(command As TestCommand) + MyBase.New(command) + + End Sub + + Public Overrides Function Execute() As TestCommandReturn + '链接云端库 + '获取云端库数据 + + + '链接本地库 + '获取本地库数据 + + + End Function +End Class diff --git a/UTS_Core/UTSModule/Test/Command/DBCommand/SetRecordCommand.vb b/UTS_Core/UTSModule/Test/Command/DBCommand/SetRecordCommand.vb new file mode 100644 index 0000000..523606f --- /dev/null +++ b/UTS_Core/UTSModule/Test/Command/DBCommand/SetRecordCommand.vb @@ -0,0 +1,19 @@ +Imports UTS_Core.UTSModule.Test.Command + +Public Class SetRecordCommand + Inherits TestCommandExecutor + + Sub New(command As TestCommand) + MyBase.New(command) + + End Sub + + Public Overrides Function Execute() As TestCommandReturn + '链接本地库 + '获取本地库数据 + + '链接云端库 + '获取云端库数据 + '失败则写入同步表格 + End Function +End Class diff --git a/UTS_Core/UTSModule/Test/Command/DatabaseCommand/CombindRecordCommand.vb b/UTS_Core/UTSModule/Test/Command/DatabaseCommand/CombindRecordCommand.vb new file mode 100644 index 0000000..feb1f3e --- /dev/null +++ b/UTS_Core/UTSModule/Test/Command/DatabaseCommand/CombindRecordCommand.vb @@ -0,0 +1,84 @@ +Imports UTS_Core.Database +Imports UTS_Core.UTSModule +Imports UTS_Core.UTSModule.DbConnect +Imports UTS_Core.UTSModule.DbTableModel.Customer +Imports UTS_Core.UTSModule.Test.Command + +Public Class CombindRecordCommand + Inherits TestCommandExecutor + + Private _filedNames As New List(Of String) + Private _dutSn As String + Private _dutSn2 As String + + Sub New(command As TestCommand) + MyBase.New(command) + + _dutSn = command.Parameter(0) + _dutSn2 = command.Parameter(1) + + _filedNames.Add(command.Parameter(0)) + End Sub + + Public Overrides Function Execute() As TestCommandReturn + CommandReturn.ExecuteResult = True + CommandReturn.RecordValue = "True" + + Dim filedName As String = _filedNames(0) + Dim updateString As String = $"t1.`{filedName}` = t2.`{filedName}`" + For i As Integer = 1 To _filedNames.Count - 1 + updateString += $",t1.`{filedName}` = t2.`{filedName}` " + Next + + + Dim saveDbCmdText As String = String.Empty + Using db As New DbExecutor(UtsDb.RemoteDbType, UtsDb.RemoteConnString) + Dim cmdText As String = $"UPDATE `{UtsDb.RemotePrivateDb}`.`{SnListTable.TableName}` t1 JOIN `{UtsDb.RemotePrivateDb}`.`{SnListTable.TableName}` t2 ON t2.`{SnListTable.ColNames.BarCode}` = '{_dutSn2}' SET {updateString} WHERE t1.`{SnListTable.ColNames.BarCode}` = '{_dutSn}';" + + Try + db.Open() + db.ExecuteNonQuery(cmdText) + db.Close() + Catch ex As Exception + saveDbCmdText = cmdText '云端执行，使用本地执行 + End Try + End Using + + '本地存储 + Using db As New DbExecutor(UtsDb.LocalDbType, UtsDb.LocalConnString) + Try + db.Open() + Catch ex As Exception + CommandReturn.ExecuteResult = False + CommandReturn.RecordValue = "False" + CommandReturn.ExecuteResultTipString = $"本地数据库连接失败,{ex.Message}" + End Try + + Try + Dim cmdText As String = $"UPDATE `{SnListTable.TableName}` t1 JOIN `{UtsDb.RemotePrivateDb}`.`{SnListTable.TableName}` t2 ON t2.`{SnListTable.ColNames.BarCode}` = '{_dutSn2}' SET {updateString} WHERE t1.`{SnListTable.ColNames.BarCode}` = '{_dutSn}';" + db.ExecuteNonQuery(cmdText) + Catch ex As Exception + CommandReturn.ExecuteResult = False + CommandReturn.RecordValue = "False" + CommandReturn.ExecuteResultTipString = $"本地数据库保存失败,{ex.Message}" + End Try + + + '本地缓存 + Try + If String.IsNullOrEmpty(saveDbCmdText) Then + DbConnector.SaveCmdStringToCacheTable(db, saveDbCmdText) + CommandReturn.ExecuteResultTipString = "本地缓存成功" + End If + Catch ex As Exception + CommandReturn.ExecuteResult = False + CommandReturn.RecordValue = "False" + CommandReturn.ExecuteResultTipString = $"本地数据库缓存失败,{ex.Message}" + End Try + + + db.Close() + End Using + + End Function +End Class diff --git a/UTS_Core/UTSModule/Test/Command/DatabaseCommand/DatabaseCommandManager.vb b/UTS_Core/UTSModule/Test/Command/DatabaseCommand/DatabaseCommandManager.vb index 10f1697..173fa18 100644 --- a/UTS_Core/UTSModule/Test/Command/DatabaseCommand/DatabaseCommandManager.vb +++ b/UTS_Core/UTSModule/Test/Command/DatabaseCommand/DatabaseCommandManager.vb @@ -3,10 +3,14 @@ Public Shared Function CreateExecutor(command As TestCommand) As TestCommandExecutor Dim executor As TestCommandExecutor Select Case command.Name - Case "Get_DB_Data" - executor = New CheckUtsPlatformExecutor(command) + Case "GetRecord" + Return New GetRecordCommand(command) + Case "SetRecord" + Return New SetRecordCommand(command) + Case "CombindRecord" + Return New CombindRecordCommand(command) Case Else - Throw New Exception($"System集,未知命令 ：{command.Name}") + Throw New Exception($"Database集,未知命令 ：{command.Name}") End Select Return executor End Function diff --git a/UTS_Core/UTSModule/Test/Command/DatabaseCommand/GetRecordCommand.vb b/UTS_Core/UTSModule/Test/Command/DatabaseCommand/GetRecordCommand.vb new file mode 100644 index 0000000..96fcc9f --- /dev/null +++ b/UTS_Core/UTSModule/Test/Command/DatabaseCommand/GetRecordCommand.vb @@ -0,0 +1,70 @@ +Imports UTS_Core.Database +Imports UTS_Core.UTSModule +Imports UTS_Core.UTSModule.DbConnect +Imports UTS_Core.UTSModule.DbTableModel.Customer +Imports UTS_Core.UTSModule.Test.Command + +Public Class GetRecordCommand + Inherits TestCommandExecutor + + Private _filedName As String + Private _dutSn As String + + Sub New(command As TestCommand) + MyBase.New(command) + + _dutSn = command.Parameter(0) + _filedName = command.Parameter(1) + End Sub + + Public Overrides Function Execute() As TestCommandReturn + '优先查询云端 + Dim useLocalSearch As Boolean = False + Using db As New DbExecutor(UtsDb.RemoteDbType, UtsDb.RemoteConnString) + Dim condition As String = $"`{SnListTable.ColNames.BarCode}` = '{_dutSn}'" + Dim cmdText As String = db.CmdHelper.DbSearch(UtsDb.RemotePrivateDb, _filedName, SnListTable.TableName, condition) + + Try + db.Open() + CommandReturn.RecordValue = db.ExecuteScalar(cmdText).ToString() + CommandReturn.ExecuteResult = True + db.Close() + Catch ex As Exception + useLocalSearch = True '云端查询失败，使用本地查询 + End Try + End Using + + + '本地存储 + If useLocalSearch Then + Using db As New DbExecutor(UtsDb.LocalDbType, UtsDb.LocalConnString) + Try + db.Open() + Catch ex As Exception + CommandReturn.ExecuteResult = False + CommandReturn.RecordValue = "" + CommandReturn.ExecuteResultTipString = $"本地数据库连接失败,{ex.Message}" + End Try + + Try + ' Dim condition As String = $"`{SnListTable.ColNames.ProductID}` = '{Station.ParentProject.Index}' and `{SnListTable.ColNames.BarCode}` = '{_dutSn}'" + Dim condition As String = $"`{SnListTable.ColNames.BarCode}` = '{_dutSn}'" + Dim cmdText As String = db.CmdHelper.Search(_filedName, SnListTable.TableName, condition) + CommandReturn.RecordValue = db.ExecuteScalar(cmdText).ToString() + CommandReturn.ExecuteResult = True + CommandReturn.ExecuteResultTipString = $"本地数据库查询成功" + Catch ex As Exception + CommandReturn.ExecuteResult = False + CommandReturn.RecordValue = "" + CommandReturn.ExecuteResultTipString = $"本地数据库查询失败,{ex.Message}" + End Try + + db.Close() + End Using + End If + + Return CommandReturn + + + End Function +End Class diff --git a/UTS_Core/UTSModule/Test/Command/DatabaseCommand/SetRecordCommand.vb b/UTS_Core/UTSModule/Test/Command/DatabaseCommand/SetRecordCommand.vb new file mode 100644 index 0000000..1ee0c09 --- /dev/null +++ b/UTS_Core/UTSModule/Test/Command/DatabaseCommand/SetRecordCommand.vb @@ -0,0 +1,86 @@ +Imports UTS_Core.Database +Imports UTS_Core.UTSModule +Imports UTS_Core.UTSModule.DbConnect +Imports UTS_Core.UTSModule.DbTableModel.Customer +Imports UTS_Core.UTSModule.Test.Command + +Public Class SetRecordCommand + Inherits TestCommandExecutor + + Private _filedName As String + Private _filedValue As String + Private _dutSn As String + + + Sub New(command As TestCommand) + MyBase.New(command) + + _dutSn = command.Parameter(0) + _filedName = command.Parameter(1) + _filedValue = command.Parameter(2) + + + End Sub + + Public Overrides Function Execute() As TestCommandReturn + CommandReturn.ExecuteResult = True + CommandReturn.RecordValue = "True" + + '优先储存云端 + Dim saveDbCmdText As String = String.Empty + Using db As New DbExecutor(UtsDb.RemoteDbType, UtsDb.RemoteConnString) + Dim updateString As String = $"`{_filedName}` = {_filedValue}" + Dim condition As String = $"`{SnListTable.ColNames.BarCode}` = '{_dutSn}'" + Dim cmdText As String = db.CmdHelper.DbUpdate(UtsDb.RemotePrivateDb, SnListTable.TableName, updateString, condition) + + Try + db.Open() + db.ExecuteNonQuery(cmdText) + db.Close() + Catch ex As Exception + saveDbCmdText = cmdText '云端存储失败，转存本地 + End Try + End Using + + '本地存储 + Using db As New DbExecutor(UtsDb.LocalDbType, UtsDb.LocalConnString) + Try + db.Open() + Catch ex As Exception + CommandReturn.ExecuteResult = False + CommandReturn.RecordValue = "False" + CommandReturn.ExecuteResultTipString = $"本地数据库连接失败,{ex.Message}" + End Try + + Try + Dim updateString As String = $"`{_filedName}` = {_filedValue}" + ' Dim condition As String = $"`{SnListTable.ColNames.ProductID}` = '{Station.ParentProject.Index}' and `{SnListTable.ColNames.BarCode}` = '{_dutSn}'" + Dim condition As String = $"`{SnListTable.ColNames.BarCode}` = '{_dutSn}'" + Dim cmdText As String = db.CmdHelper.Update(SnListTable.TableName, updateString, condition) + db.ExecuteNonQuery(cmdText) + Catch ex As Exception + CommandReturn.ExecuteResult = False + CommandReturn.RecordValue = "False" + CommandReturn.ExecuteResultTipString = $"本地数据库保存失败,{ex.Message}" + End Try + + + '本地缓存 + Try + If String.IsNullOrEmpty(saveDbCmdText) Then + DbConnector.SaveCmdStringToCacheTable(db, saveDbCmdText) + CommandReturn.ExecuteResultTipString = "本地缓存成功" + End If + Catch ex As Exception + CommandReturn.ExecuteResult = False + CommandReturn.RecordValue = "False" + CommandReturn.ExecuteResultTipString = $"本地数据库缓存失败,{ex.Message}" + End Try + + + db.Close() + End Using + + Return CommandReturn + End Function +End Class diff --git a/UTS_Core/UTS_Core.vbproj b/UTS_Core/UTS_Core.vbproj index b2f8bca..af722fe 100644 --- a/UTS_Core/UTS_Core.vbproj +++ b/UTS_Core/UTS_Core.vbproj @@ -342,6 +342,10 @@ + + + + diff --git a/UTS_Core/bin/Debug/UTS_Core.dll b/UTS_Core/bin/Debug/UTS_Core.dll index f22c1b9..bd9ec5d 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 443b1bc..ac7d2d0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/UTS_Core/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index bf4fa5a..1b03451 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.dll b/UTS_Core/obj/Debug/UTS_Core.dll index f22c1b9..bd9ec5d 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 443b1bc..ac7d2d0 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.AssemblyReference.cache b/UTS_Core/obj/Debug/UTS_Core.vbproj.AssemblyReference.cache index da694cd..6709639 100644 Binary files a/UTS_Core/obj/Debug/UTS_Core.vbproj.AssemblyReference.cache and b/UTS_Core/obj/Debug/UTS_Core.vbproj.AssemblyReference.cache differ diff --git a/UTS_Core/obj/Debug/UTS_Core.vbproj.CoreCompileInputs.cache b/UTS_Core/obj/Debug/UTS_Core.vbproj.CoreCompileInputs.cache index 6490c3e..267543b 100644 --- a/UTS_Core/obj/Debug/UTS_Core.vbproj.CoreCompileInputs.cache +++ b/UTS_Core/obj/Debug/UTS_Core.vbproj.CoreCompileInputs.cache @@ -1 +1 @@ -8715b676b742e2289b934c8a9eee1207ea9207fc4d73dfbf559ccf64d7b6fd35 +34de90036f057f2c0b29d8bef1e24cf1ba7a80e898f2f80e37d38e472d36018d diff --git a/UTS_Core/obj/Debug/UTS_Core.vbproj.FileListAbsolute.txt b/UTS_Core/obj/Debug/UTS_Core.vbproj.FileListAbsolute.txt index 7b6c2b9..331762a 100644 --- a/UTS_Core/obj/Debug/UTS_Core.vbproj.FileListAbsolute.txt +++ b/UTS_Core/obj/Debug/UTS_Core.vbproj.FileListAbsolute.txt @@ -238,3 +238,68 @@ G:\Git\AUTS\UTS_Core\obj\Debug\UTS_Core.vbproj.Up2Date G:\Git\AUTS\UTS_Core\obj\Debug\UTS_Core.dll G:\Git\AUTS\UTS_Core\obj\Debug\UTS_Core.xml G:\Git\AUTS\UTS_Core\obj\Debug\UTS_Core.pdb +C:\Project\UTS_Core\obj\Debug\UTS_Core.vbproj.AssemblyReference.cache +C:\Project\UTS_Core\obj\Debug\UTS_Core.Resources.resources +C:\Project\UTS_Core\obj\Debug\UTS_Core.UTSModule.Login.LoginForm.resources +C:\Project\UTS_Core\obj\Debug\UTS_Core.UTSModule.Project.DlgCreateProject.resources +C:\Project\UTS_Core\obj\Debug\UTS_Core.UTSModule.Project.DlgLoadProject.resources +C:\Project\UTS_Core\obj\Debug\UTS_Core.UTSModule.Project.FrmProject.resources +C:\Project\UTS_Core\obj\Debug\UTS_Core.UserControl1.resources +C:\Project\UTS_Core\obj\Debug\UTS_Core.UTSModule.Station.DlgLoadStation.resources +C:\Project\UTS_Core\obj\Debug\UTS_Core.UTSModule.Station.DlgStationPlanStyle.resources +C:\Project\UTS_Core\obj\Debug\UTS_Core.UTSModule.Station.FrmStationDesign.resources +C:\Project\UTS_Core\obj\Debug\UTS_Core.UTSModule.Station.FrmStationPlan.resources +C:\Project\UTS_Core\obj\Debug\UTS_Core.UTSModule.Test.Controls.UtsInputBox.resources +C:\Project\UTS_Core\obj\Debug\UTS_Core.UTSModule.Test.Controls.utsLabel.resources +C:\Project\UTS_Core\obj\Debug\UTS_Core.UTSModule.Test.Controls.UtsMsgBox.resources +C:\Project\UTS_Core\obj\Debug\UTS_Core.UTSModule.Test.FrmStationTest.resources +C:\Project\UTS_Core\obj\Debug\UTS_Core.vbproj.GenerateResource.cache +C:\Project\UTS_Core\obj\Debug\UTS_Core.vbproj.CoreCompileInputs.cache +C:\Project\UTS_Core\obj\Debug\UTS_Core.dll +C:\Project\UTS_Core\obj\Debug\UTS_Core.pdb +C:\Project\UTS_Core\bin\Debug\x64\SQLite.Interop.dll +C:\Project\UTS_Core\bin\Debug\x86\SQLite.Interop.dll +C:\Project\UTS_Core\bin\Debug\UTS_Core.dll.config +C:\Project\UTS_Core\bin\Debug\UTS_Core.dll +C:\Project\UTS_Core\bin\Debug\UTS_Core.pdb +C:\Project\UTS_Core\bin\Debug\UTS_Core.xml +C:\Project\UTS_Core\bin\Debug\BouncyCastle.Crypto.dll +C:\Project\UTS_Core\bin\Debug\FlexCell.dll +C:\Project\UTS_Core\bin\Debug\FluentFTP.dll +C:\Project\UTS_Core\bin\Debug\Google.Protobuf.dll +C:\Project\UTS_Core\bin\Debug\K4os.Compression.LZ4.dll +C:\Project\UTS_Core\bin\Debug\K4os.Compression.LZ4.Streams.dll +C:\Project\UTS_Core\bin\Debug\K4os.Hash.xxHash.dll +C:\Project\UTS_Core\bin\Debug\Microsoft.Bcl.AsyncInterfaces.dll +C:\Project\UTS_Core\bin\Debug\MySql.Data.dll +C:\Project\UTS_Core\bin\Debug\Newtonsoft.Json.dll +C:\Project\UTS_Core\bin\Debug\SharpCompress.dll +C:\Project\UTS_Core\bin\Debug\System.Buffers.dll +C:\Project\UTS_Core\bin\Debug\System.Data.SQLite.dll +C:\Project\UTS_Core\bin\Debug\System.Memory.dll +C:\Project\UTS_Core\bin\Debug\System.Numerics.Vectors.dll +C:\Project\UTS_Core\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll +C:\Project\UTS_Core\bin\Debug\System.Text.Encoding.CodePages.dll +C:\Project\UTS_Core\bin\Debug\System.Threading.Tasks.Extensions.dll +C:\Project\UTS_Core\bin\Debug\TeeChart.dll +C:\Project\UTS_Core\bin\Debug\Ubiety.Dns.Core.dll +C:\Project\UTS_Core\bin\Debug\Zstandard.Net.dll +C:\Project\UTS_Core\bin\Debug\ZstdSharp.dll +C:\Project\UTS_Core\bin\Debug\FluentFTP.xml +C:\Project\UTS_Core\bin\Debug\Google.Protobuf.pdb +C:\Project\UTS_Core\bin\Debug\Google.Protobuf.xml +C:\Project\UTS_Core\bin\Debug\K4os.Compression.LZ4.xml +C:\Project\UTS_Core\bin\Debug\K4os.Compression.LZ4.Streams.xml +C:\Project\UTS_Core\bin\Debug\K4os.Hash.xxHash.xml +C:\Project\UTS_Core\bin\Debug\Microsoft.Bcl.AsyncInterfaces.xml +C:\Project\UTS_Core\bin\Debug\MySql.Data.xml +C:\Project\UTS_Core\bin\Debug\Newtonsoft.Json.xml +C:\Project\UTS_Core\bin\Debug\SharpCompress.pdb +C:\Project\UTS_Core\bin\Debug\System.Buffers.xml +C:\Project\UTS_Core\bin\Debug\System.Memory.xml +C:\Project\UTS_Core\bin\Debug\System.Numerics.Vectors.xml +C:\Project\UTS_Core\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml +C:\Project\UTS_Core\bin\Debug\System.Text.Encoding.CodePages.xml +C:\Project\UTS_Core\bin\Debug\System.Threading.Tasks.Extensions.xml +C:\Project\UTS_Core\obj\Debug\UTS_Core.vbproj.Up2Date +C:\Project\UTS_Core\obj\Debug\UTS_Core.xml diff --git a/UTS_Core/obj/Debug/UTS_Core.vbproj.GenerateResource.cache b/UTS_Core/obj/Debug/UTS_Core.vbproj.GenerateResource.cache index 5793a8f..37e041e 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