增加文档目录

文档目录中加入每月改善计划

AUTS_ServiceControler/AUTS_ServiceControler.vbproj

@@ -14,6 +14,7 @@
     <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -26,7 +27,6 @@
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>0</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
@@ -115,6 +115,7 @@
     <Import Include="System.Threading.Tasks" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ApplicationEvents.vb" />
     <Compile Include="CheckSum.vb" />
     <Compile Include="FrmAddTask.Designer.vb">
       <DependentUpon>FrmAddTask.vb</DependentUpon>

AUTS_ServiceControler/ApplicationEvents.vb

@@ -0,0 +1,10 @@
+Namespace My
+    ' 以下事件可用于 MyApplication: 
+    ' Startup:应用程序启动时在创建启动窗体之前引发。
+    ' Shutdown:在关闭所有应用程序窗体后引发。如果应用程序非正常终止，则不会引发此事件。
+    ' UnhandledException:在应用程序遇到未经处理的异常时引发。
+    ' StartupNextInstance:在启动单实例应用程序且应用程序已处于活动状态时引发。 
+    ' NetworkAvailabilityChanged:在连接或断开网络连接时引发。
+    Partial Friend Class MyApplication
+    End Class
+End Namespace

AUTS_ServiceControler/FrmUpdateConfig.Designer.vb

@@ -214,16 +214,16 @@ Partial Class FrmUpdateConfig
         Me.TxtGroup.Font = New System.Drawing.Font("宋体", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte))
         Me.TxtGroup.Location = New System.Drawing.Point(130, 151)
         Me.TxtGroup.Name = "TxtGroup"
-        Me.TxtGroup.Size = New System.Drawing.Size(150, 26)
+        Me.TxtGroup.Size = New System.Drawing.Size(105, 26)
         Me.TxtGroup.TabIndex = 33
         Me.TxtGroup.Text = "Group1"
         '
         'TxtRoles
         '
         Me.TxtRoles.Font = New System.Drawing.Font("宋体", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte))
-        Me.TxtRoles.Location = New System.Drawing.Point(412, 152)
+        Me.TxtRoles.Location = New System.Drawing.Point(327, 152)
         Me.TxtRoles.Name = "TxtRoles"
-        Me.TxtRoles.Size = New System.Drawing.Size(150, 26)
+        Me.TxtRoles.Size = New System.Drawing.Size(94, 26)
         Me.TxtRoles.TabIndex = 35
         Me.TxtRoles.Text = "0"
         '
@@ -231,7 +231,7 @@ Partial Class FrmUpdateConfig
         '
         Me.Label6.AutoSize = True
         Me.Label6.Font = New System.Drawing.Font("宋体", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(134, Byte))
-        Me.Label6.Location = New System.Drawing.Point(322, 155)
+        Me.Label6.Location = New System.Drawing.Point(241, 155)
         Me.Label6.Name = "Label6"
         Me.Label6.Size = New System.Drawing.Size(80, 16)
         Me.Label6.TabIndex = 34

AUTS_ServiceControler/FrmUpdateConfig.vb

@@ -217,7 +217,10 @@ Public Class FrmUpdateConfig
         '下载安装
         Try
             UpdateInstallTip(20, "Begin InstallUpdateService...")
-            InstallUpdateService()
+            'Momo 2024-04-05 Service ID 由 ProcessorID + AlisaName 构成，从Service Controller 传参传过来
+            'InstallUpdateService()
+            InstallUpdateService(DataServiceAlias)
+
             UpdateInstallTip(100, "InstallUpdateService Success!")
         Catch ex As Exception
             UpdateInstallTip(100, $"InstallUpdateService Error:{ex.Message}")
@@ -320,6 +323,9 @@ Public Class FrmUpdateConfig
     ''' <summary>同步目录：auts_vendor</summary>
     Private _sync_auts_vendor_DirPath As String
 
+    ''' <summary>App：app</summary>
+    Private _sync_auts_app_DirPath As String
+
     ''' <summary>
     ''' 创建运行时必要文件夹
     ''' </summary>
@@ -346,9 +352,11 @@ Public Class FrmUpdateConfig
 
         _sync_auts_public_DirPath = $"{syncRootPath}\uts_Public"
         _sync_auts_vendor_DirPath = $"{syncRootPath}\uts_{_license.VendorName}"
+        _sync_auts_app_DirPath = $"{RootPath}\App"
 
         Directory.CreateDirectory(_sync_auts_public_DirPath) 'uts_Public
         Directory.CreateDirectory(_sync_auts_vendor_DirPath) 'uts_VendorName
+        Directory.CreateDirectory(_sync_auts_app_DirPath) 'app
 
         If System.IO.Directory.Exists(_sync_auts_public_DirPath) = False OrElse System.IO.Directory.Exists(_sync_auts_vendor_DirPath) = False Then
             MsgBox("同步目录创建不成功！")
@@ -504,7 +512,7 @@ Public Class FrmUpdateConfig
     ''' <summary>
     ''' 一键更新
     ''' </summary>
-    Private Sub InstallUpdateService()
+    Private Sub InstallUpdateService(Optional AlisaName As String = "")
         If GetUtsHost() = False Then Return '根据License信息,获取服务器地址
 
         '校验License
@@ -544,7 +552,11 @@ Public Class FrmUpdateConfig
 
             _serviceRegister.Roles = _serviceRoles
             _serviceRegister.Group = _serviceGroup
-            _serviceRegister.RegisterService()
+            ' Momo 2024-04-05 Service ID 由 ProcessorID + AlisaName 构成，从Service Controller 传参传过来
+            '_serviceRegister.RegisterService()
+            _serviceRegister.RegisterService(AlisaName)
+
+
         Catch ex As Exception
             UpdateInstallTip(30, $"Register Service Fail,{ex.Message}")
             Return

AUTS_ServiceControler/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 '通过使用 "*"，如下所示:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.5.1.0")>
-<Assembly: AssemblyFileVersion("1.5.1.0")>
+<Assembly: AssemblyVersion("1.6.1.0")>
+<Assembly: AssemblyFileVersion("1.6.1.0")>

AUTS_ServiceControler/ServiceRegister.vb

@@ -83,9 +83,13 @@ Public Class ServiceRegister
 
     ''' <summary>
     ''' 注册服务返回注册服务的索引
+    ''' Momo 2024-04-05 Service ID 由 ProcessorID + AlisaName 构成，从Service Controller 传参传过来
     ''' </summary>
-    Public Sub RegisterService()
+    Public Sub RegisterService(Optional AlisaName As String = "")
         '增加服务记录
+        'Momo 2024-04-05 Service ID 由 ProcessorID + AlisaName 构成，从Service Controller 传参传过来
+        _cpuId = _cpuId & "-" & AlisaName
+
         Dim filed As New Dictionary(Of String, String) From {
             {$"{DataServiceListTable.ColNames.LicenseID}", LicenseID},
             {$"{DataServiceListTable.ColNames.CompanyName}", VendorName},
@@ -106,6 +110,7 @@ Public Class ServiceRegister
 
         Dim tableName As String = DataServiceListTable.TableName
         Dim colName As String = $"{DataServiceListTable.ColNames.ID}"
+
         Dim condition As String = $"`{DataServiceListTable.ColNames.ProcessorId}` = '{_cpuId}'"
 
         Dim sid As Integer

AUTS_ServiceControler/bin/Debug/AUTS_SeviceControler.xml

@@ -441,6 +441,9 @@ AUTS_SeviceControler
 <member name="F:AUTS_SeviceControler.FrmUpdateConfig._sync_auts_vendor_DirPath">
  <summary>同步目录：auts_vendor</summary>
 </member>
+<member name="F:AUTS_SeviceControler.FrmUpdateConfig._sync_auts_app_DirPath">
+ <summary>App：app</summary>
+</member>
 <member name="M:AUTS_SeviceControler.FrmUpdateConfig.CreateSystemFolder">
  <summary>
  创建运行时必要文件夹
@@ -456,7 +459,7 @@ AUTS_SeviceControler
  获取更新服务的最新信息
  </summary>
 </member>
-<member name="M:AUTS_SeviceControler.FrmUpdateConfig.InstallUpdateService">
+<member name="M:AUTS_SeviceControler.FrmUpdateConfig.InstallUpdateService(System.String)">
  <summary>
  一键更新
  </summary>
@@ -742,9 +745,10 @@ AUTS_SeviceControler
  </summary>
  <param name="licensePath">License文件完整路径(含文件名)</param>
 </member>
-<member name="M:AUTS_SeviceControler.ServiceRegister.RegisterService">
+<member name="M:AUTS_SeviceControler.ServiceRegister.RegisterService(System.String)">
  <summary>
  注册服务返回注册服务的索引
+ Momo 2024-04-05 Service ID 由 ProcessorID + AlisaName 构成，从Service Controller 传参传过来
  </summary>
 </member>
 <member name="P:AUTS_SeviceControler.UpdatePackageInfo.SoftwareID">

AUTS_ServiceControler/bin/Debug/UTS_Core.dll.config

@@ -39,6 +39,9 @@
             <setting name="UserPassword" serializeAs="String">
                 <value />
             </setting>
+            <setting name="SpcMain_SplitterDistance" serializeAs="String">
+                <value>0</value>
+            </setting>
         </UTS_Core.My.MySettings>
     </userSettings>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" /></startup>

AUTS_ServiceControler/bin/Debug/UTS_Core.xml

@@ -1270,7 +1270,7 @@ UTS_Core
 </member>
 <member name="M:UTS_Core.Expression.StringExpression.ExecuteLimit(System.String,System.String@)">
  <summary>
- 返回表达式的值 'Momo 2022-11-10 增加
+ 返回表达式的值 'Momo 2022-11-10 增加 、Momo 2023-12-15 错误时抛出错误而不是弹窗
  </summary>
  <returns></returns>
 </member>
@@ -5805,6 +5805,24 @@ UTS_Core
  </summary>
  <returns></returns>
 </member>
+<member name="P:UTS_Core.UTSModule.Station.StationPackagePlan.ForwardPosition">
+ <summary>
+ 前置站位
+ </summary>
+ <returns></returns>
+</member>
+<member name="P:UTS_Core.UTSModule.Station.StationPackagePlan.RearPosition">
+ <summary>
+ 后置站位
+ </summary>
+ <returns></returns>
+</member>
+<member name="P:UTS_Core.UTSModule.Station.StationPackagePlan.Versions">
+ <summary>
+ 软件版本
+ </summary>
+ <returns></returns>
+</member>
 <member name="M:UTS_Core.UTSModule.Station.StationPackagePlan.LoadProperties(System.Xml.XmlNodeList)">
  <summary>
  读取测试站属性
@@ -7293,7 +7311,7 @@ UTS_Core
 </member>
 <member name="M:UTS_Core.UTSModule.Test.Command.CompareFunction.StringContain_Momo(System.String,System.String,System.String)">
  <summary>
- 仅一个参数字符串是否包含关系,忽略大小写，下限则为目标字符串包含下限，上限则为上限字符串包含目标字符串
+ 仅一个参数字符串是否包含关系,忽略大小写，返回数据包含上下限中任意一个字符串即算ok
  </summary>
  <returns></returns>
 </member>
@@ -7348,7 +7366,7 @@ UTS_Core
  <param name="upperLimit">上限</param>
  <returns></returns>
 </member>
-<member name="M:UTS_Core.UTSModule.Test.Command.CompareFunction.ParamDoubleListCompare(System.Collections.Generic.List{System.String},System.String,System.String)">
+<member name="M:UTS_Core.UTSModule.Test.Command.CompareFunction.ParamDoubleListCompare(System.Collections.Generic.List{System.String},System.String,System.String,System.String,System.String)">
  <summary>
  多参数浮点型列表比较上下限
  </summary>
@@ -7447,6 +7465,18 @@ UTS_Core
  </summary>
  <returns></returns>
 </member>
+<member name="P:UTS_Core.UTSModule.Test.Command.TestCommandReturn.LowerLimit_2">
+ <summary>
+ 下限_2
+ </summary>
+ <returns></returns>
+</member>
+<member name="P:UTS_Core.UTSModule.Test.Command.TestCommandReturn.UpperLimit_2">
+ <summary>
+ 上限_2
+ </summary>
+ <returns></returns>
+</member>
 <member name="P:UTS_Core.UTSModule.Test.Command.TestCommandReturn.ExecuteResult">
  <summary>
  执行结果
@@ -7682,6 +7712,18 @@ UTS_Core
  </summary>
  <returns></returns>
 </member>
+<member name="P:UTS_Core.UTSModule.Test.Controls.UtsInputBox.InputText">
+ <summary>
+ 输入框值
+ </summary>
+ <returns></returns>
+</member>
+<member name="P:UTS_Core.UTSModule.Test.Controls.UtsInputBox.IsPassWord">
+ <summary>
+ 密码模式
+ </summary>
+ <returns></returns>
+</member>
 <member name="P:UTS_Core.UTSModule.Test.TestProgressChangedEventArgs.Percent">
  <summary>
  当前百分比
@@ -7981,18 +8023,6 @@ UTS_Core
  从节点开始往下测试
  </summary>
 </member>
-<member name="P:UTS_Core.UTSModule.Test.Controls.UtsInputBox.InputText">
- <summary>
- 输入框值
- </summary>
- <returns></returns>
-</member>
-<member name="P:UTS_Core.UTSModule.Test.Controls.UtsInputBox.IsPassWord">
- <summary>
- 密码模式
- </summary>
- <returns></returns>
-</member>
 <member name="F:UTS_Core.UTSModule.Test.DeviceAddress.WindowAddress">
  <summary>
  PC机地址
@@ -9508,5 +9538,15 @@ UTS系列App与UtsCore交互为避免重复书写产生的中间类
  </summary>
  <returns></returns>
 </member>
+<member name="M:UTS_Core.utsLabel.RunMode">
+ <summary>
+ 解析模式，并且确定有关参数
+ </summary>
+</member>
+<member name="M:UTS_Core.utsLabel.dispModeExe">
+ <summary>
+ 常驻线程，执行各种Mode
+ </summary>
+</member>
 </members>
 </doc>

AUTS_ServiceControler/obj/Debug/AUTS_ServiceControler.vbproj.CoreCompileInputs.cache

@@ -1 +1 @@
-96680e4200bd9e4b00c3db13d8757a602d05c694
+35ba155fcb9d717ab5247a80b27e5618004308e0

AUTS_ServiceControler/obj/Debug/AUTS_ServiceControler.vbproj.FileListAbsolute.txt

@@ -267,3 +267,57 @@ D:\Sync\RD_PC\Project\UTS_Studio\src\AUTS_ServiceControler\obj\Debug\AUTS_Servic
 D:\Sync\RD_PC\Project\UTS_Studio\src\AUTS_ServiceControler\obj\Debug\AUTS_SeviceControler.exe
 D:\Sync\RD_PC\Project\UTS_Studio\src\AUTS_ServiceControler\obj\Debug\AUTS_SeviceControler.xml
 D:\Sync\RD_PC\Project\UTS_Studio\src\AUTS_ServiceControler\obj\Debug\AUTS_SeviceControler.pdb
+E:\Git\AUTS\AUTS_ServiceControler\obj\Debug\AUTS_ServiceControler.vbprojAssemblyReference.cache
+E:\Git\AUTS\AUTS_ServiceControler\obj\Debug\AUTS_SeviceControler.FrmAddTask.resources
+E:\Git\AUTS\AUTS_ServiceControler\obj\Debug\AUTS_SeviceControler.FrmListenTasks.resources
+E:\Git\AUTS\AUTS_ServiceControler\obj\Debug\AUTS_SeviceControler.FrmMain.resources
+E:\Git\AUTS\AUTS_ServiceControler\obj\Debug\AUTS_SeviceControler.FrmSyncTasks.resources
+E:\Git\AUTS\AUTS_ServiceControler\obj\Debug\AUTS_SeviceControler.FrmTasksDbType.resources
+E:\Git\AUTS\AUTS_ServiceControler\obj\Debug\AUTS_SeviceControler.FrmUpdateConfig.resources
+E:\Git\AUTS\AUTS_ServiceControler\obj\Debug\AUTS_SeviceControler.Resources.resources
+E:\Git\AUTS\AUTS_ServiceControler\obj\Debug\AUTS_ServiceControler.vbproj.GenerateResource.cache
+E:\Git\AUTS\AUTS_ServiceControler\obj\Debug\AUTS_ServiceControler.vbproj.CoreCompileInputs.cache
+E:\Git\AUTS\AUTS_ServiceControler\obj\Debug\AUTS_SeviceControler.exe
+E:\Git\AUTS\AUTS_ServiceControler\obj\Debug\AUTS_SeviceControler.xml
+E:\Git\AUTS\AUTS_ServiceControler\obj\Debug\AUTS_SeviceControler.pdb
+E:\Git\AUTS\AUTS_ServiceControler\bin\Debug\AUTS_SeviceControler.exe.config
+E:\Git\AUTS\AUTS_ServiceControler\bin\Debug\AUTS_SeviceControler.exe
+E:\Git\AUTS\AUTS_ServiceControler\bin\Debug\AUTS_SeviceControler.pdb
+E:\Git\AUTS\AUTS_ServiceControler\bin\Debug\AUTS_SeviceControler.xml
+E:\Git\AUTS\AUTS_ServiceControler\bin\Debug\FluentFTP.dll
+E:\Git\AUTS\AUTS_ServiceControler\bin\Debug\System.CodeDom.dll
+E:\Git\AUTS\AUTS_ServiceControler\bin\Debug\UTS_Core.dll
+E:\Git\AUTS\AUTS_ServiceControler\bin\Debug\SharpCompress.dll
+E:\Git\AUTS\AUTS_ServiceControler\bin\Debug\Newtonsoft.Json.dll
+E:\Git\AUTS\AUTS_ServiceControler\bin\Debug\TeeChart.dll
+E:\Git\AUTS\AUTS_ServiceControler\bin\Debug\MySql.Data.dll
+E:\Git\AUTS\AUTS_ServiceControler\bin\Debug\System.Data.SQLite.dll
+E:\Git\AUTS\AUTS_ServiceControler\bin\Debug\System.Memory.dll
+E:\Git\AUTS\AUTS_ServiceControler\bin\Debug\System.Buffers.dll
+E:\Git\AUTS\AUTS_ServiceControler\bin\Debug\System.Text.Encoding.CodePages.dll
+E:\Git\AUTS\AUTS_ServiceControler\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll
+E:\Git\AUTS\AUTS_ServiceControler\bin\Debug\Google.Protobuf.dll
+E:\Git\AUTS\AUTS_ServiceControler\bin\Debug\Zstandard.Net.dll
+E:\Git\AUTS\AUTS_ServiceControler\bin\Debug\K4os.Compression.LZ4.Streams.dll
+E:\Git\AUTS\AUTS_ServiceControler\bin\Debug\BouncyCastle.Crypto.dll
+E:\Git\AUTS\AUTS_ServiceControler\bin\Debug\Ubiety.Dns.Core.dll
+E:\Git\AUTS\AUTS_ServiceControler\bin\Debug\System.Numerics.Vectors.dll
+E:\Git\AUTS\AUTS_ServiceControler\bin\Debug\K4os.Compression.LZ4.dll
+E:\Git\AUTS\AUTS_ServiceControler\bin\Debug\K4os.Hash.xxHash.dll
+E:\Git\AUTS\AUTS_ServiceControler\bin\Debug\UTS_Core.pdb
+E:\Git\AUTS\AUTS_ServiceControler\bin\Debug\UTS_Core.xml
+E:\Git\AUTS\AUTS_ServiceControler\bin\Debug\UTS_Core.dll.config
+E:\Git\AUTS\AUTS_ServiceControler\bin\Debug\System.CodeDom.xml
+E:\Git\AUTS\AUTS_ServiceControler\bin\Debug\Newtonsoft.Json.xml
+E:\Git\AUTS\AUTS_ServiceControler\bin\Debug\MySql.Data.xml
+E:\Git\AUTS\AUTS_ServiceControler\bin\Debug\System.Memory.xml
+E:\Git\AUTS\AUTS_ServiceControler\bin\Debug\System.Buffers.xml
+E:\Git\AUTS\AUTS_ServiceControler\bin\Debug\System.Text.Encoding.CodePages.xml
+E:\Git\AUTS\AUTS_ServiceControler\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml
+E:\Git\AUTS\AUTS_ServiceControler\bin\Debug\Google.Protobuf.pdb
+E:\Git\AUTS\AUTS_ServiceControler\bin\Debug\Google.Protobuf.xml
+E:\Git\AUTS\AUTS_ServiceControler\bin\Debug\K4os.Compression.LZ4.Streams.xml
+E:\Git\AUTS\AUTS_ServiceControler\bin\Debug\System.Numerics.Vectors.xml
+E:\Git\AUTS\AUTS_ServiceControler\bin\Debug\K4os.Compression.LZ4.xml
+E:\Git\AUTS\AUTS_ServiceControler\bin\Debug\K4os.Hash.xxHash.xml
+E:\Git\AUTS\AUTS_ServiceControler\obj\Debug\AUTS_ServiceControler.vbproj.CopyComplete

AUTS_ServiceControler/obj/Debug/AUTS_SeviceControler.xml

@@ -441,6 +441,9 @@ AUTS_SeviceControler
 <member name="F:AUTS_SeviceControler.FrmUpdateConfig._sync_auts_vendor_DirPath">
  <summary>同步目录：auts_vendor</summary>
 </member>
+<member name="F:AUTS_SeviceControler.FrmUpdateConfig._sync_auts_app_DirPath">
+ <summary>App：app</summary>
+</member>
 <member name="M:AUTS_SeviceControler.FrmUpdateConfig.CreateSystemFolder">
  <summary>
  创建运行时必要文件夹
@@ -456,7 +459,7 @@ AUTS_SeviceControler
  获取更新服务的最新信息
  </summary>
 </member>
-<member name="M:AUTS_SeviceControler.FrmUpdateConfig.InstallUpdateService">
+<member name="M:AUTS_SeviceControler.FrmUpdateConfig.InstallUpdateService(System.String)">
  <summary>
  一键更新
  </summary>
@@ -742,9 +745,10 @@ AUTS_SeviceControler
  </summary>
  <param name="licensePath">License文件完整路径(含文件名)</param>
 </member>
-<member name="M:AUTS_SeviceControler.ServiceRegister.RegisterService">
+<member name="M:AUTS_SeviceControler.ServiceRegister.RegisterService(System.String)">
  <summary>
  注册服务返回注册服务的索引
+ Momo 2024-04-05 Service ID 由 ProcessorID + AlisaName 构成，从Service Controller 传参传过来
  </summary>
 </member>
 <member name="P:AUTS_SeviceControler.UpdatePackageInfo.SoftwareID">