串口连接修复

ADP.sln

@@ -43,6 +43,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BenchMovementModule", "Benc
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CANModule", "CANModule\CANModule.csproj", "{AF2533DD-599D-49D7-942B-B0C26534D15F}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "加密狗", "加密狗\加密狗.csproj", "{A35CA316-7B5B-4183-8636-4ECA532B1489}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CurveModule", "CurveModule\CurveModule.csproj", "{84006890-9288-44C4-9D17-FA88F3FDECFA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExportModule", "ExportModule\ExportModule.csproj", "{8923122F-F7D3-4AE7-9E86-9E78F1296A11}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -125,6 +131,18 @@ Global
 		{AF2533DD-599D-49D7-942B-B0C26534D15F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AF2533DD-599D-49D7-942B-B0C26534D15F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AF2533DD-599D-49D7-942B-B0C26534D15F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A35CA316-7B5B-4183-8636-4ECA532B1489}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A35CA316-7B5B-4183-8636-4ECA532B1489}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A35CA316-7B5B-4183-8636-4ECA532B1489}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A35CA316-7B5B-4183-8636-4ECA532B1489}.Release|Any CPU.Build.0 = Release|Any CPU
+		{84006890-9288-44C4-9D17-FA88F3FDECFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{84006890-9288-44C4-9D17-FA88F3FDECFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{84006890-9288-44C4-9D17-FA88F3FDECFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{84006890-9288-44C4-9D17-FA88F3FDECFA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8923122F-F7D3-4AE7-9E86-9E78F1296A11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8923122F-F7D3-4AE7-9E86-9E78F1296A11}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8923122F-F7D3-4AE7-9E86-9E78F1296A11}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8923122F-F7D3-4AE7-9E86-9E78F1296A11}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -139,5 +157,7 @@ Global
 		{170AD4C1-189D-4FBE-B10D-2A4304527834} = {1E92D601-68FC-45F6-8251-BD0F39226E5B}
 		{31F84D0E-3634-4C70-A830-21AF412E3BBF} = {1E92D601-68FC-45F6-8251-BD0F39226E5B}
 		{AF2533DD-599D-49D7-942B-B0C26534D15F} = {1E92D601-68FC-45F6-8251-BD0F39226E5B}
+		{84006890-9288-44C4-9D17-FA88F3FDECFA} = {1E92D601-68FC-45F6-8251-BD0F39226E5B}
+		{8923122F-F7D3-4AE7-9E86-9E78F1296A11} = {1E92D601-68FC-45F6-8251-BD0F39226E5B}
 	EndGlobalSection
 EndGlobal

ADP/ADP.csproj

@@ -22,8 +22,10 @@
     <ProjectReference Include="..\BenchMovementModule\BenchMovementModule.csproj" />
     <ProjectReference Include="..\CANModule\CANModule.csproj" />
     <ProjectReference Include="..\Command\Command.csproj" />
+    <ProjectReference Include="..\CurveModule\CurveModule.csproj" />
     <ProjectReference Include="..\DeviceCommand\DeviceCommand.csproj" />
     <ProjectReference Include="..\DeviceEditModule\DeviceEditModule.csproj" />
+    <ProjectReference Include="..\ExportModule\ExportModule.csproj" />
     <ProjectReference Include="..\LoginModule\LoginModule.csproj" />
     <ProjectReference Include="..\MainModule\MainModule.csproj" />
     <ProjectReference Include="..\MonitorModule\MonitorModule.csproj" />
@@ -33,6 +35,7 @@
     <ProjectReference Include="..\UIShare\UIShare.csproj" />
     <ProjectReference Include="..\UpdateInfoMoudle\UpdateInfoMoudle.csproj" />
     <ProjectReference Include="..\ZLGUSBCANFD\ZLGUSBCANFD.csproj" />
+    <ProjectReference Include="..\加密狗\加密狗.csproj" />
   </ItemGroup>
 
   <ItemGroup>

ADP/App.xaml.cs

@@ -18,11 +18,12 @@ using static System.Runtime.InteropServices.JavaScript.JSType;
 using UIShare.GlobalVariable;
 using UIShare;
 using System;
-using DeviceCommand.Device;
+using DeviceCommand.Devices;
 using DeviceCommand.Base;
 using AutoMapper;
 using Microsoft.Extensions.Logging.Abstractions;
 using ADP.Profiles;
+using 加密狗;
 
 namespace ADP
 {
@@ -75,6 +76,52 @@ namespace ADP
             RegionManager.SetRegionManager(Application.Current.MainWindow, re);
             login.Show();
         }
+        protected override void OnStartup(StartupEventArgs e)
+        {
+            if (System.Diagnostics.Debugger.IsAttached)
+            {
+                base.OnStartup(e);
+                return;
+            }
+
+            string strUserSn = "ACA89B2C1194650D4E93D97BE189FFCC";
+            string strApiKey = "C6D01BCD442347822876F8232245DE9422643C167B8C61CE4DF6049990E7395588675A8FC6AA4BF7AD353D669C993236BEA83F77551753885A47AF34185CC3A7";
+
+            Byte[] buffer = new Byte[256];
+            buffer = System.Text.Encoding.Default.GetBytes(strUserSn);
+            uint retcode;
+            retcode = 加密狗驱动类.验证加密狗SN(buffer);
+            if (retcode != 0)
+            {
+                MessageBox.Show(string.Format("设置UserSN失败 error code: 0x{0:x}", retcode));
+                return;
+            }
+
+            uint count = 0;
+            retcode = 加密狗API类.VikeyFind(ref count);
+            if (retcode != 0 || count == 0)
+            {
+                MessageBox.Show("未找到加密狗");
+                return;
+            }
+
+            buffer = System.Text.Encoding.Default.GetBytes(strApiKey);
+            retcode = 加密狗驱动类.验证加密狗APIkey(0, buffer);
+            if (retcode != 0)
+            {
+                MessageBox.Show(string.Format("设置api密钥失败 error code: 0x{0:x}", retcode));
+                return;
+            }
+
+            var remaining = 加密狗驱动类.检查剩余时间(0);
+            if (remaining <= TimeSpan.Zero)
+            {
+                MessageBox.Show("加密狗已到期或未能读取时间，请联系供应商。", "加密狗验证失败", MessageBoxButton.OK, MessageBoxImage.Error);
+                return;
+            }
+
+            base.OnStartup(e);
+        }
         protected override void RegisterRequiredTypes(IContainerRegistry containerRegistry)
         {
             base.RegisterRequiredTypes(containerRegistry);
@@ -104,6 +151,7 @@ namespace ADP
             containerRegistry.RegisterScoped(typeof(SqlSugarRepository<>));
             //注册服务
             containerRegistry.Register<IMonitorValueService, MonitorValueService>();
+            containerRegistry.Register<ITestReportService, TestReportService>();
         }
         //指定模块加载方式(需要手动将模块生成的dll放入Modules文件夹中)
         protected override IModuleCatalog CreateModuleCatalog()

ADP/ViewModels/Dialogs/MessageBoxViewModel.cs

@@ -1,6 +1,7 @@
 using UIShare.PubEvent;
 using UIShare.ViewModelBase;
 using System.Windows.Input;
+using System.Windows.Media;
 
 namespace ADP.ViewModels.Dialogs
 {
@@ -22,8 +23,8 @@ namespace ADP.ViewModels.Dialogs
             set => SetProperty(ref _Message, value);
         }
 
-        private string _Icon= $"pack://siteoforigin:,,,/Resources/Images/info.png";
-        public string Icon
+        private ImageSource _Icon = new System.Windows.Media.Imaging.BitmapImage(new System.Uri("pack://application:,,,/Images/info.png"));
+        public ImageSource Icon
         {
             get => _Icon;
             set => SetProperty(ref _Icon, value);
@@ -101,13 +102,15 @@ namespace ADP.ViewModels.Dialogs
             Title = parameters.GetValue<string>("Title");
             Message = parameters.GetValue<string>("Message");
             var iconKey = parameters.GetValue<string>("Icon"); // info / error / warn
-            Icon = iconKey switch
+            var bmp = (ImageSource)new System.Windows.Media.Imaging.BitmapImage(new System.Uri(iconKey switch
             {
-                "info" => $"pack://siteoforigin:,,,/Resources/Images/info.png",
-                "error" => $"pack://siteoforigin:,,,/Resources/Images/error.png",
-                "warn" => $"pack://siteoforigin:,,,/Resources/Images/warning.png",
-                _ => $"pack://siteoforigin:,,,/Resources/Images/info.png"  // 默认
-            }; 
+                "info"  => "pack://application:,,,/Images/info.png",
+                "error" => "pack://application:,,,/Images/error.png",
+                "warn"  => "pack://application:,,,/Images/warning.png",
+                _       => "pack://application:,,,/Images/info.png"
+            }));
+            bmp.Freeze();
+            Icon = bmp;
 
 
             ShowYes = parameters.GetValue<bool>("ShowYes");

ADP/ViewModels/ShellViewModel.cs

@@ -1,5 +1,5 @@
 
-using DeviceCommand.Device;
+using DeviceCommand.Devices;
 using Logger;
 using MaterialDesignThemes.Wpf;
 using Microsoft.Win32;
@@ -12,12 +12,12 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Threading; // 💡 新增：引入定时器命名空间
+using System.Windows.Threading; 
 using UIShare;
 using UIShare.GlobalVariable;
 using UIShare.PubEvent;
 using UIShare.UIViewModel;
-using ZLGUSBCANFD;
+using SqlSugar;
 
 namespace ADP.ViewModels
 {
@@ -567,7 +567,7 @@ namespace ADP.ViewModels
             ScopedContext? targetContext = CurrentContext;
 
             if (runningScope == "default" || string.IsNullOrEmpty(runningScope) || targetContext == null) return;
-
+            CurrentConfig.CurrentADPFile = "新建ADP文件";
             // 💡 2. 严格对快照隔离的 Context 数据进行清理，不影响其他工位
             targetContext.CurrentFilePath = null;
             targetContext.Program.Parameters.Clear();
@@ -631,7 +631,7 @@ namespace ADP.ViewModels
                     LoggerHelper.WarnWithNotify(runningScope, $"文件格式不正确或为空: {filePath}"); 
                     return;
                 }
-
+                CurrentConfig.CurrentADPFile = filePath;
                 // 💡 2. 严格赋值给快照锁定下的当前工位上下文，实现数据完全隔离
                 targetContext.Program.Parameters = program.Parameters;
                 targetContext.Program.StepCollection = program.StepCollection;
@@ -691,6 +691,7 @@ namespace ADP.ViewModels
             if (saveFileDialog.ShowDialog() == true)
             {
                 // 💡 2. 将新路径安全写入快照工位
+                CurrentConfig.CurrentADPFile = saveFileDialog.FileName;
                 targetContext.CurrentFilePath = saveFileDialog.FileName;
 
                 // 💡 3. 调用你的底层文件保存逻辑，传入快照工位的 Program 模型
@@ -844,6 +845,14 @@ namespace ADP.ViewModels
                     if (_globalInfo.CurrentScope != "default") return;
                     _regionManager.RequestNavigate("ShellViewManager", "BenchMovementView");
                     break;
+                case "曲线回读界面":
+                    if (_globalInfo.CurrentScope != "default") return;
+                    _regionManager.RequestNavigate("ShellViewManager", "CurveRecallView");
+                    break;  
+                case "测试报告导出界面":
+                    if (_globalInfo.CurrentScope != "default") return;
+                    _regionManager.RequestNavigate("ShellViewManager", "ExportView");
+                    break;
             }
         }
 

ADP/Views/ShellView.xaml

@@ -66,6 +66,16 @@
                         CommandParameter="{Binding Content, RelativeSource={RelativeSource Self}}"
                         Style="{StaticResource MaterialDesignFlatButton}"
                         Margin="8" />
+                <Button Content="曲线回读界面"
+                        Command="{Binding NavigateCommand}"
+                        CommandParameter="{Binding Content, RelativeSource={RelativeSource Self}}"
+                        Style="{StaticResource MaterialDesignFlatButton}"
+                        Margin="8" />
+                <Button Content="测试报告导出界面"
+                        Command="{Binding NavigateCommand}"
+                        CommandParameter="{Binding Content, RelativeSource={RelativeSource Self}}"
+                        Style="{StaticResource MaterialDesignFlatButton}"
+                        Margin="8" />
             </StackPanel>
         </materialDesign:DrawerHost.LeftDrawerContent>
         <Grid>
@@ -184,6 +194,7 @@ Command="{Binding SelectCANMessageCommand}">
                        Foreground="Black" />
                                 </MenuItem.Icon>
                             </MenuItem>
+                           
                             <!-- 获得文件路径字符串 -->
                             <MenuItem Header="获得文件路径字符串"
 Foreground="Black"

BenchMovementModule/ViewModels/BenchMovementViewModel.cs

@@ -1,411 +1,520 @@
 using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using System.Windows.Input;
+using System.Windows.Threading;
+using DeviceCommand.Devices;
+using Logger;
+using Prism.Ioc;
+using UIShare.GlobalVariable;
 using UIShare.ViewModelBase;
 
 namespace BenchMovementModule.ViewModels
 {
     public class BenchMovementViewModel : NavigateViewModelBase, IRegionMemberLifetime, IDisposable
     {
-        #region 属性与通知字段
+        #region 属性
 
         public bool KeepAlive => true;
 
-        // --- 1. 台架位置区 ---
-        private double _posX;
-        public double PosX
+        // ===== GantryControlTcp 实例（从 DeviceManager 获取）=====
+        private GantryControlTcp? _gantry;
+        private DeviceManager? _deviceManager;
+        private readonly GlobalInfo _globalInfo;
+
+        // ===== 连接状态 =====
+        private bool _isConnected;
+        public bool IsConnected
         {
-            get => _posX;
-            set => SetProperty(ref _posX, value);
+            get => _isConnected;
+            set => SetProperty(ref _isConnected, value);
         }
 
-        private double _posY;
-        public double PosY
+        private string _connectionStatus = "未连接";
+        public string ConnectionStatus
         {
-            get => _posY;
-            set => SetProperty(ref _posY, value);
+            get => _connectionStatus;
+            set => SetProperty(ref _connectionStatus, value);
         }
 
-        private double _posZ;
-        public double PosZ
-        {
-            get => _posZ;
-            set => SetProperty(ref _posZ, value);
-        }
+        // ===== 6轴绝对位置显示（相对原点的实时位置，只读）=====
+        private int _absPos1;
+        public int AbsPos1 { get => _absPos1; set => SetProperty(ref _absPos1, value); }
 
-        // --- 2. 信号回读区 ---
-        private double _pos1X;
-        public double Pos1X
-        {
-            get => _pos1X;
-            set => SetProperty(ref _pos1X, value);
-        }
+        private int _absPos2;
+        public int AbsPos2 { get => _absPos2; set => SetProperty(ref _absPos2, value); }
 
-        private int _pos1Quality;
-        public int Pos1Quality
-        {
-            get => _pos1Quality;
-            set => SetProperty(ref _pos1Quality, value);
-        }
+        private int _absPos3;
+        public int AbsPos3 { get => _absPos3; set => SetProperty(ref _absPos3, value); }
 
-        private double _pos2X;
-        public double Pos2X
-        {
-            get => _pos2X;
-            set => SetProperty(ref _pos2X, value);
-        }
+        private int _absPos4;
+        public int AbsPos4 { get => _absPos4; set => SetProperty(ref _absPos4, value); }
 
-        private int _pos2Quality;
-        public int Pos2Quality
-        {
-            get => _pos2Quality;
-            set => SetProperty(ref _pos2Quality, value);
-        }
+        private int _absPos5;
+        public int AbsPos5 { get => _absPos5; set => SetProperty(ref _absPos5, value); }
 
-        private double _pos1Y;
-        public double Pos1Y
-        {
-            get => _pos1Y;
-            set => SetProperty(ref _pos1Y, value);
-        }
+        private int _absPos6;
+        public int AbsPos6 { get => _absPos6; set => SetProperty(ref _absPos6, value); }
 
-        private double _pos2Y;
-        public double Pos2Y
-        {
-            get => _pos2Y;
-            set => SetProperty(ref _pos2Y, value);
-        }
+        // ===== 寸动目标位置 =====
+        private int _targetX;
+        public int TargetX { get => _targetX; set => SetProperty(ref _targetX, value); }
 
-        // --- 3. 扫描参数区 ---
-        private double _scanStepX = 10;
-        public double ScanStepX
-        {
-            get => _scanStepX;
-            set => SetProperty(ref _scanStepX, value);
-        }
+        private int _targetY;
+        public int TargetY { get => _targetY; set => SetProperty(ref _targetY, value); }
 
-        private double _scanStartX = -120;
-        public double ScanStartX
-        {
-            get => _scanStartX;
-            set => SetProperty(ref _scanStartX, value);
-        }
+        private int _targetZ;
+        public int TargetZ { get => _targetZ; set => SetProperty(ref _targetZ, value); }
 
-        private double _scanEndX = 120;
-        public double ScanEndX
-        {
-            get => _scanEndX;
-            set => SetProperty(ref _scanEndX, value);
-        }
+        // ===== 扫描参数 =====
+        private int _scanStepX = 1000;
+        public int ScanStepX { get => _scanStepX; set => SetProperty(ref _scanStepX, value); }
 
-        private double _scanStepY = 10;
-        public double ScanStepY
-        {
-            get => _scanStepY;
-            set => SetProperty(ref _scanStepY, value);
-        }
+        private int _scanStartX;
+        public int ScanStartX { get => _scanStartX; set => SetProperty(ref _scanStartX, value); }
 
-        private double _scanStartY = -120;
-        public double ScanStartY
-        {
-            get => _scanStartY;
-            set => SetProperty(ref _scanStartY, value);
-        }
+        private int _scanEndX = 50000;
+        public int ScanEndX { get => _scanEndX; set => SetProperty(ref _scanEndX, value); }
 
-        private double _scanEndY = 120;
-        public double ScanEndY
-        {
-            get => _scanEndY;
-            set => SetProperty(ref _scanEndY, value);
-        }
+        private int _scanStepY = 1000;
+        public int ScanStepY { get => _scanStepY; set => SetProperty(ref _scanStepY, value); }
 
-        private double _scanStepZ = 1;
-        public double ScanStepZ
-        {
-            get => _scanStepZ;
-            set => SetProperty(ref _scanStepZ, value);
-        }
+        private int _scanStartY;
+        public int ScanStartY { get => _scanStartY; set => SetProperty(ref _scanStartY, value); }
 
-        private double _scanStartZ = 0;
-        public double ScanStartZ
-        {
-            get => _scanStartZ;
-            set => SetProperty(ref _scanStartZ, value);
-        }
+        private int _scanEndY = 50000;
+        public int ScanEndY { get => _scanEndY; set => SetProperty(ref _scanEndY, value); }
 
-        private double _scanEndZ = 0;
-        public double ScanEndZ
-        {
-            get => _scanEndZ;
-            set => SetProperty(ref _scanEndZ, value);
-        }
+        private int _scanStepZ = 100;
+        public int ScanStepZ { get => _scanStepZ; set => SetProperty(ref _scanStepZ, value); }
 
-        // --- 4. 寸动参数区 ---
-        private double _jogX;
-        public double JogX
-        {
-            get => _jogX;
-            set => SetProperty(ref _jogX, value);
-        }
+        private int _scanStartZ;
+        public int ScanStartZ { get => _scanStartZ; set => SetProperty(ref _scanStartZ, value); }
 
-        private double _jogY;
-        public double JogY
-        {
-            get => _jogY;
-            set => SetProperty(ref _jogY, value);
-        }
+        private int _scanEndZ = 20000;
+        public int ScanEndZ { get => _scanEndZ; set => SetProperty(ref _scanEndZ, value); }
 
-        private double _jogZ;
-        public double JogZ
-        {
-            get => _jogZ;
-            set => SetProperty(ref _jogZ, value);
-        }
+        // ===== 速度设定（脉冲）=====
+        private int _speedX = 5000;
+        public int SpeedX { get => _speedX; set => SetProperty(ref _speedX, value); }
 
-        // --- 5. 设置页：网络及PLC参数 ---
-        private string _plcIp = "192.168.0.30";
-        public string PlcIp
-        {
-            get => _plcIp;
-            set => SetProperty(ref _plcIp, value);
-        }
+        private int _speedY = 5000;
+        public int SpeedY { get => _speedY; set => SetProperty(ref _speedY, value); }
 
-        private int _plcPort = 502;
-        public int PlcPort
-        {
-            get => _plcPort;
-            set => SetProperty(ref _plcPort, value);
-        }
+        private int _speedZ = 2000;
+        public int SpeedZ { get => _speedZ; set => SetProperty(ref _speedZ, value); }
 
-        // --- 6. 设置页：速度与零点设定 ---
-        private double _speedX;
-        public double SpeedX
-        {
-            get => _speedX;
-            set => SetProperty(ref _speedX, value);
-        }
+        private int _homeSpeed = 3000;
+        public int HomeSpeed { get => _homeSpeed; set => SetProperty(ref _homeSpeed, value); }
 
-        private double _speedY;
-        public double SpeedY
-        {
-            get => _speedY;
-            set => SetProperty(ref _speedY, value);
-        }
+        // ===== 零点设定 =====
+        private int _homeX;
+        public int HomeX { get => _homeX; set => SetProperty(ref _homeX, value); }
 
-        private double _speedZ;
-        public double SpeedZ
-        {
-            get => _speedZ;
-            set => SetProperty(ref _speedZ, value);
-        }
+        private int _homeY;
+        public int HomeY { get => _homeY; set => SetProperty(ref _homeY, value); }
 
-        private double _zeroX;
-        public double ZeroX
-        {
-            get => _zeroX;
-            set => SetProperty(ref _zeroX, value);
-        }
-
-        private double _zeroY;
-        public double ZeroY
-        {
-            get => _zeroY;
-            set => SetProperty(ref _zeroY, value);
-        }
-
-        private double _zeroZ;
-        public double ZeroZ
-        {
-            get => _zeroZ;
-            set => SetProperty(ref _zeroZ, value);
-        }
-
-        // --- 7. 设置页：CAN设定信号映射 ---
-        private int _canChannel = 0;
-        public int CanChannel
-        {
-            get => _canChannel;
-            set => SetProperty(ref _canChannel, value);
-        }
-
-        private string _canMsgId = "0X0";
-        public string CanMsgId
-        {
-            get => _canMsgId;
-            set => SetProperty(ref _canMsgId, value);
-        }
-
-        private string _canMsgName = string.Empty;
-        public string CanMsgName
-        {
-            get => _canMsgName;
-            set => SetProperty(ref _canMsgName, value);
-        }
-
-        private string _sigPos1X = string.Empty;
-        public string SigPos1X
-        {
-            get => _sigPos1X;
-            set => SetProperty(ref _sigPos1X, value);
-        }
-
-        private string _sigPos2X = string.Empty;
-        public string SigPos2X
-        {
-            get => _sigPos2X;
-            set => SetProperty(ref _sigPos2X, value);
-        }
-
-        private string _sigPos1Y = string.Empty;
-        public string SigPos1Y
-        {
-            get => _sigPos1Y;
-            set => SetProperty(ref _sigPos1Y, value);
-        }
-
-        private string _sigPos2Y = string.Empty;
-        public string SigPos2Y
-        {
-            get => _sigPos2Y;
-            set => SetProperty(ref _sigPos2Y, value);
-        }
-
-        private string _sigPos1Quality = string.Empty;
-        public string SigPos1Quality
-        {
-            get => _sigPos1Quality;
-            set => SetProperty(ref _sigPos1Quality, value);
-        }
-
-        private string _sigPos2Quality = string.Empty;
-        public string SigPos2Quality
-        {
-            get => _sigPos2Quality;
-            set => SetProperty(ref _sigPos2Quality, value);
-        }
+        private int _homeZ;
+        public int HomeZ { get => _homeZ; set => SetProperty(ref _homeZ, value); }
 
         #endregion
 
         #region 命令
-        // 扫描控制面板命令
-        public ICommand StartScanCommand { get; }
-        public ICommand StopScanCommand { get; }
-        public ICommand GoHomeCommand { get; }
-
-        // 寸动执行单轴移动
+        public ICommand ConnectCommand { get; }
+        public ICommand DisconnectCommand { get; }
         public ICommand MoveXCommand { get; }
         public ICommand MoveYCommand { get; }
         public ICommand MoveZCommand { get; }
-
-        // 全局控制
+        public ICommand MoveAllCommand { get; }
+        public ICommand GoHomeCommand { get; }
         public ICommand EmergencyStopCommand { get; }
-
-        // 参数设置应用命令
-        public ICommand ApplyNetworkCommand { get; }
+        public ICommand StopXCommand { get; }
+        public ICommand StopYCommand { get; }
+        public ICommand StopZCommand { get; }
         public ICommand SetSpeedCommand { get; }
-        public ICommand SetZeroCommand { get; }
+        public ICommand SetHomeCommand { get; }
+        public ICommand ReadStatusCommand { get; }
         #endregion
 
         #region 私有字段
-        private readonly IContainerProvider _containerProvider;
+        private readonly DispatcherTimer _pollTimer;
         private bool _isInitiated = false;
-        private string _testStatus = string.Empty;
         #endregion
 
         public BenchMovementViewModel(IContainerProvider containerProvider) : base(containerProvider)
         {
-            _containerProvider = containerProvider;
-
-            // 初始化扫描控制命令绑定
-            StartScanCommand = new DelegateCommand(OnStartScan);
-            StopScanCommand = new DelegateCommand(OnStopScan);
-            GoHomeCommand = new DelegateCommand(OnGoHome);
-
-            // 初始化寸动命令绑定
+            _globalInfo = containerProvider.Resolve<GlobalInfo>();
+            ConnectCommand = new DelegateCommand(OnConnect);
+            DisconnectCommand = new DelegateCommand(OnDisconnect);
             MoveXCommand = new DelegateCommand(OnMoveX);
             MoveYCommand = new DelegateCommand(OnMoveY);
             MoveZCommand = new DelegateCommand(OnMoveZ);
-
-            // 急停与设置保存
+            MoveAllCommand = new DelegateCommand(OnMoveAll);
+            GoHomeCommand = new DelegateCommand(OnGoHome);
             EmergencyStopCommand = new DelegateCommand(OnEmergencyStop);
-            ApplyNetworkCommand = new DelegateCommand(OnApplyNetwork);
+            StopXCommand = new DelegateCommand(OnStopX);
+            StopYCommand = new DelegateCommand(OnStopY);
+            StopZCommand = new DelegateCommand(OnStopZ);
             SetSpeedCommand = new DelegateCommand(OnSetSpeed);
-            SetZeroCommand = new DelegateCommand(OnSetZero);
+            SetHomeCommand = new DelegateCommand(OnSetHome);
+            ReadStatusCommand = new DelegateCommand(OnReadStatus);
+
+            // 位置轮询定时器（500ms）
+            _pollTimer = new DispatcherTimer(DispatcherPriority.Background)
+            {
+                Interval = TimeSpan.FromMilliseconds(500)
+            };
+            _pollTimer.Tick += OnPollTick;
         }
 
-        #region 命令处理方法
+        #region 命令处理
 
-        private void OnStartScan()
+        private async void OnConnect()
         {
-            // TODO: 等协议到了处理开始扫描
+            if (_gantry == null) return;
+            try
+            {
+                ConnectionStatus = "连接中...";
+                bool ok = await _gantry.ConnectAsync();
+                if (ok)
+                {
+                    IsConnected = true;
+                    ConnectionStatus = "已连接";
+                    _pollTimer.Start();
+                    await ReadDeviceParametersAsync();
+                    LoggerHelper.Info("[BenchMovement] 台架连接成功");
+                }
+                else
+                {
+                    ConnectionStatus = "连接失败";
+                }
+            }
+            catch (Exception ex)
+            {
+                LoggerHelper.Error($"[BenchMovement] 连接失败: {ex.Message}");
+                ConnectionStatus = $"连接失败: {ex.Message}";
+            }
+            UpdateConnectionStatus();
         }
 
-        private void OnStopScan()
+        private void OnDisconnect()
         {
-            // TODO: 等协议到了处理停止扫描
+            if (_gantry == null) return;
+            try
+            {
+                _pollTimer.Stop();
+                _gantry.Close();
+                IsConnected = false;
+                ConnectionStatus = "未连接";
+                LoggerHelper.Info("[BenchMovement] 台架已断开");
+            }
+            catch (Exception ex)
+            {
+                LoggerHelper.Error($"[BenchMovement] 断开失败: {ex.Message}");
+            }
+            UpdateConnectionStatus();
         }
 
-        private void OnGoHome()
+        private async void OnMoveX()
         {
-            // TODO: 等协议到了处理台架回原点逻辑
+            if (!EnsureConnected()) return;
+            try
+            {
+                await _gantry!.SetAxisTargetPositionAsync(1, TargetX);
+                await _gantry.StartSingleAxisAsync(1);
+                LoggerHelper.Info($"[BenchMovement] X轴移动到 {TargetX}");
+            }
+            catch (Exception ex)
+            {
+                LoggerHelper.Error($"[BenchMovement] X轴移动失败: {ex.Message}");
+                ShowErrorMessageBox($"X轴移动失败: {ex.Message}", () => { });
+            }
         }
 
-        private void OnMoveX()
+        private async void OnMoveY()
         {
-            // TODO: 执行单轴X向绝对位置寸动
+            if (!EnsureConnected()) return;
+            try
+            {
+                await _gantry!.SetAxisTargetPositionAsync(2, TargetY);
+                await _gantry.StartSingleAxisAsync(2);
+                LoggerHelper.Info($"[BenchMovement] Y轴移动到 {TargetY}");
+            }
+            catch (Exception ex)
+            {
+                LoggerHelper.Error($"[BenchMovement] Y轴移动失败: {ex.Message}");
+                ShowErrorMessageBox($"Y轴移动失败: {ex.Message}", () => { });
+            }
         }
 
-        private void OnMoveY()
+        private async void OnMoveZ()
         {
-            // TODO: 执行单轴Y向绝对位置寸动
+            if (!EnsureConnected()) return;
+            try
+            {
+                await _gantry!.SetAxisTargetPositionAsync(3, TargetZ);
+                await _gantry.StartSingleAxisAsync(3);
+                LoggerHelper.Info($"[BenchMovement] Z轴移动到 {TargetZ}");
+            }
+            catch (Exception ex)
+            {
+                LoggerHelper.Error($"[BenchMovement] Z轴移动失败: {ex.Message}");
+                ShowErrorMessageBox($"Z轴移动失败: {ex.Message}", () => { });
+            }
         }
 
-        private void OnMoveZ()
+        private async void OnMoveAll()
         {
-            // TODO: 执行单轴Z向绝对位置寸动
+            if (!EnsureConnected()) return;
+            try
+            {
+                await _gantry!.SetAxisTargetPositionAsync(1, TargetX);
+                await _gantry.SetAxisTargetPositionAsync(2, TargetY);
+                await _gantry.SetAxisTargetPositionAsync(3, TargetZ);
+                await _gantry.StartAllAxesAsync();
+                LoggerHelper.Info($"[BenchMovement] 三轴同时移动: X={TargetX}, Y={TargetY}, Z={TargetZ}");
+            }
+            catch (Exception ex)
+            {
+                LoggerHelper.Error($"[BenchMovement] 三轴移动失败: {ex.Message}");
+                ShowErrorMessageBox($"三轴移动失败: {ex.Message}", () => { });
+            }
         }
 
-        private void OnEmergencyStop()
+        private async void OnGoHome()
         {
-            // TODO: 全局急停高优先级报文/IO发送
+            if (!EnsureConnected()) return;
+            try
+            {
+                await _gantry!.HomeAsync();
+                LoggerHelper.Info("[BenchMovement] 回原点已触发");
+            }
+            catch (Exception ex)
+            {
+                LoggerHelper.Error($"[BenchMovement] 回原点失败: {ex.Message}");
+                ShowErrorMessageBox($"回原点失败: {ex.Message}", () => { });
+            }
         }
 
-        private void OnApplyNetwork()
+        private async void OnEmergencyStop()
         {
-            // TODO: 应用PLC的IP和端口网络连接配置
+            if (!EnsureConnected()) return;
+            try
+            {
+                await _gantry!.SetEStopStateAsync(true);
+                LoggerHelper.Info("[BenchMovement] 急停已触发");
+            }
+            catch (Exception ex)
+            {
+                LoggerHelper.Error($"[BenchMovement] 急停失败: {ex.Message}");
+            }
         }
 
-        private void OnSetSpeed()
+        private async void OnStopX()
         {
-            // TODO: 发送三轴移动速度设定参数
+            if (!EnsureConnected()) return;
+            try
+            {
+                await _gantry!.SetStopStateAsync(1, true);
+                await Task.Delay(100);
+                await _gantry.SetStopStateAsync(1, false);
+            }
+            catch (Exception ex)
+            {
+                LoggerHelper.Error($"[BenchMovement] X轴停止失败: {ex.Message}");
+            }
         }
 
-        private void OnSetZero()
+        private async void OnStopY()
         {
-            // TODO: 发送台架绝对位置零点校准设定
+            if (!EnsureConnected()) return;
+            try
+            {
+                await _gantry!.SetStopStateAsync(2, true);
+                await Task.Delay(100);
+                await _gantry.SetStopStateAsync(2, false);
+            }
+            catch (Exception ex)
+            {
+                LoggerHelper.Error($"[BenchMovement] Y轴停止失败: {ex.Message}");
+            }
+        }
+
+        private async void OnStopZ()
+        {
+            if (!EnsureConnected()) return;
+            try
+            {
+                await _gantry!.SetStopStateAsync(3, true);
+                await Task.Delay(100);
+                await _gantry.SetStopStateAsync(3, false);
+            }
+            catch (Exception ex)
+            {
+                LoggerHelper.Error($"[BenchMovement] Z轴停止失败: {ex.Message}");
+            }
+        }
+
+        private async void OnSetSpeed()
+        {
+            if (!EnsureConnected()) return;
+            try
+            {
+                await _gantry!.SetAxisSpeedAsync(1, SpeedX);
+                await _gantry.SetAxisSpeedAsync(2, SpeedY);
+                await _gantry.SetAxisSpeedAsync(3, SpeedZ);
+                await _gantry.SetHomePositionSpeedAsync(HomeSpeed);
+                LoggerHelper.Info($"[BenchMovement] 速度设定完成: X={SpeedX}, Y={SpeedY}, Z={SpeedZ}, 回零={HomeSpeed}");
+            }
+            catch (Exception ex)
+            {
+                LoggerHelper.Error($"[BenchMovement] 速度设定失败: {ex.Message}");
+                ShowErrorMessageBox($"速度设定失败: {ex.Message}", () => { });
+            }
+        }
+
+        private async void OnSetHome()
+        {
+            if (!EnsureConnected()) return;
+            try
+            {
+                await _gantry!.SetHomePositionAsync(HomeX, HomeY, HomeZ);
+                LoggerHelper.Info($"[BenchMovement] 零点设定完成: X={HomeX}, Y={HomeY}, Z={HomeZ}");
+            }
+            catch (Exception ex)
+            {
+                LoggerHelper.Error($"[BenchMovement] 零点设定失败: {ex.Message}");
+                ShowErrorMessageBox($"零点设定失败: {ex.Message}", () => { });
+            }
+        }
+
+        private async void OnReadStatus()
+        {
+            await ReadDeviceParametersAsync();
         }
 
         #endregion
 
-        #region 重写方法与生命周期导航
+        #region 辅助方法
+
+        private bool EnsureConnected()
+        {
+            if (_gantry == null || !_gantry.IsConnected)
+            {
+                ShowErrorMessageBox("设备未连接，请先连接台架", () => { });
+                return false;
+            }
+            return true;
+        }
+
+        private void UpdateConnectionStatus()
+        {
+            IsConnected = _gantry?.IsConnected ?? false;
+            ConnectionStatus = IsConnected ? "已连接" : "未连接";
+        }
+
+        private async Task ReadDeviceParametersAsync()
+        {
+            if (_gantry == null || !_gantry.IsConnected) return;
+            try
+            {
+                var (x, y, z) = await _gantry.GetHomePositionAsync();
+                HomeX = x; HomeY = y; HomeZ = z;
+
+                SpeedX = await _gantry.GetAxisSpeedAsync(1);
+                SpeedY = await _gantry.GetAxisSpeedAsync(2);
+                SpeedZ = await _gantry.GetAxisSpeedAsync(3);
+                HomeSpeed = await _gantry.GetHomePositionSpeedAsync();
+
+                // 读取 6 轴绝对位置
+                var positions = await _gantry.GetAllAbsolutePositionsAsync();
+                AbsPos1 = positions.Axis1; AbsPos2 = positions.Axis2; AbsPos3 = positions.Axis3;
+                AbsPos4 = positions.Axis4; AbsPos5 = positions.Axis5; AbsPos6 = positions.Axis6;
+            }
+            catch (Exception ex)
+            {
+                LoggerHelper.Error($"[BenchMovement] 读取设备参数失败: {ex.Message}");
+            }
+        }
+
+        private async void OnPollTick(object? sender, EventArgs e)
+        {
+            if (_gantry == null || !_gantry.IsConnected) return;
+            try
+            {
+                // 批量读取 6 轴绝对位置（一次性通信，高效）
+                var pos = await _gantry.GetAllAbsolutePositionsAsync();
+                AbsPos1 = pos.Axis1; AbsPos2 = pos.Axis2; AbsPos3 = pos.Axis3;
+                AbsPos4 = pos.Axis4; AbsPos5 = pos.Axis5; AbsPos6 = pos.Axis6;
+            }
+            catch { /* 忽略轮询错误 */ }
+        }
+
+        #endregion
+
+        #region 生命周期
 
         public override void OnNavigatedTo(NavigationContext navigationContext)
         {
             base.OnNavigatedTo(navigationContext);
-
-            if (!_isInitiated && navigationContext.Parameters.ContainsKey("Name"))
+            if (!_isInitiated)
             {
-                _testStatus = navigationContext.Parameters.GetValue<string>("Name");
-
-                // TODO: 若后续需要从全局环境 Scope 字典中加载参数配置，可以在此处对齐获取：
-                // var scope = _globalInfo.ScopeDic[_testStatus];
-
                 _isInitiated = true;
+                InitGantryFromDeviceManager();
+            }
+        }
+
+        /// <summary>
+        /// 从 DeviceManager.DeviceMap 中查找 GantryControlTcp 实例，
+        /// 优先使用当前打开的作用域，找不到则取任意已注册作用域。
+        /// </summary>
+        private void InitGantryFromDeviceManager()
+        {
+            try
+            {
+                // 优先使用当前打开的作用域
+                IScopedProvider? scope = null;
+                if (!string.IsNullOrEmpty(_globalInfo.CurrentOpeningScope)
+                    && _globalInfo.ScopeDic.TryGetValue(_globalInfo.CurrentOpeningScope, out scope))
+                {
+                    // 找到了
+                }
+                else
+                {
+                    // 退而求其次，取任意可用作用域
+                    scope = _globalInfo.ScopeDic.Values.FirstOrDefault();
+                }
+
+                if (scope == null)
+                {
+                    LoggerHelper.Warn("[BenchMovement] 无可用的作用域，无法解析 DeviceManager。");
+                    return;
+                }
+
+                _deviceManager = scope.Resolve<DeviceManager>();
+                _gantry = _deviceManager.DeviceMap.Values.OfType<GantryControlTcp>().FirstOrDefault();
+
+                if (_gantry != null)
+                {
+                    LoggerHelper.Info($"[BenchMovement] 已从 DeviceManager 获取 GantryControlTcp 实例。");
+                    UpdateConnectionStatus();
+                }
+                else
+                {
+                    LoggerHelper.Warn("[BenchMovement] DeviceManager 中未找到 GantryControlTcp 设备，请检查设备配置。");
+                }
+            }
+            catch (Exception ex)
+            {
+                LoggerHelper.Error($"[BenchMovement] 初始化 GantryControlTcp 失败: {ex.Message}");
             }
         }
 
         public void Dispose()
         {
-            // 用于界面关闭或Region注销时的资源释放（例如解除事件订阅、断开临时Socket通道、清空通信缓冲）
+            _pollTimer.Stop();
+            // GantryControlTcp 由 DeviceManager 统一管理生命周期，此处仅停止轮询
         }
 
         #endregion

BenchMovementModule/Views/BenchMovementView.xaml

@@ -2,7 +2,6 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              mc:Ignorable="d"
              xmlns:prism="http://prismlibrary.com/"
@@ -44,7 +43,6 @@
             <Setter Property="VerticalContentAlignment" Value="Center"/>
         </Style>
 
-        <!-- 极具机械/按钮交互感的现代工业 Button 样式 -->
         <Style TargetType="Button">
             <Setter Property="Background" Value="#F5F5F5"/>
             <Setter Property="Foreground" Value="#333333"/>
@@ -65,12 +63,10 @@
                             <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
                         </Border>
                         <ControlTemplate.Triggers>
-                            <!-- 鼠标悬停：变亮并加深边框 -->
                             <Trigger Property="IsMouseOver" Value="True">
                                 <Setter TargetName="btnBorder" Property="Background" Value="#EAEAEA"/>
                                 <Setter TargetName="btnBorder" Property="BorderBrush" Value="#4A90E2"/>
                             </Trigger>
-                            <!-- 鼠标按下：明显的下凹和变暗交互感 -->
                             <Trigger Property="IsPressed" Value="True">
                                 <Setter TargetName="btnBorder" Property="Background" Value="#DCDCDC"/>
                                 <Setter TargetName="btnBorder" Property="BorderBrush" Value="#2A6099"/>
@@ -81,7 +77,6 @@
             </Setter>
         </Style>
 
-        <!-- 针对特殊控制按钮单独定制的样式 -->
         <Style TargetType="Button" x:Key="StopButtonStyle" BasedOn="{StaticResource {x:Type Button}}">
             <Setter Property="Background" Value="#FFF0F0"/>
             <Setter Property="Foreground" Value="#C00000"/>
@@ -128,6 +123,29 @@
             </Setter>
         </Style>
 
+        <Style TargetType="Button" x:Key="ConnectButtonStyle" BasedOn="{StaticResource {x:Type Button}}">
+            <Setter Property="Background" Value="#5CB85C"/>
+            <Setter Property="Foreground" Value="White"/>
+            <Setter Property="BorderBrush" Value="#4CAE4C"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="Button">
+                        <Border x:Name="btnBorder" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1" CornerRadius="3">
+                            <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter TargetName="btnBorder" Property="Background" Value="#449D44"/>
+                            </Trigger>
+                            <Trigger Property="IsPressed" Value="True">
+                                <Setter TargetName="btnBorder" Property="Background" Value="#3D8B3D"/>
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+
         <Style TargetType="GroupBox">
             <Setter Property="BorderBrush" Value="#D0D0D0"/>
             <Setter Property="BorderThickness" Value="1"/>
@@ -136,7 +154,6 @@
         </Style>
     </UserControl.Resources>
 
-    <!-- 浅灰、偏白色工业背景 -->
     <Grid Background="#F0F2F5">
         <TabControl Background="Transparent" BorderThickness="0">
             <TabControl.Resources>
@@ -150,30 +167,89 @@
                 </Style>
             </TabControl.Resources>
 
-            <!-- ======================= 1. 主页标签页 ======================= -->
-            <TabItem Header="标签">
+            <!-- ======================= 1. 控制面板 ======================= -->
+            <TabItem Header="控制">
                 <Grid Margin="10">
                     <Grid.RowDefinitions>
-                        <RowDefinition Height="2*"/>
-                        <RowDefinition Height="3*"/>
-                        <RowDefinition Height="2*"/>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="*"/>
                     </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="4*"/>
                         <ColumnDefinition Width="1*"/>
                     </Grid.ColumnDefinitions>
 
-                    <!-- 左上：台架位置 & 信号回读 -->
-                    <Grid Grid.Row="0" Grid.Column="0">
+                    <!-- 顶部：连接状态条 -->
+                    <Border Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Background="White" BorderBrush="#D0D0D0" BorderThickness="1" CornerRadius="3" Padding="15,8" Margin="0,0,0,10">
+                        <StackPanel Orientation="Horizontal">
+                            <Ellipse Width="14" Height="14" Margin="0,0,8,0">
+                                <Ellipse.Style>
+                                    <Style TargetType="Ellipse">
+                                        <Setter Property="Fill" Value="#999999"/>
+                                        <Style.Triggers>
+                                            <DataTrigger Binding="{Binding IsConnected}" Value="True">
+                                                <Setter Property="Fill" Value="#5CB85C"/>
+                                            </DataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </Ellipse.Style>
+                            </Ellipse>
+                            <TextBlock Text="{Binding ConnectionStatus}" FontSize="16" FontWeight="Bold" VerticalAlignment="Center" Margin="0,0,20,0"/>
+                            <Button Content="连接" Width="80" Margin="0" Style="{StaticResource ConnectButtonStyle}" Command="{Binding ConnectCommand}"/>
+                            <Button Content="断开" Width="80" Margin="8,0,0,0" Style="{StaticResource StopButtonStyle}" Command="{Binding DisconnectCommand}"/>
+                            <Button Content="刷新状态" Width="90" Margin="8,0,0,0" Command="{Binding ReadStatusCommand}"/>
+                        </StackPanel>
+                    </Border>
+
+                    <!-- 左中：位置显示 & 寸动目标 -->
+                    <Grid Grid.Row="1" Grid.Column="0">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="1*"/>
                             <ColumnDefinition Width="1.5*"/>
                         </Grid.ColumnDefinitions>
 
-                        <!-- 台架位置 -->
+                        <!-- 6轴绝对位置 -->
                         <GroupBox Grid.Column="0">
                             <GroupBox.Header>
-                                <TextBlock Text="台架位置" Style="{StaticResource HeaderStyle}"/>
+                                <TextBlock Text="绝对位置（只读）" Style="{StaticResource HeaderStyle}"/>
+                            </GroupBox.Header>
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition/>
+                                    <RowDefinition/>
+                                    <RowDefinition/>
+                                    <RowDefinition/>
+                                    <RowDefinition/>
+                                    <RowDefinition/>
+                                </Grid.RowDefinitions>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="*"/>
+                                </Grid.ColumnDefinitions>
+                                <TextBlock Grid.Row="0" Grid.Column="0" Text="轴1" Style="{StaticResource LabelStyle}"/>
+                                <TextBlock Grid.Row="0" Grid.Column="1" Text="{Binding AbsPos1}" Style="{StaticResource ValueStyle}"/>
+
+                                <TextBlock Grid.Row="1" Grid.Column="0" Text="轴2" Style="{StaticResource LabelStyle}"/>
+                                <TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding AbsPos2}" Style="{StaticResource ValueStyle}"/>
+
+                                <TextBlock Grid.Row="2" Grid.Column="0" Text="轴3" Style="{StaticResource LabelStyle}"/>
+                                <TextBlock Grid.Row="2" Grid.Column="1" Text="{Binding AbsPos3}" Style="{StaticResource ValueStyle}"/>
+
+                                <TextBlock Grid.Row="3" Grid.Column="0" Text="轴4" Style="{StaticResource LabelStyle}"/>
+                                <TextBlock Grid.Row="3" Grid.Column="1" Text="{Binding AbsPos4}" Style="{StaticResource ValueStyle}"/>
+
+                                <TextBlock Grid.Row="4" Grid.Column="0" Text="轴5" Style="{StaticResource LabelStyle}"/>
+                                <TextBlock Grid.Row="4" Grid.Column="1" Text="{Binding AbsPos5}" Style="{StaticResource ValueStyle}"/>
+
+                                <TextBlock Grid.Row="5" Grid.Column="0" Text="轴6" Style="{StaticResource LabelStyle}"/>
+                                <TextBlock Grid.Row="5" Grid.Column="1" Text="{Binding AbsPos6}" Style="{StaticResource ValueStyle}"/>
+                            </Grid>
+                        </GroupBox>
+
+                        <!-- 寸动目标位置 -->
+                        <GroupBox Grid.Column="1">
+                            <GroupBox.Header>
+                                <TextBlock Text="寸动目标" Style="{StaticResource HeaderStyle}"/>
                             </GroupBox.Header>
                             <Grid>
                                 <Grid.RowDefinitions>
@@ -184,346 +260,131 @@
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="Auto"/>
                                     <ColumnDefinition Width="*"/>
-                                </Grid.ColumnDefinitions>
-                                <TextBlock Grid.Row="0" Grid.Column="0" Text="X (mm)" Style="{StaticResource LabelStyle}"/>
-                                <TextBlock Grid.Row="0" Grid.Column="1" Text="{Binding PosX}" Style="{StaticResource ValueStyle}"/>
-
-                                <TextBlock Grid.Row="1" Grid.Column="0" Text="Y (mm)" Style="{StaticResource LabelStyle}"/>
-                                <TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding PosY}" Style="{StaticResource ValueStyle}"/>
-
-                                <TextBlock Grid.Row="2" Grid.Column="0" Text="Z (mm)" Style="{StaticResource LabelStyle}"/>
-                                <TextBlock Grid.Row="2" Grid.Column="1" Text="{Binding PosZ}" Style="{StaticResource ValueStyle}"/>
-                            </Grid>
-                        </GroupBox>
-
-                        <!-- 信号回读 -->
-                        <GroupBox Grid.Column="1">
-                            <GroupBox.Header>
-                                <TextBlock Text="信号回读" Style="{StaticResource HeaderStyle}"/>
-                            </GroupBox.Header>
-                            <UniformGrid Columns="2">
-                                <StackPanel Orientation="Horizontal" Margin="5">
-                                    <TextBlock Text="POS1_X(mm): " Style="{StaticResource LabelStyle}"/>
-                                    <TextBlock Text="{Binding Pos1X}" Foreground="#0056B3" FontSize="18" FontWeight="Bold" VerticalAlignment="Center"/>
-                                </StackPanel>
-                                <StackPanel Orientation="Horizontal" Margin="5">
-                                    <TextBlock Text="POS1_Quality: " Style="{StaticResource LabelStyle}"/>
-                                    <TextBlock Text="{Binding Pos1Quality}" Foreground="#0056B3" FontSize="18" FontWeight="Bold" VerticalAlignment="Center"/>
-                                </StackPanel>
-                                <StackPanel Orientation="Horizontal" Margin="5">
-                                    <TextBlock Text="POS2_X(mm): " Style="{StaticResource LabelStyle}"/>
-                                    <TextBlock Text="{Binding Pos2X}" Foreground="#0056B3" FontSize="18" FontWeight="Bold" VerticalAlignment="Center"/>
-                                </StackPanel>
-                                <StackPanel Orientation="Horizontal" Margin="5">
-                                    <TextBlock Text="POS2_Quality: " Style="{StaticResource LabelStyle}"/>
-                                    <TextBlock Text="{Binding Pos2Quality}" Foreground="#0056B3" FontSize="18" FontWeight="Bold" VerticalAlignment="Center"/>
-                                </StackPanel>
-                                <StackPanel Orientation="Horizontal" Margin="5">
-                                    <TextBlock Text="POS1_Y(mm): " Style="{StaticResource LabelStyle}"/>
-                                    <TextBlock Text="{Binding Pos1Y}" Foreground="#0056B3" FontSize="18" FontWeight="Bold" VerticalAlignment="Center"/>
-                                </StackPanel>
-                                <StackPanel Orientation="Horizontal" Margin="5">
-                                    <TextBlock Text="POS2_Y(mm): " Style="{StaticResource LabelStyle}"/>
-                                    <TextBlock Text="{Binding Pos2Y}" Foreground="#0056B3" FontSize="18" FontWeight="Bold" VerticalAlignment="Center"/>
-                                </StackPanel>
-                            </UniformGrid>
-                        </GroupBox>
-                    </Grid>
-
-                    <!-- 左中：扫描参数 -->
-                    <GroupBox Grid.Row="1" Grid.Column="0">
-                        <GroupBox.Header>
-                            <TextBlock Text="扫描参数" Style="{StaticResource HeaderStyle}"/>
-                        </GroupBox.Header>
-                        <Grid>
-                            <Grid.RowDefinitions>
-                                <RowDefinition/>
-                                <RowDefinition/>
-                                <RowDefinition/>
-                            </Grid.RowDefinitions>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="*"/>
-                            </Grid.ColumnDefinitions>
-
-                            <!-- X轴 -->
-                            <TextBlock Grid.Row="0" Grid.Column="0" Text="X移动步长(mm)" Style="{StaticResource LabelStyle}"/>
-                            <TextBox Grid.Row="0" Grid.Column="1" Text="{Binding ScanStepX}" Margin="5"/>
-                            <TextBlock Grid.Row="0" Grid.Column="2" Text="X起始位置(mm)" Style="{StaticResource LabelStyle}"/>
-                            <TextBox Grid.Row="0" Grid.Column="3" Text="{Binding ScanStartX}" Margin="5"/>
-                            <TextBlock Grid.Row="0" Grid.Column="4" Text="X终止位置(mm)" Style="{StaticResource LabelStyle}"/>
-                            <TextBox Grid.Row="0" Grid.Column="5" Text="{Binding ScanEndX}" Margin="5"/>
-
-                            <!-- Y轴 -->
-                            <TextBlock Grid.Row="1" Grid.Column="0" Text="Y移动步长(mm)" Style="{StaticResource LabelStyle}"/>
-                            <TextBox Grid.Row="1" Grid.Column="1" Text="{Binding ScanStepY}" Margin="5"/>
-                            <TextBlock Grid.Row="1" Grid.Column="2" Text="Y起始位置(mm)" Style="{StaticResource LabelStyle}"/>
-                            <TextBox Grid.Row="1" Grid.Column="3" Text="{Binding ScanStartY}" Margin="5"/>
-                            <TextBlock Grid.Row="1" Grid.Column="4" Text="Y终止位置(mm)" Style="{StaticResource LabelStyle}"/>
-                            <TextBox Grid.Row="1" Grid.Column="5" Text="{Binding ScanEndY}" Margin="5"/>
-
-                            <!-- Z轴 -->
-                            <TextBlock Grid.Row="2" Grid.Column="0" Text="Z移动步长(mm)" Style="{StaticResource LabelStyle}"/>
-                            <TextBox Grid.Row="2" Grid.Column="1" Text="{Binding ScanStepZ}" Margin="5"/>
-                            <TextBlock Grid.Row="2" Grid.Column="2" Text="Z起始位置(mm)" Style="{StaticResource LabelStyle}"/>
-                            <TextBox Grid.Row="2" Grid.Column="3" Text="{Binding ScanStartZ}" Margin="5"/>
-                            <TextBlock Grid.Row="2" Grid.Column="4" Text="Z终止位置(mm)" Style="{StaticResource LabelStyle}"/>
-                            <TextBox Grid.Row="2" Grid.Column="5" Text="{Binding ScanEndZ}" Margin="5"/>
-                        </Grid>
-                    </GroupBox>
-
-                    <!-- 左下：寸动参数与雷达位置图 -->
-                    <Grid Grid.Row="2" Grid.Column="0">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="1*"/>
-                            <ColumnDefinition Width="1*"/>
-                        </Grid.ColumnDefinitions>
-
-                        <!-- 寸动参数 -->
-                        <GroupBox Grid.Column="0">
-                            <GroupBox.Header>
-                                <TextBlock Text="寸动参数" Style="{StaticResource HeaderStyle}"/>
-                            </GroupBox.Header>
-                            <Grid>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition/>
-                                    <RowDefinition/>
-                                    <RowDefinition/>
-                                </Grid.RowDefinitions>
-                                <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="Auto"/>
-                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="Auto"/>
                                 </Grid.ColumnDefinitions>
-                                <TextBlock Grid.Row="0" Grid.Column="0" Text="X移动位置(mm)" Style="{StaticResource LabelStyle}"/>
-                                <TextBox Grid.Row="0" Grid.Column="1" Text="{Binding JogX}" Margin="5"/>
+                                <TextBlock Grid.Row="0" Grid.Column="0" Text="X目标" Style="{StaticResource LabelStyle}"/>
+                                <TextBox Grid.Row="0" Grid.Column="1" Text="{Binding TargetX}" Margin="5"/>
+                                <Button Grid.Row="0" Grid.Column="2" Content="移动" Width="60" Margin="5,0,5,0" Command="{Binding MoveXCommand}"/>
+                                <Button Grid.Row="0" Grid.Column="3" Content="停止" Width="60" Margin="0,0,5,0" Style="{StaticResource StopButtonStyle}" Command="{Binding StopXCommand}"/>
 
-                                <TextBlock Grid.Row="1" Grid.Column="0" Text="Y移动位置(mm)" Style="{StaticResource LabelStyle}"/>
-                                <TextBox Grid.Row="1" Grid.Column="1" Text="{Binding JogY}" Margin="5"/>
+                                <TextBlock Grid.Row="1" Grid.Column="0" Text="Y目标" Style="{StaticResource LabelStyle}"/>
+                                <TextBox Grid.Row="1" Grid.Column="1" Text="{Binding TargetY}" Margin="5"/>
+                                <Button Grid.Row="1" Grid.Column="2" Content="移动" Width="60" Margin="5,0,5,0" Command="{Binding MoveYCommand}"/>
+                                <Button Grid.Row="1" Grid.Column="3" Content="停止" Width="60" Margin="0,0,5,0" Style="{StaticResource StopButtonStyle}" Command="{Binding StopYCommand}"/>
 
-                                <TextBlock Grid.Row="2" Grid.Column="0" Text="Z移动位置(mm)" Style="{StaticResource LabelStyle}"/>
-                                <TextBox Grid.Row="2" Grid.Column="1" Text="{Binding JogZ}" Margin="5"/>
-                            </Grid>
-                        </GroupBox>
-
-                        <!-- 坐标示意图 -->
-                        <GroupBox Grid.Column="1">
-                            <GroupBox.Header>
-                                <TextBlock Text="台架现在位置" Style="{StaticResource HeaderStyle}"/>
-                            </GroupBox.Header>
-                            <Grid Margin="5" Background="White">
-                                <!-- 十字坐标轴 -->
-                                <Line X1="0" Y1="50" X2="200" Y2="50" Stroke="#B0B0B0" StrokeThickness="1" HorizontalAlignment="Center" VerticalAlignment="Center" Width="200" Height="100"/>
-                                <Line X1="100" Y1="0" X2="100" Y2="100" Stroke="#B0B0B0" StrokeThickness="1" HorizontalAlignment="Center" VerticalAlignment="Center" Width="200" Height="100"/>
-                                <!-- 轴向文本标签 -->
-                                <TextBlock Text="X+" HorizontalAlignment="Center" VerticalAlignment="Top" Foreground="#666666" Margin="0,2,0,0"/>
-                                <TextBlock Text="X-" HorizontalAlignment="Center" VerticalAlignment="Bottom" Foreground="#666666" Margin="0,0,0,2"/>
-                                <TextBlock Text="Y+" HorizontalAlignment="Left" VerticalAlignment="Center" Foreground="#666666" Margin="2,0,0,0"/>
-                                <TextBlock Text="Y-" HorizontalAlignment="Right" VerticalAlignment="Center" Foreground="#666666" Margin="0,0,2,0"/>
-
-                                <!-- 台架模拟中心点 -->
-                                <Border Width="65" Height="35" Background="#E9ECEF" BorderBrush="#999999" BorderThickness="1" HorizontalAlignment="Center" VerticalAlignment="Center" CornerRadius="2">
-                                    <TextBlock Text="台架位置" Foreground="#333333" FontSize="11" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                                </Border>
+                                <TextBlock Grid.Row="2" Grid.Column="0" Text="Z目标" Style="{StaticResource LabelStyle}"/>
+                                <TextBox Grid.Row="2" Grid.Column="1" Text="{Binding TargetZ}" Margin="5"/>
+                                <Button Grid.Row="2" Grid.Column="2" Content="移动" Width="60" Margin="5,0,5,0" Command="{Binding MoveZCommand}"/>
+                                <Button Grid.Row="2" Grid.Column="3" Content="停止" Width="60" Margin="0,0,5,0" Style="{StaticResource StopButtonStyle}" Command="{Binding StopZCommand}"/>
                             </Grid>
                         </GroupBox>
                     </Grid>
 
-                    <!-- 右侧：控制面板（除去Spacing，增加Margin防粘连） -->
-                    <Grid Grid.Row="0" Grid.RowSpan="3" Grid.Column="1" Margin="6,6,0,6">
+                    <!-- 右侧：控制面板 -->
+                    <Grid Grid.Row="1" Grid.Column="1" Margin="6,6,0,6">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto"/>
                             <RowDefinition Height="*"/>
                             <RowDefinition Height="Auto"/>
                         </Grid.RowDefinitions>
 
-                        <!-- 扫描路径操作 -->
                         <StackPanel Grid.Row="0">
-                            <Button Content="▶ 开始扫描" Command="{Binding StartScanCommand}"/>
-                            <Button Content="■ 停止扫描" Style="{StaticResource StopButtonStyle}" Command="{Binding StopScanCommand}"/>
                             <Button Content="↩ 回原点" Command="{Binding GoHomeCommand}"/>
-                            <TextBlock Text="扫描路径" Style="{StaticResource LabelStyle}" Margin="0,10,0,4"/>
-                            <ComboBox Height="30" Background="White" Foreground="#333333" SelectedIndex="0" Margin="0,0,0,8" materialDesign:HintAssist.Hint="">
-                                <ComboBoxItem Content="配置文件1.xml"/>
-                            </ComboBox>
+                            <Button Content="⬆ 三轴同动" Command="{Binding MoveAllCommand}"/>
                         </StackPanel>
 
-                        <!-- 寸动单轴移动按钮组 -->
-                        <Grid Grid.Row="1">
-                            <StackPanel VerticalAlignment="Center">
-                                <Button Content="↕ X 移动" Command="{Binding MoveXCommand}"/>
-                                <Button Content="↔ Y 移动" Command="{Binding MoveYCommand}"/>
-                                <Button Content="↕ Z 移动" Command="{Binding MoveZCommand}"/>
-                            </StackPanel>
-                        </Grid>
+                        <StackPanel Grid.Row="1" VerticalAlignment="Center">
+                            <TextBlock Text="单轴控制" Style="{StaticResource LabelStyle}" HorizontalAlignment="Center" Margin="0,10,0,10"/>
+                            <Button Content="↕ X 移动" Command="{Binding MoveXCommand}"/>
+                            <Button Content="↔ Y 移动" Command="{Binding MoveYCommand}"/>
+                            <Button Content="↕ Z 移动" Command="{Binding MoveZCommand}"/>
+                        </StackPanel>
 
-                        <!-- 急停 -->
                         <Button Grid.Row="2" Content="❌ 急 停" Style="{StaticResource EmergencyButtonStyle}" FontWeight="Bold" FontSize="18" Height="55" Margin="0" Command="{Binding EmergencyStopCommand}"/>
                     </Grid>
                 </Grid>
             </TabItem>
 
-            <!-- ======================= 2. 设置标签页 ======================= -->
+            <!-- ======================= 2. 设置 ======================= -->
             <TabItem Header="设置">
                 <ScrollViewer VerticalScrollBarVisibility="Auto">
                     <StackPanel Margin="10">
 
-                        <!-- 台架接口配置 -->
+                        <!-- 移动速度设定（脉冲） -->
                         <GroupBox>
                             <GroupBox.Header>
-                                <TextBlock Text="台架接口" Style="{StaticResource HeaderStyle}"/>
+                                <TextBlock Text="移动速度设定" Style="{StaticResource HeaderStyle}"/>
                             </GroupBox.Header>
-                            <StackPanel Orientation="Horizontal" Margin="5">
-                                <StackPanel Orientation="Horizontal" Margin="0,0,15,0">
-                                    <TextBlock Text="IP: " Style="{StaticResource LabelStyle}"/>
-                                    <TextBox Width="150" Text="{Binding PlcIp}"/>
-                                </StackPanel>
-                                <StackPanel Orientation="Horizontal" Margin="0,0,15,0">
-                                    <TextBlock Text="端口: " Style="{StaticResource LabelStyle}"/>
-                                    <TextBox Width="80" Text="{Binding PlcPort}"/>
-                                </StackPanel>
-                                <Button Content="应 用" Width="90" Margin="0" Command="{Binding ApplyNetworkCommand}"/>
+                            <StackPanel Margin="5">
+                                <Grid Margin="0,0,0,6">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="160"/>
+                                        <ColumnDefinition Width="*"/>
+                                    </Grid.ColumnDefinitions>
+                                    <TextBlock Text="X速度(脉冲)" Style="{StaticResource LabelStyle}"/>
+                                    <TextBox Grid.Column="1" Text="{Binding SpeedX}"/>
+                                </Grid>
+                                <Grid Margin="0,0,0,6">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="160"/>
+                                        <ColumnDefinition Width="*"/>
+                                    </Grid.ColumnDefinitions>
+                                    <TextBlock Text="Y速度(脉冲)" Style="{StaticResource LabelStyle}"/>
+                                    <TextBox Grid.Column="1" Text="{Binding SpeedY}"/>
+                                </Grid>
+                                <Grid Margin="0,0,0,6">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="160"/>
+                                        <ColumnDefinition Width="*"/>
+                                    </Grid.ColumnDefinitions>
+                                    <TextBlock Text="Z速度(脉冲)" Style="{StaticResource LabelStyle}"/>
+                                    <TextBox Grid.Column="1" Text="{Binding SpeedZ}"/>
+                                </Grid>
+                                <Grid Margin="0,0,0,10">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="160"/>
+                                        <ColumnDefinition Width="*"/>
+                                    </Grid.ColumnDefinitions>
+                                    <TextBlock Text="回零速度(脉冲)" Style="{StaticResource LabelStyle}"/>
+                                    <TextBox Grid.Column="1" Text="{Binding HomeSpeed}"/>
+                                </Grid>
+                                <Button Content="速度设定" Width="110" HorizontalAlignment="Left" Margin="0" Command="{Binding SetSpeedCommand}"/>
                             </StackPanel>
                         </GroupBox>
 
-                        <!-- 移动速度与零点设定 -->
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="1*"/>
-                                <ColumnDefinition Width="1*"/>
-                            </Grid.ColumnDefinitions>
-
-                            <!-- 移动速度设定 -->
-                            <GroupBox Grid.Column="0">
-                                <GroupBox.Header>
-                                    <TextBlock Text="移动速度设定" Style="{StaticResource HeaderStyle}"/>
-                                </GroupBox.Header>
-                                <StackPanel Margin="5">
-                                    <Grid Margin="0,0,0,6">
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="140"/>
-                                            <ColumnDefinition Width="*"/>
-                                        </Grid.ColumnDefinitions>
-                                        <TextBlock Text="X移动速度(mm/s)" Style="{StaticResource LabelStyle}"/>
-                                        <TextBox Grid.Column="1" Text="{Binding SpeedX}"/>
-                                    </Grid>
-                                    <Grid Margin="0,0,0,6">
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="140"/>
-                                            <ColumnDefinition Width="*"/>
-                                        </Grid.ColumnDefinitions>
-                                        <TextBlock Text="Y移动速度(mm/s)" Style="{StaticResource LabelStyle}"/>
-                                        <TextBox Grid.Column="1" Text="{Binding SpeedY}"/>
-                                    </Grid>
-                                    <Grid Margin="0,0,0,10">
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="140"/>
-                                            <ColumnDefinition Width="*"/>
-                                        </Grid.ColumnDefinitions>
-                                        <TextBlock Text="Z移动速度(mm/s)" Style="{StaticResource LabelStyle}"/>
-                                        <TextBox Grid.Column="1" Text="{Binding SpeedZ}"/>
-                                    </Grid>
-                                    <Button Content="速度设定" Width="110" HorizontalAlignment="Left" Margin="0" Command="{Binding SetSpeedCommand}"/>
-                                </StackPanel>
-                            </GroupBox>
-
-                            <!-- 零点设定 -->
-                            <GroupBox Grid.Column="1">
-                                <GroupBox.Header>
-                                    <TextBlock Text="零点设定" Style="{StaticResource HeaderStyle}"/>
-                                </GroupBox.Header>
-                                <StackPanel Margin="5">
-                                    <Grid Margin="0,0,0,6">
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="110"/>
-                                            <ColumnDefinition Width="*"/>
-                                        </Grid.ColumnDefinitions>
-                                        <TextBlock Text="X零点(mm)" Style="{StaticResource LabelStyle}"/>
-                                        <TextBox Grid.Column="1" Text="{Binding ZeroX}"/>
-                                    </Grid>
-                                    <Grid Margin="0,0,0,6">
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="110"/>
-                                            <ColumnDefinition Width="*"/>
-                                        </Grid.ColumnDefinitions>
-                                        <TextBlock Text="Y零点(mm)" Style="{StaticResource LabelStyle}"/>
-                                        <TextBox Grid.Column="1" Text="{Binding ZeroY}"/>
-                                    </Grid>
-                                    <Grid Margin="0,0,0,10">
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="110"/>
-                                            <ColumnDefinition Width="*"/>
-                                        </Grid.ColumnDefinitions>
-                                        <TextBlock Text="Z零点(mm)" Style="{StaticResource LabelStyle}"/>
-                                        <TextBox Grid.Column="1" Text="{Binding ZeroZ}"/>
-                                    </Grid>
-                                    <Button Content="零点设定" Width="110" HorizontalAlignment="Left" Margin="0" Command="{Binding SetZeroCommand}"/>
-                                </StackPanel>
-                            </GroupBox>
-                        </Grid>
-
-                        <!-- CAN设定 -->
+                        <!-- 零点设定 -->
                         <GroupBox>
                             <GroupBox.Header>
-                                <TextBlock Text="CAN设定" Style="{StaticResource HeaderStyle}"/>
+                                <TextBlock Text="零点设定" Style="{StaticResource HeaderStyle}"/>
                             </GroupBox.Header>
-                            <Grid Margin="5">
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="Auto"/>
-                                    <RowDefinition Height="Auto"/>
-                                    <RowDefinition Height="Auto"/>
-                                    <RowDefinition Height="Auto"/>
-                                    <RowDefinition Height="Auto"/>
-                                    <RowDefinition Height="Auto"/>
-                                    <RowDefinition Height="Auto"/>
-                                    <RowDefinition Height="Auto"/>
-                                    <RowDefinition Height="Auto"/>
-                                </Grid.RowDefinitions>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="170"/>
-                                    <ColumnDefinition Width="280"/>
-                                    <ColumnDefinition Width="70"/>
-                                    <ColumnDefinition Width="140"/>
-                                </Grid.ColumnDefinitions>
-
-                                <!-- 通道与模式 -->
-                                <TextBlock Grid.Row="0" Grid.Column="0" Text="应用程序CAN通道" Style="{StaticResource LabelStyle}"/>
-                                <TextBox Grid.Row="0" Grid.Column="1" Text="{Binding CanChannel}" Margin="3"/>
-
-                                <TextBlock Grid.Row="0" Grid.Column="2" Text="模式" Style="{StaticResource LabelStyle}" HorizontalAlignment="Center"/>
-                                <ComboBox Grid.Row="0" Grid.Column="3" Height="28" Background="White" Foreground="#333333" SelectedIndex="0" Margin="3" materialDesign:HintAssist.Hint="">
-                                    <ComboBoxItem Content="正常模式"/>
-                                </ComboBox>
-
-                                <!-- 报文ID -->
-                                <TextBlock Grid.Row="1" Grid.Column="0" Text="报文ID(16进制)" Style="{StaticResource LabelStyle}"/>
-                                <TextBox Grid.Row="1" Grid.Column="1" Text="{Binding CanMsgId}" Margin="3"/>
-
-                                <!-- 信号名称列表 -->
-                                <TextBlock Grid.Row="2" Grid.Column="0" Text="报文名称" Style="{StaticResource LabelStyle}"/>
-                                <TextBox Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="3" Text="{Binding CanMsgName}" Margin="3"/>
-
-                                <TextBlock Grid.Row="3" Grid.Column="0" Text="POS1_X信号名称" Style="{StaticResource LabelStyle}"/>
-                                <TextBox Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="3" Text="{Binding SigPos1X}" Margin="3"/>
-
-                                <TextBlock Grid.Row="4" Grid.Column="0" Text="POS2_X信号名称" Style="{StaticResource LabelStyle}"/>
-                                <TextBox Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="3" Text="{Binding SigPos2X}" Margin="3"/>
-
-                                <TextBlock Grid.Row="5" Grid.Column="0" Text="POS1_Y信号名称" Style="{StaticResource LabelStyle}"/>
-                                <TextBox Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="3" Text="{Binding SigPos1Y}" Margin="3"/>
-
-                                <TextBlock Grid.Row="6" Grid.Column="0" Text="POS2_Y信号名称" Style="{StaticResource LabelStyle}"/>
-                                <TextBox Grid.Row="6" Grid.Column="1" Grid.ColumnSpan="3" Text="{Binding SigPos2Y}" Margin="3"/>
-
-                                <TextBlock Grid.Row="7" Grid.Column="0" Text="POS1_Quality信号名称" Style="{StaticResource LabelStyle}"/>
-                                <TextBox Grid.Row="7" Grid.Column="1" Grid.ColumnSpan="3" Text="{Binding SigPos1Quality}" Margin="3"/>
-
-                                <TextBlock Grid.Row="8" Grid.Column="0" Text="POS2_Quality信号名称" Style="{StaticResource LabelStyle}"/>
-                                <TextBox Grid.Row="8" Grid.Column="1" Grid.ColumnSpan="3" Text="{Binding SigPos2Quality}" Margin="3"/>
-                            </Grid>
+                            <StackPanel Margin="5">
+                                <Grid Margin="0,0,0,6">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="120"/>
+                                        <ColumnDefinition Width="*"/>
+                                    </Grid.ColumnDefinitions>
+                                    <TextBlock Text="X零点" Style="{StaticResource LabelStyle}"/>
+                                    <TextBox Grid.Column="1" Text="{Binding HomeX}"/>
+                                </Grid>
+                                <Grid Margin="0,0,0,6">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="120"/>
+                                        <ColumnDefinition Width="*"/>
+                                    </Grid.ColumnDefinitions>
+                                    <TextBlock Text="Y零点" Style="{StaticResource LabelStyle}"/>
+                                    <TextBox Grid.Column="1" Text="{Binding HomeY}"/>
+                                </Grid>
+                                <Grid Margin="0,0,0,10">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="120"/>
+                                        <ColumnDefinition Width="*"/>
+                                    </Grid.ColumnDefinitions>
+                                    <TextBlock Text="Z零点" Style="{StaticResource LabelStyle}"/>
+                                    <TextBox Grid.Column="1" Text="{Binding HomeZ}"/>
+                                </Grid>
+                                <Button Content="零点设定" Width="110" HorizontalAlignment="Left" Margin="0" Command="{Binding SetHomeCommand}"/>
+                            </StackPanel>
                         </GroupBox>
                     </StackPanel>
                 </ScrollViewer>

CANModule/ViewModels/CollectCANSingalSettingViewModel.cs

@@ -164,6 +164,7 @@ namespace CANModule.ViewModels
             char lastChar = title[title.Length - 1];
             // 3. "TestCellX"转int
             MessageChannel = int.Parse(lastChar.ToString())-1;
+            if (MessageChannel >= 4) MessageChannel -= 4;
             RaisePropertyChanged(nameof(ConfigurationList));
         }
         #endregion

Common/Common.csproj

@@ -9,7 +9,6 @@
   <ItemGroup>
     <PackageReference Include="ncalc" Version="1.3.8" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.5-beta1" />
-    <PackageReference Include="System.IO.Ports" Version="11.0.0-preview.4.26230.115" />
   </ItemGroup>
 
 </Project>

CurveModule/CurveModule.cs

@@ -0,0 +1,20 @@
+
+using CurveModule.Views;
+using System.Reflection;
+
+namespace CurveModule
+{
+    public class CurveModule: IModule
+    {
+        public void OnInitialized(IContainerProvider containerProvider)
+        {
+            IRegionManager regionManager = containerProvider.Resolve<IRegionManager>();
+        }
+
+        public void RegisterTypes(IContainerRegistry containerRegistry)
+        {
+            containerRegistry.RegisterForNavigation<CurveRecallView>("CurveRecallView");
+        }
+    }
+
+}

CurveModule/CurveModule.csproj

@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows</TargetFramework>
+    <Nullable>enable</Nullable>
+    <UseWPF>true</UseWPF>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Service\Service.csproj" />
+    <ProjectReference Include="..\UIShare\UIShare.csproj" />
+  </ItemGroup>
+
+
+	<ItemGroup>
+		<PackageReference Include="OxyPlot.Wpf" Version="2.2.0" />
+	</ItemGroup>
+
+</Project>

CurveModule/ViewModels/CurveRecallViewModel.cs

@@ -0,0 +1,381 @@
+using Logger;
+using OxyPlot;
+using OxyPlot.Axes;
+using OxyPlot.Legends;
+using OxyPlot.Series;
+using Prism.Commands;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Windows.Input;
+using UIShare.ViewModelBase;
+
+namespace CurveModule.ViewModels
+{
+    /// <summary>
+    /// 曲线回读：加载 RecordView 导出的 CSV 文件，按 (MonitorName, Scope) 分组绘制曲线。
+    /// </summary>
+    public class CurveRecallViewModel : NavigateViewModelBase, IRegionMemberLifetime, IDisposable
+    {
+        #region 属性
+        public bool KeepAlive => true;
+
+        public PlotModel Plot { get; }
+
+        /// <summary>已加载的曲线通道列表</summary>
+        public ObservableCollection<CurveRecallChannelVM> Channels { get; } = new();
+
+        private CurveRecallChannelVM? _selectedChannel;
+        public CurveRecallChannelVM? SelectedChannel
+        {
+            get => _selectedChannel;
+            set => SetProperty(ref _selectedChannel, value);
+        }
+
+        private string _statusMessage = "请加载 CSV 文件以回读曲线";
+        public string StatusMessage
+        {
+            get => _statusMessage;
+            set => SetProperty(ref _statusMessage, value);
+        }
+        #endregion
+
+        #region 命令
+        public ICommand LoadCsvCommand { get; }
+        public ICommand ResetViewCommand { get; }
+        public ICommand ClearCommand { get; }
+        #endregion
+
+        #region 私有字段
+        // 颜色调色盘（与 MonitorView 一致）
+        private static readonly OxyColor[] _palette =
+        {
+            OxyColors.SteelBlue, OxyColors.IndianRed, OxyColors.SeaGreen,
+            OxyColors.DarkOrange, OxyColors.MediumPurple, OxyColors.Goldenrod,
+            OxyColors.Teal, OxyColors.Crimson, OxyColors.OliveDrab
+        };
+        private int _colorIndex;
+        #endregion
+
+        public CurveRecallViewModel(IContainerProvider containerProvider) : base(containerProvider)
+        {
+            Plot = BuildEmptyPlot();
+            LoadCsvCommand = new DelegateCommand(OnLoadCsv);
+            ResetViewCommand = new DelegateCommand(OnResetView);
+            ClearCommand = new DelegateCommand(OnClear);
+        }
+
+        #region 命令处理
+        /// <summary>
+        /// 打开 CSV 文件对话框，解析数据并按 (MonitorName, Scope) 分组绘制曲线。
+        /// </summary>
+        private void OnLoadCsv()
+        {
+            try
+            {
+                var dlg = new Microsoft.Win32.OpenFileDialog
+                {
+                    Filter = "CSV 文件 (*.csv)|*.csv|所有文件|*.*",
+                    Title = "选择要加载的监测数据 CSV 文件"
+                };
+                if (dlg.ShowDialog() != true) return;
+
+                var records = ParseCsv(dlg.FileName);
+                if (records.Count == 0)
+                {
+                    StatusMessage = "CSV 文件为空或格式不正确";
+                    return;
+                }
+
+                // 按 (MonitorName, Scope) 分组
+                var groups = records.GroupBy(r => (r.MonitorName, r.Scope))
+                                    .OrderBy(g => g.Key.MonitorName)
+                                    .ThenBy(g => g.Key.Scope);
+
+                // 清空旧数据
+                ClearPlotAndChannels();
+
+                foreach (var group in groups)
+                {
+                    var color = _palette[_colorIndex % _palette.Length];
+                    _colorIndex++;
+
+                    string displayName = string.IsNullOrEmpty(group.Key.Scope)
+                        ? group.Key.MonitorName
+                        : $"{group.Key.MonitorName} [{group.Key.Scope}]";
+
+                    var channel = new CurveRecallChannelVM
+                    {
+                        MonitorName = group.Key.MonitorName,
+                        Scope = group.Key.Scope,
+                        DisplayName = displayName,
+                        Color = color,
+                        IsDisplayed = true
+                    };
+
+                    // 创建 LineSeries 并填充数据点
+                    channel.Series = new LineSeries
+                    {
+                        Title = displayName,
+                        Color = color,
+                        StrokeThickness = 1.5
+                    };
+
+                    // 按时间排序
+                    var sortedPoints = group.OrderBy(r => r.CreateTime);
+                    foreach (var point in sortedPoints)
+                    {
+                        channel.Series.Points.Add(new DataPoint(point.CreateTime.ToOADate(), point.MonitorValue));
+                    }
+
+                    channel.PropertyChanged += OnChannelPropertyChanged;
+
+                    Plot.Series.Add(channel.Series);
+                    Channels.Add(channel);
+                }
+
+                Plot.InvalidatePlot(true);
+                StatusMessage = $"已加载 {Path.GetFileName(dlg.FileName)}，共 {Channels.Count} 条曲线，{records.Count} 个数据点";
+                LoggerHelper.Info($"曲线回读：加载 {dlg.FileName}，{Channels.Count} 条曲线，{records.Count} 个数据点");
+            }
+            catch (Exception ex)
+            {
+                LoggerHelper.Error($"加载 CSV 失败：{ex.Message}");
+                StatusMessage = $"加载失败：{ex.Message}";
+            }
+        }
+
+        private void OnResetView()
+        {
+            Plot.ResetAllAxes();
+            Plot.InvalidatePlot(false);
+            StatusMessage = "视图已复原";
+        }
+
+        private void OnClear()
+        {
+            ClearPlotAndChannels();
+            Plot.InvalidatePlot(true);
+            StatusMessage = "已清空，请重新加载 CSV 文件";
+        }
+        #endregion
+
+        #region CSV 解析
+        /// <summary>
+        /// 解析 RecordView 导出的 CSV 文件，返回监测记录列表。
+        /// </summary>
+        private static List<MonitorRecord> ParseCsv(string path)
+        {
+            var results = new List<MonitorRecord>();
+
+            using var sr = new StreamReader(path, Encoding.UTF8);
+
+            // 读取表头
+            string? headerLine = sr.ReadLine();
+            if (headerLine == null) return results;
+
+            var headers = ParseCsvLine(headerLine);
+            int monitorNameIdx = headers.FindIndex(h => h.Trim() == "MonitorName");
+            int monitorValueIdx = headers.FindIndex(h => h.Trim() == "MonitorValue");
+            int scopeIdx = headers.FindIndex(h => h.Trim() == "Scope");
+            int createTimeIdx = headers.FindIndex(h => h.Trim() == "CreateTime");
+
+            if (monitorNameIdx < 0 || monitorValueIdx < 0 || scopeIdx < 0 || createTimeIdx < 0)
+                return results;
+
+            int maxIdx = Math.Max(monitorNameIdx, Math.Max(monitorValueIdx, Math.Max(scopeIdx, createTimeIdx)));
+
+            string? line;
+            while ((line = sr.ReadLine()) != null)
+            {
+                if (string.IsNullOrWhiteSpace(line)) continue;
+                var fields = ParseCsvLine(line);
+                if (fields.Count <= maxIdx) continue;
+
+                if (!double.TryParse(fields[monitorValueIdx].Trim(), out double value)) continue;
+                if (!DateTime.TryParse(fields[createTimeIdx].Trim(), out DateTime createTime)) continue;
+
+                results.Add(new MonitorRecord
+                {
+                    MonitorName = fields[monitorNameIdx].Trim(),
+                    MonitorValue = value,
+                    Scope = fields[scopeIdx].Trim(),
+                    CreateTime = createTime
+                });
+            }
+
+            return results;
+        }
+
+        /// <summary>
+        /// 解析单行 CSV，正确处理引号转义。
+        /// </summary>
+        private static List<string> ParseCsvLine(string line)
+        {
+            var fields = new List<string>();
+            bool inQuotes = false;
+            var sb = new StringBuilder();
+
+            for (int i = 0; i < line.Length; i++)
+            {
+                char c = line[i];
+                if (inQuotes)
+                {
+                    if (c == '"')
+                    {
+                        if (i + 1 < line.Length && line[i + 1] == '"')
+                        {
+                            sb.Append('"');
+                            i++;
+                        }
+                        else
+                        {
+                            inQuotes = false;
+                        }
+                    }
+                    else
+                    {
+                        sb.Append(c);
+                    }
+                }
+                else
+                {
+                    if (c == '"')
+                    {
+                        inQuotes = true;
+                    }
+                    else if (c == ',')
+                    {
+                        fields.Add(sb.ToString());
+                        sb.Clear();
+                    }
+                    else
+                    {
+                        sb.Append(c);
+                    }
+                }
+            }
+
+            fields.Add(sb.ToString());
+            return fields;
+        }
+        #endregion
+
+        #region OxyPlot 构建
+        /// <summary>
+        /// 构建空的 OxyPlot 模型（与 MonitorView 完全一致的配置）。
+        /// </summary>
+        private static PlotModel BuildEmptyPlot()
+        {
+            var pm = new PlotModel
+            {
+                Title = "曲线回读",
+                PlotAreaBorderColor = OxyColors.LightGray,
+                Background = OxyColors.White
+            };
+            pm.Axes.Add(new DateTimeAxis
+            {
+                Position = AxisPosition.Bottom,
+                Title = "时间",
+                StringFormat = "HH:mm:ss",
+                MajorGridlineStyle = LineStyle.Dot,
+                MinorGridlineStyle = LineStyle.None
+            });
+            pm.Axes.Add(new LinearAxis
+            {
+                Position = AxisPosition.Left,
+                Title = "值",
+                MajorGridlineStyle = LineStyle.Dot,
+                MinorGridlineStyle = LineStyle.None
+            });
+            pm.Legends.Add(new Legend
+            {
+                LegendPosition = LegendPosition.RightTop,
+                LegendBackground = OxyColor.FromAColor(200, OxyColors.White),
+                LegendBorder = OxyColors.LightGray
+            });
+            return pm;
+        }
+        #endregion
+
+        #region 辅助方法
+        private void OnChannelPropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName != nameof(CurveRecallChannelVM.IsDisplayed)) return;
+            if (sender is not CurveRecallChannelVM channel) return;
+
+            if (channel.IsDisplayed)
+            {
+                if (channel.Series != null && !Plot.Series.Contains(channel.Series))
+                {
+                    Plot.Series.Add(channel.Series);
+                }
+            }
+            else
+            {
+                if (channel.Series != null)
+                {
+                    Plot.Series.Remove(channel.Series);
+                }
+            }
+            Plot.InvalidatePlot(true);
+        }
+
+        private void ClearPlotAndChannels()
+        {
+            foreach (var ch in Channels)
+            {
+                ch.PropertyChanged -= OnChannelPropertyChanged;
+            }
+            Plot.Series.Clear();
+            Channels.Clear();
+            _colorIndex = 0;
+        }
+        #endregion
+
+        #region 生命周期
+        public override void OnNavigatedTo(NavigationContext navigationContext)
+        {
+        }
+
+        public void Dispose()
+        {
+            ClearPlotAndChannels();
+        }
+        #endregion
+    }
+
+    /// <summary>
+    /// CSV 监测记录（单行数据）。
+    /// </summary>
+    internal class MonitorRecord
+    {
+        public string MonitorName { get; set; } = string.Empty;
+        public double MonitorValue { get; set; }
+        public string Scope { get; set; } = string.Empty;
+        public DateTime CreateTime { get; set; }
+    }
+
+    /// <summary>
+    /// 曲线回读通道：MonitorName + Scope 唯一标识一条曲线。
+    /// </summary>
+    public class CurveRecallChannelVM : Prism.Mvvm.BindableBase
+    {
+        public string MonitorName { get; set; } = string.Empty;
+        public string Scope { get; set; } = string.Empty;
+        public string DisplayName { get; set; } = string.Empty;
+        public OxyColor Color { get; set; } = OxyColors.SteelBlue;
+
+        private bool _isDisplayed = true;
+        public bool IsDisplayed
+        {
+            get => _isDisplayed;
+            set => SetProperty(ref _isDisplayed, value);
+        }
+
+        public LineSeries? Series { get; set; }
+    }
+}

CurveModule/Views/CurveRecallView.xaml

@@ -0,0 +1,158 @@
+<UserControl x:Class="CurveModule.Views.CurveRecallView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:prism="http://prismlibrary.com/"
+             xmlns:oxy="http://oxyplot.org/wpf"
+             xmlns:converters="clr-namespace:UIShare.Converters;assembly=UIShare"
+             prism:ViewModelLocator.AutoWireViewModel="True"
+             mc:Ignorable="d"
+             d:DesignHeight="700"
+             d:DesignWidth="1200">
+    <UserControl.Resources>
+        <converters:LessThanConverter x:Key="LessThanConverter"/>
+    </UserControl.Resources>
+
+    <Border Background="#F5F7FA">
+        <Grid x:Name="RootGrid" Margin="8">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="Auto"/>
+            </Grid.RowDefinitions>
+
+            <!-- Row0：标题 -->
+            <TextBlock Grid.Row="0"
+                       Text="曲线回读"
+                       FontSize="20" FontWeight="Bold"
+                       Margin="4,0,0,8"/>
+
+            <!-- Row1：工具栏 -->
+            <Border Grid.Row="1"
+                    Background="White"
+                    BorderBrush="#DDD" BorderThickness="1"
+                    CornerRadius="4" Padding="8" Margin="0,0,0,6">
+                <StackPanel Orientation="Horizontal">
+                    <Button Content="📂 加载 CSV"
+                            Command="{Binding LoadCsvCommand}"
+                            Padding="12,4"/>
+                    <Button Content="↺ 复原视图"
+                            Command="{Binding ResetViewCommand}"
+                            Padding="12,4" Margin="6,0,0,0"
+                            ToolTip="按数据范围重置坐标轴缩放/平移"/>
+                    <Button Content="✕ 清空"
+                            Command="{Binding ClearCommand}"
+                            Padding="12,4" Margin="6,0,0,0"
+                            ToolTip="清空已加载的曲线数据"/>
+                </StackPanel>
+            </Border>
+
+            <!-- Row2：主体 -->
+            <Grid Grid.Row="2">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition>
+                        <ColumnDefinition.Style>
+                            <Style TargetType="ColumnDefinition">
+                                <Setter Property="Width" Value="260"/>
+                                <Style.Triggers>
+                                    <DataTrigger Binding="{Binding ActualWidth, ElementName=RootGrid, Converter={StaticResource LessThanConverter}, ConverterParameter=600}" Value="True">
+                                        <Setter Property="Width" Value="0"/>
+                                    </DataTrigger>
+                                </Style.Triggers>
+                            </Style>
+                        </ColumnDefinition.Style>
+                    </ColumnDefinition>
+                    <ColumnDefinition>
+                        <ColumnDefinition.Style>
+                            <Style TargetType="ColumnDefinition">
+                                <Setter Property="Width" Value="6"/>
+                                <Style.Triggers>
+                                    <DataTrigger Binding="{Binding ActualWidth, ElementName=RootGrid, Converter={StaticResource LessThanConverter}, ConverterParameter=600}" Value="True">
+                                        <Setter Property="Width" Value="0"/>
+                                    </DataTrigger>
+                                </Style.Triggers>
+                            </Style>
+                        </ColumnDefinition.Style>
+                    </ColumnDefinition>
+                    <ColumnDefinition Width="*"/>
+                </Grid.ColumnDefinitions>
+
+                <!-- 左侧：通道列表 -->
+                <Border Grid.Column="0"
+                        Background="White"
+                        BorderBrush="#DDD" BorderThickness="1"
+                        CornerRadius="4">
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="*"/>
+                            <RowDefinition Height="Auto"/>
+                        </Grid.RowDefinitions>
+
+                        <Border Grid.Row="0" Background="#ECEFF4" Padding="8,4">
+                            <TextBlock Text="曲线通道（勾选显示/隐藏）" FontWeight="Bold"/>
+                        </Border>
+
+                        <ListBox Grid.Row="1"
+                                 ItemsSource="{Binding Channels}"
+                                 SelectedItem="{Binding SelectedChannel}"
+                                 BorderThickness="0">
+                            <ListBox.ItemTemplate>
+                                <DataTemplate>
+                                    <StackPanel Margin="2">
+                                        <DockPanel>
+                                            <CheckBox IsChecked="{Binding IsDisplayed}"
+                                                      VerticalAlignment="Center"
+                                                      ToolTip="勾选=在图表上显示，取消=隐藏"/>
+                                            <Border Width="10" Height="10"
+                                                    CornerRadius="2"
+                                                    VerticalAlignment="Center"
+                                                    Margin="4,0,6,0">
+                                                <Border.Background>
+                                                    <SolidColorBrush Color="SteelBlue"/>
+                                                </Border.Background>
+                                            </Border>
+                                            <TextBlock Text="{Binding DisplayName}"
+                                                       VerticalAlignment="Center"
+                                                       TextTrimming="CharacterEllipsis"/>
+                                        </DockPanel>
+                                    </StackPanel>
+                                </DataTemplate>
+                            </ListBox.ItemTemplate>
+                        </ListBox>
+
+                        <TextBlock Grid.Row="2"
+                                   Text="{Binding StatusMessage}"
+                                   FontSize="11" Foreground="#666"
+                                   Margin="4,2" TextWrapping="Wrap"/>
+                    </Grid>
+                </Border>
+
+                <GridSplitter Grid.Column="1"
+                              HorizontalAlignment="Stretch"
+                              Background="Transparent"/>
+
+                <!-- 右侧：OxyPlot 图表 -->
+                <Border Grid.Column="2"
+                        Background="White"
+                        BorderBrush="#DDD" BorderThickness="1"
+                        CornerRadius="4">
+                    <oxy:PlotView Model="{Binding Plot}"
+                                  Background="Transparent"/>
+                </Border>
+            </Grid>
+
+            <!-- Row3：状态栏 -->
+            <Border Grid.Row="3"
+                    Background="#ECEFF4"
+                    Padding="8,4" Margin="0,6,0,0"
+                    CornerRadius="2">
+                <TextBlock Text="{Binding StatusMessage}"
+                           Foreground="#444"
+                           FontSize="12"/>
+            </Border>
+        </Grid>
+    </Border>
+</UserControl>

CurveModule/Views/CurveRecallView.xaml.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace CurveModule.Views
+{
+    /// <summary>
+    /// CurveRecallView.xaml 的交互逻辑
+    /// </summary>
+    public partial class CurveRecallView : UserControl
+    {
+        public CurveRecallView()
+        {
+            InitializeComponent();
+        }
+    }
+}

DeviceCommand/Devices/GantryControlTcp.cs

@@ -0,0 +1,540 @@
+using Common.Attributes;
+using DeviceCommand.Base;
+using Model.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Threading;
+
+namespace DeviceCommand.Devices
+{
+    [ADPCommand]
+    public class GantryControlTcp : ModbusTcp
+    {
+        private readonly byte _slaveAddress=1;
+
+        // 向后兼容：TcpDevice 即自身（继承自 ModbusTcp）
+        public ModbusTcp TcpDevice => this;
+
+        public GantryControlTcp(TcpConfig config) : base(config)
+        {
+
+        }
+
+        // =================================================================
+        // ------------------ Coil / Bit 状态与控制 (位元件) ------------------
+        // =================================================================
+        private const ushort ADDR_M_ESTOP = 20496;          // 0x5010: 紧停
+        private const ushort ADDR_M_X_STOP = 41;            // 0x29: X轴停止
+        private const ushort ADDR_M_Y_STOP = 42;            // 0x2A: Y轴停止
+        private const ushort ADDR_M_Z_STOP = 43;            // 0x2B: Z轴停止
+
+        private const ushort ADDR_M_X_START = 30;           // 0x1E: X轴指定位置启动
+        private const ushort ADDR_M_Y_START = 31;           // 0x1F: Y轴指定位置启动
+        private const ushort ADDR_M_Z_START = 35;           // 0x23: Z轴指定位置启动
+
+        private const ushort ADDR_M_HOME_TRIGGER = 100;     // 0x64: 回原点触发
+
+        // =================================================================
+        // ------------------ 轴使能控制 (HM 寄存器) ------------------
+        // =================================================================
+        private const ushort ADDR_HM_AXIS1_ENABLE = 49408;  // 0xC100: 轴1使能 (X轴)
+        private const ushort ADDR_HM_AXIS2_ENABLE = 49409;  // 0xC101: 轴2使能 (Y轴)
+        private const ushort ADDR_HM_AXIS3_ENABLE = 49410;  // 0xC102: 轴3使能 (Z轴)
+        private const ushort ADDR_HM_AXIS4_ENABLE = 49411;  // 0xC103: 轴4使能
+        private const ushort ADDR_HM_AXIS5_ENABLE = 49412;  // 0xC104: 轴5使能
+        private const ushort ADDR_HM_AXIS6_ENABLE = 49413;  // 0xC105: 轴6使能
+
+        // =================================================================
+        // ------------------ 速度与位置参数 (HD 32位数据寄存器) --------------
+        // =================================================================
+        private const ushort ADDR_HD_HOME_POS_SPEED = 41288;   // 0xA148: 原点定位速度 (32位)
+
+        // 轴原点位置
+        private const ushort ADDR_HD_X_HOME_POS = 41198;      // 0xA0EE: X轴原点位 (32位)
+        private const ushort ADDR_HD_Z_HOME_POS = 41208;      // 0xA0F8: Z轴原点位 (32位)
+        private const ushort ADDR_HD_Y_HOME_POS = 41218;      // 0xA102: Y轴原点位 (32位)
+
+        // 轴运行目标位置
+        private const ushort ADDR_HD_Y_TARGET = 41228;        // 0xA10C: Y轴指定位置 (32位)
+        private const ushort ADDR_HD_Z_TARGET = 41238;        // 0xA116: Z轴指定位置 (32位)
+        private const ushort ADDR_HD_X_TARGET = 41248;        // 0xA120: X轴指定位置 (32位)
+
+        // 轴运行速度
+        private const ushort ADDR_HD_X_SPEED = 41318;         // 0xA166: X轴速度 (32位)
+        private const ushort ADDR_HD_Z_SPEED = 41328;         // 0xA170: Z轴速度 (32位)
+        private const ushort ADDR_HD_Y_SPEED = 41338;         // 0xA17A: Y轴速度 (32位)
+
+        // =================================================================
+        // ------------------ 轴绝对位置（只读，相对原点）------------------
+        // =================================================================
+        private const ushort ADDR_ABS_AXIS1_POS = 47232;      // 轴1绝对位置 (32位)
+        private const ushort ADDR_ABS_AXIS2_POS = 47236;      // 轴2绝对位置 (32位)
+        private const ushort ADDR_ABS_AXIS3_POS = 47240;      // 轴3绝对位置 (32位)
+        private const ushort ADDR_ABS_AXIS4_POS = 47244;      // 轴4绝对位置 (32位)
+        private const ushort ADDR_ABS_AXIS5_POS = 47248;      // 轴5绝对位置 (32位)
+        private const ushort ADDR_ABS_AXIS6_POS = 47252;      // 轴6绝对位置 (32位)
+
+        // =================================================================
+        // ------------------ 核心控制逻辑与参数读写 ------------------------
+        // =================================================================
+
+        /// <summary>
+        /// 轴使能控制
+        /// </summary>
+        /// <param name="axis">轴编号 (1 - 6)</param>
+        public async Task SetAxisEnableAsync(int axis, bool enable, CancellationToken ct = default)
+        {
+            ushort address = axis switch
+            {
+                1 => ADDR_HM_AXIS1_ENABLE,
+                2 => ADDR_HM_AXIS2_ENABLE,
+                3 => ADDR_HM_AXIS3_ENABLE,
+                4 => ADDR_HM_AXIS4_ENABLE,
+                5 => ADDR_HM_AXIS5_ENABLE,
+                6 => ADDR_HM_AXIS6_ENABLE,
+                _ => throw new ArgumentException("轴通道错误，仅支持 1 - 6", nameof(axis))
+            };
+
+            await WriteSingleCoilAsync(_slaveAddress, address, enable, ct);
+        }
+
+        /// <summary>
+        /// 读取指定轴的使能状态
+        /// </summary>
+        /// <param name="axis">1: X轴, 2: Y轴, 3: Z轴</param>
+        public async Task<bool> GetAxisEnableAsync(int axis, CancellationToken ct = default)
+        {
+            ushort address = axis switch
+            {
+                1 => ADDR_HM_AXIS1_ENABLE,
+                2 => ADDR_HM_AXIS2_ENABLE,
+                3 => ADDR_HM_AXIS3_ENABLE,
+                _ => throw new ArgumentException("轴通道错误，仅支持 1(X), 2(Y), 3(Z)", nameof(axis))
+            };
+
+            bool[] coils = await ReadCoilsAsync(_slaveAddress, address, 1, ct);
+            return coils != null && coils.Length > 0 && coils[0];
+        }
+
+        /// <summary>
+        /// 同时设置 X/Y/Z 轴的原点位置（带各自独立的范围检查）
+        /// </summary>
+        /// <param name="xPos">X轴原点位置 (范围: 0 ~ 50000)</param>
+        /// <param name="yPos">Y轴原点位置 (范围: 0 ~ 50000)</param>
+        /// <param name="zPos">Z轴原点位置 (范围: 0 ~ 20000)</param>
+        public async Task SetHomePositionAsync(int xPos, int yPos, int zPos, CancellationToken ct = default)
+        {
+            if (xPos < 0 || xPos > 50000)
+                throw new ArgumentOutOfRangeException(nameof(xPos), $"X轴原点设置值 [{xPos}] 超出合法范围 (0 - 50000)");
+
+            if (yPos < 0 || yPos > 50000)
+                throw new ArgumentOutOfRangeException(nameof(yPos), $"Y轴原点设置值 [{yPos}] 超出合法范围 (0 - 50000)");
+
+            if (zPos < 0 || zPos > 20000)
+                throw new ArgumentOutOfRangeException(nameof(zPos), $"Z轴原点设置值 [{zPos}] 超出合法范围 (0 - 20000)");
+
+            await WriteMultipleRegistersAsync(_slaveAddress, ADDR_HD_X_HOME_POS, Int32ToUshorts(xPos), ct);
+            await WriteMultipleRegistersAsync(_slaveAddress, ADDR_HD_Y_HOME_POS, Int32ToUshorts(yPos), ct);
+            await WriteMultipleRegistersAsync(_slaveAddress, ADDR_HD_Z_HOME_POS, Int32ToUshorts(zPos), ct);
+        }
+
+        /// <summary>
+        /// 批量查询当前 X、Y、Z 三轴设定的原点位置值
+        /// </summary>
+        /// <returns>返回包含三轴原点位置的元组 (X, Y, Z)</returns>
+        public async Task<(int X, int Y, int Z)> GetHomePositionAsync(CancellationToken ct = default)
+        {
+            // 41218(Y) - 41198(X) = 20，加Y轴自身的 2 个寄存器，共批量读取 22 个连续寄存器
+            ushort[] registers = await ReadHoldingRegistersAsync(_slaveAddress, ADDR_HD_X_HOME_POS, 22, ct);
+
+            if (registers == null || registers.Length < 22)
+                throw new InvalidOperationException("从 PLC 读取三轴原点位置失败，返回数据长度不足。");
+
+            int xHomePos = UshortsToInt32(new ushort[] { registers[0], registers[1] });
+            int zHomePos = UshortsToInt32(new ushort[] { registers[10], registers[11] });
+            int yHomePos = UshortsToInt32(new ushort[] { registers[20], registers[21] });
+
+            return (xHomePos, yHomePos, zHomePos);
+        }
+
+        /// <summary>
+        /// 设置回原点定位速度（带 0 - 100000 范围检查）
+        /// </summary>
+        public async Task SetHomePositionSpeedAsync(int speed, CancellationToken ct = default)
+        {
+            if (speed < 0 || speed > 100000)
+                throw new ArgumentOutOfRangeException(nameof(speed), $"回原点定位速度值 [{speed}] 超出合法范围 (0 - 100000)");
+
+            await WriteMultipleRegistersAsync(_slaveAddress, ADDR_HD_HOME_POS_SPEED, Int32ToUshorts(speed), ct);
+        }
+
+        /// <summary>
+        /// 查询当前设定的回原点定位速度
+        /// </summary>
+        public async Task<int> GetHomePositionSpeedAsync(CancellationToken ct = default)
+        {
+            ushort[] registers = await ReadHoldingRegistersAsync(_slaveAddress, ADDR_HD_HOME_POS_SPEED, 2, ct);
+
+            if (registers == null || registers.Length < 2)
+                throw new InvalidOperationException("从 PLC 读取回原点定位速度失败，返回数据长度不足。");
+
+            return UshortsToInt32(registers);
+        }
+
+        /// <summary>
+        /// 设置指定轴的运行速度（带 0 - 100000 范围检查）
+        /// </summary>
+        /// <param name="axis">1: X轴, 2: Y轴, 3: Z轴</param>
+        public async Task SetAxisSpeedAsync(int axis, int speed, CancellationToken ct = default)
+        {
+            if (speed < 0 || speed > 100000)
+                throw new ArgumentOutOfRangeException(nameof(speed), $"轴速度设置值 [{speed}] 超出合法范围 (0 - 100000)");
+
+            ushort address = axis switch
+            {
+                1 => ADDR_HD_X_SPEED,
+                2 => ADDR_HD_Y_SPEED,
+                3 => ADDR_HD_Z_SPEED,
+                _ => throw new ArgumentException("轴通道错误，仅支持 1(X), 2(Y), 3(Z)", nameof(axis))
+            };
+
+            await WriteMultipleRegistersAsync(_slaveAddress, address, Int32ToUshorts(speed), ct);
+        }
+
+        /// <summary>
+        /// 读取指定轴当前设定的运行速度
+        /// </summary>
+        public async Task<int> GetAxisSpeedAsync(int axis, CancellationToken ct = default)
+        {
+            ushort address = axis switch
+            {
+                1 => ADDR_HD_X_SPEED,
+                2 => ADDR_HD_Y_SPEED,
+                3 => ADDR_HD_Z_SPEED,
+                _ => throw new ArgumentException("轴通道错误，仅支持 1(X), 2(Y), 3(Z)", nameof(axis))
+            };
+
+            ushort[] registers = await ReadHoldingRegistersAsync(_slaveAddress, address, 2, ct);
+            if (registers == null || registers.Length < 2)
+                throw new InvalidOperationException($"从 PLC 读取轴 {axis} 速度失败。");
+
+            return UshortsToInt32(registers);
+        }
+
+        /// <summary>
+        /// 写入指定轴的目标位置（动态安全校验：目标位置不能超过 [轴最大物理极限 - 当前轴原点设置值]）
+        /// </summary>
+        public async Task SetAxisTargetPositionAsync(int axis, int targetPos, CancellationToken ct = default)
+        {
+            var (xHome, yHome, zHome) = await GetHomePositionAsync(ct);
+
+            ushort targetAddress;
+            int maxLimit;
+            int currentHomePos;
+
+            switch (axis)
+            {
+                case 1:
+                    targetAddress = ADDR_HD_X_TARGET;
+                    maxLimit = 50000;
+                    currentHomePos = xHome;
+                    break;
+                case 2:
+                    targetAddress = ADDR_HD_Y_TARGET;
+                    maxLimit = 50000;
+                    currentHomePos = yHome;
+                    break;
+                case 3:
+                    targetAddress = ADDR_HD_Z_TARGET;
+                    maxLimit = 20000;
+                    currentHomePos = zHome;
+                    break;
+                default:
+                    throw new ArgumentException("轴通道错误，仅支持 1(X), 2(Y), 3(Z)", nameof(axis));
+            }
+
+            int allowedMaxLimit = maxLimit - currentHomePos;
+
+            if (targetPos < 0 || targetPos > allowedMaxLimit)
+            {
+                throw new ArgumentOutOfRangeException(
+                    nameof(targetPos),
+                    $"轴 {axis} 目标位置 [{targetPos}] 不合法！当前原点为 [{currentHomePos}]，允许的有效写入范围为: 0 - {allowedMaxLimit}"
+                );
+            }
+
+            await WriteMultipleRegistersAsync(_slaveAddress, targetAddress, Int32ToUshorts(targetPos), ct);
+        }
+
+        /// <summary>
+        /// 读取指定轴当前设定的目标指定位置
+        /// </summary>
+        public async Task<int> GetAxisTargetPositionAsync(int axis, CancellationToken ct = default)
+        {
+            ushort address = axis switch
+            {
+                1 => ADDR_HD_X_TARGET,
+                2 => ADDR_HD_Y_TARGET,
+                3 => ADDR_HD_Z_TARGET,
+                _ => throw new ArgumentException("轴通道错误，仅支持 1(X), 2(Y), 3(Z)", nameof(axis))
+            };
+
+            ushort[] registers = await ReadHoldingRegistersAsync(_slaveAddress, address, 2, ct);
+
+            if (registers == null || registers.Length < 2)
+                throw new InvalidOperationException($"从 PLC 读取轴 {axis} 目标位置失败。");
+
+            return UshortsToInt32(registers);
+        }
+
+        /// <summary>
+        /// 设置系统紧停锁定状态 (true: 锁定激活, false: 解除锁定)
+        /// </summary>
+        public async Task SetEStopStateAsync(bool state, CancellationToken ct = default)
+        {
+            await WriteSingleCoilAsync(_slaveAddress, ADDR_M_ESTOP, state, ct);
+        }
+
+        /// <summary>
+        /// 设置指定轴的停止控制状态 (true: 持续输出停止信号, false: 释放停止信号)
+        /// </summary>
+        public async Task SetStopStateAsync(int axis, bool state, CancellationToken ct = default)
+        {
+            ushort address = axis switch
+            {
+                1 => ADDR_M_X_STOP,
+                2 => ADDR_M_Y_STOP,
+                3 => ADDR_M_Z_STOP,
+                _ => throw new ArgumentException("轴通道错误，仅支持 1(X), 2(Y), 3(Z)", nameof(axis))
+            };
+
+            await WriteSingleCoilAsync(_slaveAddress, address, state, ct);
+        }
+
+        /// <summary>
+        /// 全局回零（安全校验版：先检查回原点速度是否为 0，为0则拒绝触发）
+        /// </summary>
+        public async Task HomeAsync(CancellationToken ct = default)
+        {
+            int currentSpeed = await GetHomePositionSpeedAsync(ct);
+
+            if (currentSpeed == 0)
+                throw new InvalidOperationException("无法触发回原点！当前回原点定位速度为 0，请先设置合法的回零速度。");
+
+            await TriggerCoilAsync(ADDR_M_HOME_TRIGGER, ct);
+        }
+
+        /// <summary>
+        /// 单轴指定位置启动（含速度判定、使能自动补齐、动作目标位置独立范围校验）
+        /// </summary>
+        /// <param name="axis">1: X轴, 2: Y轴, 3: Z轴</param>
+        public async Task StartSingleAxisAsync(int axis, CancellationToken ct = default)
+        {
+            ushort startAddress;
+            int maxLimit;
+            int currentHomePos;
+
+            // 1. 获取基础参数与校验边界
+            var (xHome, yHome, zHome) = await GetHomePositionAsync(ct);
+            switch (axis)
+            {
+                case 1:
+                    startAddress = ADDR_M_X_START;
+                    maxLimit = 50000;
+                    currentHomePos = xHome;
+                    break;
+                case 2:
+                    startAddress = ADDR_M_Y_START;
+                    maxLimit = 50000;
+                    currentHomePos = yHome;
+                    break;
+                case 3:
+                    startAddress = ADDR_M_Z_START;
+                    maxLimit = 20000;
+                    currentHomePos = zHome;
+                    break;
+                default:
+                    throw new ArgumentException("轴通道错误，仅支持 1(X), 2(Y), 3(Z)", nameof(axis));
+            }
+
+            // 2. 检查动作轴的速度
+            int currentSpeed = await GetAxisSpeedAsync(axis, ct);
+            if (currentSpeed == 0)
+                throw new InvalidOperationException($"轴 {axis} 无法启动！当前设定速度为 0。");
+
+            // 3. 检查动作轴使能，若为 false 则自动补写 true 激活驱动器
+            bool isEnabled = await GetAxisEnableAsync(axis, ct);
+            if (!isEnabled)
+            {
+                await SetAxisEnableAsync(axis, true, ct);
+                await Task.Delay(100, ct); // 等待硬件继电器响应与伺服驱动就绪
+            }
+
+            // 4. 精准独立校验当前需要动作轴的目标定位是否越界
+            int currentTarget = await GetAxisTargetPositionAsync(axis, ct);
+            int allowedMaxLimit = maxLimit - currentHomePos;
+            if (currentTarget < 0 || currentTarget > allowedMaxLimit)
+            {
+                throw new ArgumentOutOfRangeException($"轴 {axis} 无法启动！当前指定目标位置 [{currentTarget}] 超过了允许的最大安全极限值 [{allowedMaxLimit}]。");
+            }
+
+            // 5. 校验完成，边缘触发点动启动
+            await TriggerCoilAsync(startAddress, ct);
+        }
+
+        /// <summary>
+        /// 三轴同时启动（全开：严格校验全部运行轴速度、批量检测与补正1~6号轴使能、联动校验三轴目标范围极限）
+        /// </summary>
+        public async Task StartAllAxesAsync(CancellationToken ct = default)
+        {
+            // 1. 一次性读取三轴速度，严禁任何一轴速度为 0
+            int xSpeed = await GetAxisSpeedAsync(1, ct);
+            int ySpeed = await GetAxisSpeedAsync(2, ct);
+            int zSpeed = await GetAxisSpeedAsync(3, ct);
+
+            if (xSpeed == 0 || ySpeed == 0 || zSpeed == 0)
+                throw new InvalidOperationException($"无法全开启动！存在运行速度为 0 的轴。当前速度 -> X:{xSpeed}, Y:{ySpeed}, Z:{zSpeed}");
+
+            // 2. 批量读取 1 ~ 6 号轴连续的使能状态线圈，极大地优化网络性能
+            bool[] enableStates = await ReadCoilsAsync(_slaveAddress, ADDR_HM_AXIS1_ENABLE, 6, ct);
+            if (enableStates == null || enableStates.Length < 6)
+                throw new InvalidOperationException("从 PLC 读取 1~6 号轴使能状态失败。");
+
+            bool hasModifiedEnable = false;
+            ushort[] enableAddresses = { ADDR_HM_AXIS1_ENABLE, ADDR_HM_AXIS2_ENABLE, ADDR_HM_AXIS3_ENABLE, ADDR_HM_AXIS4_ENABLE, ADDR_HM_AXIS5_ENABLE, ADDR_HM_AXIS6_ENABLE };
+
+            for (int i = 0; i < 6; i++)
+            {
+                if (!enableStates[i])
+                {
+                    await WriteSingleCoilAsync(_slaveAddress, enableAddresses[i], true, ct);
+                    hasModifiedEnable = true;
+                }
+            }
+
+            // 如果执行过使能补齐补齐写入，在循环外进行统一延时，保证PLC时序安全
+            if (hasModifiedEnable)
+                await Task.Delay(100, ct);
+
+            // 3. 获取三轴原点及当前设定的目标指定位置
+            var (xHome, yHome, zHome) = await GetHomePositionAsync(ct);
+
+            int xTarget = await GetAxisTargetPositionAsync(1, ct);
+            int yTarget = await GetAxisTargetPositionAsync(2, ct);
+            int zTarget = await GetAxisTargetPositionAsync(3, ct);
+
+            // X轴安全范围联动校验
+            int xMaxAllowed = 50000 - xHome;
+            if (xTarget < 0 || xTarget > xMaxAllowed)
+                throw new ArgumentOutOfRangeException(nameof(xTarget), $"X轴目标位置 [{xTarget}] 越界，当前原点下最大范围 0-{xMaxAllowed}");
+
+            // Y轴安全范围联动校验
+            int yMaxAllowed = 50000 - yHome;
+            if (yTarget < 0 || yTarget > yMaxAllowed)
+                throw new ArgumentOutOfRangeException(nameof(yTarget), $"Y轴目标位置 [{yTarget}] 越界，当前原点下最大范围 0-{yMaxAllowed}");
+
+            // Z轴安全范围联动校验
+            int zMaxAllowed = 20000 - zHome;
+            if (zTarget < 0 || zTarget > zMaxAllowed)
+                throw new ArgumentOutOfRangeException(nameof(zTarget), $"Z轴目标位置 [{zTarget}] 越界，当前原点下最大范围 0-{zMaxAllowed}");
+
+            // 4. 全部联动校验通过，三轴点动同步启动
+            await WriteSingleCoilAsync(_slaveAddress, ADDR_M_X_START, true, ct);
+            await WriteSingleCoilAsync(_slaveAddress, ADDR_M_Y_START, true, ct);
+            await WriteSingleCoilAsync(_slaveAddress, ADDR_M_Z_START, true, ct);
+
+            await Task.Delay(100, ct); // 保持高电平状态以适配 PLC 扫描周期
+
+            await WriteSingleCoilAsync(_slaveAddress, ADDR_M_X_START, false, ct);
+            await WriteSingleCoilAsync(_slaveAddress, ADDR_M_Y_START, false, ct);
+            await WriteSingleCoilAsync(_slaveAddress, ADDR_M_Z_START, false, ct);
+        }
+
+        #region 内部高低字工具转化方法
+
+        /// <summary>
+        /// 触发点动脉冲信号（置 1 后，等待 100ms 自动置 0 释放）
+        /// </summary>
+        private async Task TriggerCoilAsync(ushort address, CancellationToken ct = default)
+        {
+            await WriteSingleCoilAsync(_slaveAddress, address, true, ct);
+            await Task.Delay(100, ct);
+            await WriteSingleCoilAsync(_slaveAddress, address, false, ct);
+        }
+
+        /// <summary>
+        /// 将 32 位整型数据转换为 Modbus 的 2 个 16 位无符号整数（低字在前 CDAB 格式）
+        /// </summary>
+        private ushort[] Int32ToUshorts(int value)
+        {
+            ushort lowWord = (ushort)(value & 0xFFFF);
+            ushort highWord = (ushort)((value >> 16) & 0xFFFF);
+            return new ushort[] { lowWord, highWord };
+        }
+
+        /// <summary>
+        /// 将 Modbus 的 2 个 16 位无符号整数转换为 32 位整型（低字在前 CDAB 格式）
+        /// </summary>
+        private int UshortsToInt32(ushort[] registers)
+        {
+            uint lowWord = registers[0];
+            uint highWord = registers[1];
+            return (int)((highWord << 16) | lowWord);
+        }
+
+        #endregion
+
+        #region 轴绝对位置读取（只读）
+
+        /// <summary>
+        /// 读取指定轴的绝对位置（相对原点的实时位置，只读）
+        /// </summary>
+        /// <param name="axis">轴编号 (1-6)</param>
+        public async Task<int> GetAbsolutePositionAsync(int axis, CancellationToken ct = default)
+        {
+            ushort address = axis switch
+            {
+                1 => ADDR_ABS_AXIS1_POS,
+                2 => ADDR_ABS_AXIS2_POS,
+                3 => ADDR_ABS_AXIS3_POS,
+                4 => ADDR_ABS_AXIS4_POS,
+                5 => ADDR_ABS_AXIS5_POS,
+                6 => ADDR_ABS_AXIS6_POS,
+                _ => throw new ArgumentException("轴编号错误，仅支持 1-6", nameof(axis))
+            };
+
+            ushort[] registers = await ReadHoldingRegistersAsync(_slaveAddress, address, 2, ct);
+            if (registers == null || registers.Length < 2)
+                throw new InvalidOperationException($"读取轴 {axis} 绝对位置失败。");
+
+            return UshortsToInt32(registers);
+        }
+
+        /// <summary>
+        /// 批量读取 1-6 轴的绝对位置（一次性读取 22 个寄存器，高效）
+        /// </summary>
+        /// <returns>返回 6 轴绝对位置元组</returns>
+        public async Task<(int Axis1, int Axis2, int Axis3, int Axis4, int Axis5, int Axis6)> GetAllAbsolutePositionsAsync(CancellationToken ct = default)
+        {
+            // 从 47232 开始连续读取 22 个寄存器（覆盖 47232-47253）
+            ushort[] registers = await ReadHoldingRegistersAsync(_slaveAddress, ADDR_ABS_AXIS1_POS, 22, ct);
+            if (registers == null || registers.Length < 22)
+                throw new InvalidOperationException("批量读取 6 轴绝对位置失败，返回数据长度不足。");
+
+            // 每轴间隔 4 个寄存器（2个数据 + 2个间隙），提取各轴数据
+            int axis1 = UshortsToInt32(new ushort[] { registers[0], registers[1] });
+            int axis2 = UshortsToInt32(new ushort[] { registers[4], registers[5] });
+            int axis3 = UshortsToInt32(new ushort[] { registers[8], registers[9] });
+            int axis4 = UshortsToInt32(new ushort[] { registers[12], registers[13] });
+            int axis5 = UshortsToInt32(new ushort[] { registers[16], registers[17] });
+            int axis6 = UshortsToInt32(new ushort[] { registers[20], registers[21] });
+
+            return (axis1, axis2, axis3, axis4, axis5, axis6);
+        }
+
+        #endregion
+    }
+}

DeviceCommand/Devices/IOBoard.cs

@@ -9,9 +9,9 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DeviceCommand.Device
+namespace DeviceCommand.Devices
 {
-    [ADPCommand]
+    //[ADPCommand]
     public class IOBoard : ModbusTcp
     {
         

DeviceCommand/Devices/IOBoardGroup.cs

@@ -0,0 +1,160 @@
+using Common.Attributes;
+using Model.Models;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using System.Threading;
+using DeviceCommand.Base;
+using DeviceCommand.Devices;
+using System.ComponentModel;
+
+namespace DeviceCommand.Devices
+{
+    /// <summary>
+    /// 系统控制功能类型枚举 (中文)
+    /// </summary>
+    public enum 功能动作 : byte
+    {
+        单相充电,
+        抛负载,
+        短路测试,
+        蜂鸣器报警
+    }
+
+    /// <summary>
+    /// 精简后的 IO 端口信息结构体
+    /// </summary>
+    public struct IoPortInfo
+    {
+        public int ModuleIndex { get; set; }   // IO板卡/模块序号 (1 或 2)
+        public ushort Address { get; set; }    // 转换为 Modbus 的线圈相对偏移地址 (Y1->0, Y2->1)
+
+        public IoPortInfo(int moduleIndex, ushort address)
+        {
+            ModuleIndex = moduleIndex;
+            Address = address;
+        }
+    }
+
+    [ADPCommand]
+    public class IOBoardGroup
+    {
+        // 声明底层的 2 个 IO 板卡实例
+        public IOBoard Board1 { get; private set; }
+        public IOBoard Board2 { get; private set; }
+
+        private readonly byte _slaveAddress = 1; // 默认 Modbus 从站号为 1
+
+        // 核心：严格对齐图片数据的双层嵌套配置字典 (2个模块，1-8台架)
+        private static readonly Dictionary<int, Dictionary<功能动作, IoPortInfo>> IoMapping
+            = new Dictionary<int, Dictionary<功能动作, IoPortInfo>>()
+        {
+            { 1, new Dictionary<功能动作, IoPortInfo> {
+                { 功能动作.单相充电,       new IoPortInfo(1, 5) }, // Y6 -> 5
+                { 功能动作.抛负载,         new IoPortInfo(1, 0) }, // Y1 -> 0
+                { 功能动作.短路测试,       new IoPortInfo(1, 1) }, // Y2 -> 1
+                { 功能动作.蜂鸣器报警,     new IoPortInfo(2, 15) }  // Y9 -> 8
+            }},
+            { 2, new Dictionary<功能动作, IoPortInfo> {
+                { 功能动作.单相充电,       new IoPortInfo(1, 6) }, // Y7 -> 6
+                { 功能动作.抛负载,         new IoPortInfo(1, 2) }, // Y3 -> 2
+                { 功能动作.短路测试,       new IoPortInfo(1, 1) }, // Y2 -> 1
+                { 功能动作.蜂鸣器报警,     new IoPortInfo(2, 14) }  // Y10 -> 9
+            }},
+            { 3, new Dictionary<功能动作, IoPortInfo> {
+                { 功能动作.单相充电,       new IoPortInfo(1, 7) }, // Y8 -> 7
+                { 功能动作.抛负载,         new IoPortInfo(1, 3) }, // Y4 -> 3
+                { 功能动作.短路测试,       new IoPortInfo(1, 1) }, // Y2 -> 1
+                { 功能动作.蜂鸣器报警,     new IoPortInfo(2, 13) } // Y11 -> 10
+            }},
+            { 4, new Dictionary<功能动作, IoPortInfo> {
+                { 功能动作.单相充电,       new IoPortInfo(1, 8) }, // Y9 -> 8
+                { 功能动作.抛负载,         new IoPortInfo(1, 4) }, // Y5 -> 4
+                { 功能动作.短路测试,       new IoPortInfo(1, 1) }, // Y2 -> 1
+                { 功能动作.蜂鸣器报警,     new IoPortInfo(2, 12) } // Y12 -> 11
+            }},
+            { 5, new Dictionary<功能动作, IoPortInfo> {
+                { 功能动作.单相充电,       new IoPortInfo(2, 4) }, // Y5 -> 4
+                { 功能动作.抛负载,         new IoPortInfo(2, 0) }, // Y1 -> 0
+                { 功能动作.短路测试,       new IoPortInfo(1, 1) }, // Y2 -> 1
+                { 功能动作.蜂鸣器报警,     new IoPortInfo(2, 11) } // Y13 -> 12
+            }},
+            { 6, new Dictionary<功能动作, IoPortInfo> {
+                { 功能动作.单相充电,       new IoPortInfo(2, 5) }, // Y6 -> 5
+                { 功能动作.抛负载,         new IoPortInfo(2, 1) }, // Y2 -> 1
+                { 功能动作.短路测试,       new IoPortInfo(1, 1) }, // Y2 -> 1
+                { 功能动作.蜂鸣器报警,     new IoPortInfo(2, 10) } // Y14 -> 13
+            }},
+            { 7, new Dictionary<功能动作, IoPortInfo> {
+                { 功能动作.单相充电,       new IoPortInfo(2, 6) }, // Y7 -> 6
+                { 功能动作.抛负载,         new IoPortInfo(2, 2) }, // Y3 -> 2
+                { 功能动作.短路测试,       new IoPortInfo(1, 1) }, // Y2 -> 1
+                { 功能动作.蜂鸣器报警,     new IoPortInfo(2, 9) } // Y15 -> 14
+            }},
+            { 8, new Dictionary<功能动作, IoPortInfo> {
+                { 功能动作.单相充电,       new IoPortInfo(2, 7) }, // Y8 -> 7
+                { 功能动作.抛负载,         new IoPortInfo(2, 3) }, // Y4 -> 3
+                { 功能动作.短路测试,       new IoPortInfo(1, 1) }, // Y2 -> 1
+                { 功能动作.蜂鸣器报警,     new IoPortInfo(2, 8) } // Y16 -> 15
+            }}
+        };
+
+        public IOBoardGroup(IOBoard board1, IOBoard board2)
+        {
+            Board1 = board1 ?? throw new ArgumentNullException(nameof(board1), "IOBoard Board1 实例不能为空。");
+            Board2 = board2 ?? throw new ArgumentNullException(nameof(board2), "IOBoard Board2 实例不能为空。");
+        }
+
+
+
+        /// <summary>
+        /// 执行指定台架的功能动作控制（带高低电平开关及底层安全互锁）
+        /// </summary>
+        /// <param name="台架序号">台架/工位序号 (1 - 8)</param>
+        /// <param name="动作">控制功能类型 (单相充电, 抛负载, 短路测试, 蜂鸣器报警)</param>
+        /// <param name="开关状态">开关状态 (true: 开启吸合, false: 关闭断开)</param>
+        /// <param name="取消令牌">异步取消令牌</param>
+        public async Task 执行台架动作Async(int 台架序号, 功能动作 动作, bool 开关状态, CancellationToken 取消令牌 = default)
+        {
+            // 1. 根据传入的台架序号和动作检索字典映射关系
+            if (!IoMapping.TryGetValue(台架序号, out var 动作字典) || !动作字典.TryGetValue(动作, out var io信息))
+            {
+                throw new ArgumentException($"未找到台架 [{台架序号}] 对应功能 [{动作}] 的 IO 点位映射配置。");
+            }
+
+            // 2. 软件防错高危互锁逻辑
+            if (开关状态)
+            {
+                if (动作 == 功能动作.单相充电)
+                {
+                    var 短路点位 = IoMapping[台架序号][功能动作.短路测试];
+                    await GetBoardInstance(短路点位.ModuleIndex).写输出开关(_slaveAddress, 短路点位.Address, false);
+                }
+                else if (动作 == 功能动作.短路测试)
+                {
+                    var 充电点位 = IoMapping[台架序号][功能动作.单相充电];
+                    await GetBoardInstance(充电点位.ModuleIndex).写输出开关(_slaveAddress, 充电点位.Address, false);
+                }
+            }
+
+            // 3. 动态获取目标板卡实例并直接驱动开关端口
+            IOBoard 目标板卡 = GetBoardInstance(io信息.ModuleIndex);
+            await 目标板卡.写输出开关(_slaveAddress, io信息.Address, 开关状态);
+        }
+
+        /// <summary>
+        /// 内部路由辅助方法：根据板卡索引安全获取当前连接的实例对象
+        /// </summary>
+        private IOBoard GetBoardInstance(int moduleIndex)
+        {
+            IOBoard board = moduleIndex switch
+            {
+                1 => Board1,
+                2 => Board2,
+                _ => throw new ArgumentOutOfRangeException(nameof(moduleIndex), "非法的板卡序号，系统仅支持 1# 和 2# 模块。")
+            };
+
+            return board ?? throw new InvalidOperationException($"IO板卡模块 [{moduleIndex}#] 尚未完成初始化，无法建立总线通信。");
+        }
+    }
+}

DeviceCommand/Devices/IT7800E.cs

@@ -6,54 +6,70 @@ using System.Globalization;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace DeviceCommand.Device
+namespace DeviceCommand.Devices
 {
+    #region 枚举定义
+
+    /// <summary>
+    /// 电源电气/耦合模式
+    /// </summary>
+    public enum PowerCouplingMode
+    {
+        /// <summary> 纯交流模式 </summary>
+        AC,
+        /// <summary> 纯直流模式 </summary>
+        DC,
+        /// <summary> 交直流混合模式 </summary>
+        ACDC,
+        /// <summary> 直交流混合模式 </summary>
+        DCAC
+    }
+
+    /// <summary>
+    /// 设备操作运行角色/模式
+    /// </summary>
+    public enum DeviceOperationMode
+    {
+        /// <summary> 电压源模式（常规源） </summary>
+        VOLTage,
+        /// <summary> 电子负载模式（放电拉载） </summary>
+        LOAD,
+        /// <summary> 电流源模式 </summary>
+        CURRent
+    }
+
+    #endregion
+
     [ADPCommand]
     public class IT7800E : Tcp
     {
-        //只有一个，八台产品一起用一个
-        // 根据通用 SCPI 指令规范，使用换行符 (ASCII 字符 LF，即 \n) 作为标准结束符
+        // 八台产品共用一个，使用换行符 \n (ASCII 0x0A) 作为 SCPI 结束符[cite: 1]
         private const string ScpiDelimiter = "\n";
 
-        /// <summary>
-        /// 构造函数：传入 <see cref="TcpConfig"/> 一次性初始化 IT7800E 交直流电源通信参数。
-        /// </summary>
         public IT7800E(TcpConfig config) : base(config)
         {
         }
 
         #region 1. IEEE 488.2 公共命令
 
-        /// <summary>
-        /// 清除状态命令。清除标准事件状态寄存器和错误队列
-        /// </summary>
         public virtual async Task 清除错误队列和状态字节(CancellationToken ct = default)
         {
-            await SendAsync($"*CLS{ScpiDelimiter}", ct);
+            await SendAsync($"*CLS{ScpiDelimiter}", ct); //[cite: 1]
         }
 
-        /// <summary>
-        /// 读取电源识别字符串（制造商、产品型号、系统 SN、软件版本号）
-        /// </summary>
         public virtual async Task<string> 查询设备标识(CancellationToken ct = default)
         {
-            return await WriteReadAsync($"*IDN?{ScpiDelimiter}", ScpiDelimiter, ct); //
+            return await WriteReadAsync($"*IDN?{ScpiDelimiter}", ScpiDelimiter, ct); //[cite: 1]
         }
 
-        /// <summary>
-        /// 复位命令。使电源恢复到出厂默认预定义安全值
-        /// </summary>
         public virtual async Task 重置设备(CancellationToken ct = default)
         {
-            await SendAsync($"*RST{ScpiDelimiter}", ct); //
+            await SendAsync($"*RST{ScpiDelimiter}", ct); //[cite: 1]
         }
 
-        /// <summary>
-        /// 读取状态字节寄存器
-        /// </summary>
         public virtual async Task<string> 读取状态字节(CancellationToken ct = default)
         {
-            return await WriteReadAsync($"*STB?{ScpiDelimiter}", ScpiDelimiter, ct); //
+            return await WriteReadAsync($"*STB?{ScpiDelimiter}", ScpiDelimiter, ct); //[cite: 1]
         }
 
         #endregion
@@ -61,81 +77,57 @@ namespace DeviceCommand.Device
         #region 2. 耦合模式与拉载开关控制
 
         /// <summary>
-        /// 设置电源输出源的电气模式/工作耦合模式
-        /// (AC: 纯交流, DC: 纯直流, ACDC: 交直流混合模式)
+        /// 设置电源输出源的电气模式/工作耦合模式 (AC, DC, ACDC, DCAC)[cite: 1]
         /// </summary>
-        public virtual async Task 设置电源模式(string 模式, CancellationToken ct = default)
+        public virtual async Task 设置电源模式(PowerCouplingMode 模式, CancellationToken ct = default)
         {
-            string modeUpper = 模式.ToUpper();
-            if (modeUpper != "AC" && modeUpper != "DC" && modeUpper != "ACDC")
-                throw new ArgumentException("工作模式只能为 AC, DC, 或 ACDC");
-
-            await SendAsync($":SOURce:MODE {modeUpper}{ScpiDelimiter}", ct);
+            await SendAsync($":SOURce:FUNCtion {模式}{ScpiDelimiter}", ct); //[cite: 1]
         }
 
         /// <summary>
-        /// 查询电源当前的工作模式
+        /// 查询电源当前的工作电气模式[cite: 1]
         /// </summary>
         public virtual async Task<string> 查询电源模式(CancellationToken ct = default)
         {
-            return await WriteReadAsync($":SOURce:MODE?{ScpiDelimiter}", ScpiDelimiter, ct);
+            return await WriteReadAsync($":SOURce:FUNCtion?{ScpiDelimiter}", ScpiDelimiter, ct); //[cite: 1]
         }
 
-        /// <summary>
-        /// 控制电源的主输出开关 (True: 开启输出, False: 关闭输出)
-        /// </summary>
         public virtual async Task 设置DC输出(bool 开启, CancellationToken ct = default)
         {
-            // 注意：虽然方法名叫设置DC输出，但对交直流电源它代表通用的主输出控制（Main Output）
-            string 参数 = 开启 ? "ON" : "OFF";
-            await SendAsync($":OUTPut {参数}{ScpiDelimiter}", ct);
+            string 参数 = 开启 ? "ON" : "OFF"; //[cite: 1]
+            await SendAsync($":OUTPut {参数}{ScpiDelimiter}", ct); //[cite: 1]
         }
 
-        /// <summary>
-        /// 查询电源当前主输出开关状态 (返回 ON 或 OFF)
-        /// </summary>
         public virtual async Task<string> 查询DC输出状态(CancellationToken ct = default)
         {
-            return await WriteReadAsync($":OUTPut?{ScpiDelimiter}", ScpiDelimiter, ct);
+            return await WriteReadAsync($":OUTPut?{ScpiDelimiter}", ScpiDelimiter, ct); //[cite: 1]
         }
 
         #endregion
 
         #region 3. 设定输出参数设置 (AC 电压/频率/DC 电压)
 
-        /// <summary>
-        /// 设定交流（AC）模式下的电压有效值 (单位: V)
-        /// </summary>
         public virtual async Task 设置交流电压(double 电压, CancellationToken ct = default)
         {
-            string cmd = string.Format(CultureInfo.InvariantCulture, ":SOURce:VOLTage:AC {0:F2}{1}", 电压, ScpiDelimiter);
+            string cmd = string.Format(CultureInfo.InvariantCulture, ":SOURce:VOLTage {0:F2}{1}", 电压, ScpiDelimiter); //[cite: 1]
             await SendAsync(cmd, ct);
         }
 
-        /// <summary>
-        /// 设定直流（DC）模式或交直流(AC+DC)模式下的直流偏置电压值 (单位: V)
-        /// </summary>
         public virtual async Task 设置直流电压(double 电压, CancellationToken ct = default)
         {
-            string cmd = string.Format(CultureInfo.InvariantCulture, ":SOURce:VOLTage:DC {0:F2}{1}", 电压, ScpiDelimiter);
+            string cmd = string.Format(CultureInfo.InvariantCulture, ":SOURce:VOLTage:DC {0:F2}{1}", 电压, ScpiDelimiter); //[cite: 1]
             await SendAsync(cmd, ct);
         }
 
-        /// <summary>
-        /// 设定电源交流输出的频率值 (单位: Hz)
-        /// </summary>
         public virtual async Task 设置频率(double 频率, CancellationToken ct = default)
         {
-            string cmd = string.Format(CultureInfo.InvariantCulture, ":SOURce:FREQuency {0:F2}{1}", 频率, ScpiDelimiter);
+            string cmd = string.Format(CultureInfo.InvariantCulture, ":SOURce:FREQuency {0:F2}{1}", 频率, ScpiDelimiter); //[cite: 1]
             await SendAsync(cmd, ct);
         }
 
-        /// <summary>
-        /// 设置硬件交流输出的有效值限流门限 (单位: A)
-        /// </summary>
         public virtual async Task 设置电流(double 电流, CancellationToken ct = default)
         {
-            string cmd = string.Format(CultureInfo.InvariantCulture, ":SOURce:CURRent {0:F3}{1}", 电流, ScpiDelimiter);
+            string cmd = string.Format(CultureInfo.InvariantCulture, ":SOURce:CURRent {0:F3}{1}", 电流, ScpiDelimiter); //[cite: 1]
             await SendAsync(cmd, ct);
         }
 
@@ -143,109 +135,127 @@ namespace DeviceCommand.Device
 
         #region 4. 测量与数据回测（高频数据轮询核心）
 
-        /// <summary>
-        /// 查询通道实时测得的电压有效值（RMS，支持 AC 或 DC 模式下的回测）(单位: V)
-        /// </summary>
         [Monitorable("交流电源电压")]
         public virtual async Task<string> 查询实际电压(CancellationToken ct = default)
         {
-            return await WriteReadAsync($":MEASure:VOLTage?{ScpiDelimiter}", ScpiDelimiter, ct);
+            return await WriteReadAsync($":MEASure:VOLTage?{ScpiDelimiter}", ScpiDelimiter, ct); //[cite: 1]
         }
 
-        /// <summary>
-        /// 查询通道实时测得的电流有效值（RMS）(单位: A)
-        /// </summary>
         [Monitorable("交流电源电流")]
         public virtual async Task<string> 查询实际电流(CancellationToken ct = default)
         {
-            return await WriteReadAsync($":MEASure:CURRent?{ScpiDelimiter}", ScpiDelimiter, ct);
+            return await WriteReadAsync($":MEASure:CURRent?{ScpiDelimiter}", ScpiDelimiter, ct); //[cite: 1]
         }
 
-        /// <summary>
-        /// 查询通道实时测得的有功功率值 (单位: W)
-        /// </summary>
         [Monitorable("交流电源功率")]
         public virtual async Task<string> 查询实际功率(CancellationToken ct = default)
         {
-            return await WriteReadAsync($":MEASure:POWer?{ScpiDelimiter}", ScpiDelimiter, ct);
+            return await WriteReadAsync($":MEASure:POWer?{ScpiDelimiter}", ScpiDelimiter, ct); //[cite: 1]
         }
 
-        /// <summary>
-        /// 查询通道实时测得的视在功率 (单位: VA)
-        /// </summary>
         public virtual async Task<string> 查询视在功率(CancellationToken ct = default)
         {
-            return await WriteReadAsync($":MEASure:POWer:APParent?{ScpiDelimiter}", ScpiDelimiter, ct);
+            return await WriteReadAsync($":MEASure:POWer:APParent?{ScpiDelimiter}", ScpiDelimiter, ct); //[cite: 1]
         }
 
-        /// <summary>
-        /// 查询通道实时测得的输出频率 (单位: Hz)
-        /// </summary>
         public virtual async Task<string> 查询实际频率(CancellationToken ct = default)
         {
-            return await WriteReadAsync($":MEASure:FREQuency?{ScpiDelimiter}", ScpiDelimiter, ct);
+            return await WriteReadAsync($":MEASure:FREQuency?{ScpiDelimiter}", ScpiDelimiter, ct); //[cite: 1]
         }
 
-        /// <summary>
-        /// 查询当前的功率因数 (PF)
-        /// </summary>
         public virtual async Task<string> 查询功率因数(CancellationToken ct = default)
         {
-            return await WriteReadAsync($":MEASure:PF?{ScpiDelimiter}", ScpiDelimiter, ct);
+            return await WriteReadAsync($":MEASure:POWer:PFACtor?{ScpiDelimiter}", ScpiDelimiter, ct); //[cite: 1]
         }
 
         #endregion
 
         #region 5. 保护参数设置与系统监控
 
-        /// <summary>
-        /// 设置电源的过流保护(OCP)值 (单位: A)
-        /// </summary>
         public virtual async Task 设置过流保护_OCP(double 电流, CancellationToken ct = default)
         {
-            string cmd = string.Format(CultureInfo.InvariantCulture, ":SOURce:CURRent:PROTection {0:F3}{1}", 电流, ScpiDelimiter);
+            string cmd = string.Format(CultureInfo.InvariantCulture, ":SOURce:CURRent:PROTection:RMS {0:F3}{1}", 电流, ScpiDelimiter); //[cite: 1]
             await SendAsync(cmd, ct);
         }
 
-        /// <summary>
-        /// 设置电源的过压保护(OVP)值 (单位: V)
-        /// </summary>
         public virtual async Task 设置过压保护_OVP(double 电压, CancellationToken ct = default)
         {
-            string cmd = string.Format(CultureInfo.InvariantCulture, ":SOURce:VOLTage:PROTection {0:F2}{1}", 电压, ScpiDelimiter);
+            string cmd = string.Format(CultureInfo.InvariantCulture, ":SOURce:VOLTage:PROTection:PEAK {0:F2}{1}", 电压, ScpiDelimiter); //[cite: 1]
             await SendAsync(cmd, ct);
         }
 
-        /// <summary>
-        /// 读取系统的出错记录信息（获取上一条未处理的错误码）
-        /// </summary>
         public virtual async Task<string> 查询错误信息(CancellationToken ct = default)
         {
-            return await WriteReadAsync($":SYSTem:ERRor?{ScpiDelimiter}", ScpiDelimiter, ct);
+            return await WriteReadAsync($":SYSTem:ERRor?{ScpiDelimiter}", ScpiDelimiter, ct); //[cite: 1]
         }
 
-        /// <summary>
-        /// 切换仪器至计算机控制的远程控制模式 (锁定前面板按键)
-        /// </summary>
         public virtual async Task 切换远程控制模式(CancellationToken ct = default)
         {
-            await SendAsync($":SYSTem:REMote{ScpiDelimiter}", ct);
+            await SendAsync($":SYSTem:REMote{ScpiDelimiter}", ct); //[cite: 1]
         }
 
-        /// <summary>
-        /// 切换仪器至前面板操作的本地模式 (前面板解锁)
-        /// </summary>
         public virtual async Task 切换本地控制模式(CancellationToken ct = default)
         {
-            await SendAsync($":SYSTem:LOCal{ScpiDelimiter}", ct);
+            await SendAsync($":SYSTem:LOCal{ScpiDelimiter}", ct); //[cite: 1]
+        }
+
+        public virtual async Task 清除保护告警(CancellationToken ct = default)
+        {
+            await SendAsync($":OUTPut:PROTection:CLEar{ScpiDelimiter}", ct); //[cite: 1]
+        }
+
+        #endregion
+
+        #region 6. 充放电与能量统计扩展命令
+
+        /// <summary>
+        /// 清除最近的安时（Ah）与瓦时（Wh）统计数据[cite: 1]
+        /// </summary>
+        public virtual async Task 清除充放电电量统计(CancellationToken ct = default)
+        {
+            await SendAsync($"SENSe:AHOur:RESet{ScpiDelimiter}", ct); //[cite: 1]
+            await SendAsync($"SENSe:WHOur:RESet{ScpiDelimiter}", ct); //[cite: 1]
         }
 
         /// <summary>
-        /// 清除仪器当前的保护状态（例如触发 OCP/OVP 被锁死后进行软件解锁）
+        /// 读取当前充放电累计的安时值 (单位: Ah)[cite: 1]
         /// </summary>
-        public virtual async Task 清除保护告警(CancellationToken ct = default)
+        public virtual async Task<string> 查询累计安时_Ah(CancellationToken ct = default)
         {
-            await SendAsync($":PROTection:CLEar{ScpiDelimiter}", ct);
+            return await WriteReadAsync($"FETCh:AHOur?{ScpiDelimiter}", ScpiDelimiter, ct); //[cite: 1]
+        }
+
+        /// <summary>
+        /// 读取当前充放电累计的瓦时值 (单位: Wh)[cite: 1]
+        /// </summary>
+        public virtual async Task<string> 查询累计瓦时_Wh(CancellationToken ct = default)
+        {
+            return await WriteReadAsync($"FETCh:WHOur?{ScpiDelimiter}", ScpiDelimiter, ct); //[cite: 1]
+        }
+
+        /// <summary>
+        /// 读取充放电积分持续时间 (单位: 秒)[cite: 1]
+        /// </summary>
+        public virtual async Task<string> 查询积分时间(CancellationToken ct = default)
+        {
+            return await WriteReadAsync($"FETCh:ENERgy:TIME?{ScpiDelimiter}", ScpiDelimiter, ct); //[cite: 1]
+        }
+
+        /// <summary>
+        /// 切换设备的操作模式 (VOLTage: 电源模式, LOAD: 负载模式/放电, CURRent: 电流源)[cite: 1]
+        /// </summary>
+        public virtual async Task 设置操作模式(DeviceOperationMode 模式, CancellationToken ct = default)
+        {
+            await SendAsync($"SYSTem:OPERation:MODE {模式}{ScpiDelimiter}", ct); //[cite: 1]
+        }
+
+        /// <summary>
+        /// 设置放电截止电压/电压下限 (单位: V，用于防止电池过放)[cite: 1]
+        /// </summary>
+        public virtual async Task 设置电压下限(double 电压, CancellationToken ct = default)
+        {
+            string cmd = string.Format(CultureInfo.InvariantCulture, ":SOURce:VOLTage:LIMit:LOW {0:F2}{1}", 电压, ScpiDelimiter); //[cite: 1]
+            await SendAsync(cmd, ct);
         }
 
         #endregion

DeviceCommand/Devices/N36200.cs

@@ -6,9 +6,9 @@ using System.Globalization;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace DeviceCommand.Device
+namespace DeviceCommand.Devices
 {
-    [ADPCommand]
+    //[ADPCommand]
     public class N36200 : Tcp
     {
         //只有一个，八台产品一起用一个

DeviceCommand/Devices/N36600.cs

@@ -7,7 +7,7 @@ using System.Globalization;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace DeviceCommand.Device
+namespace DeviceCommand.Devices
 {
     [ADPCommand]
     public class N36600 : Tcp

DeviceCommand/Devices/N69200.cs

@@ -6,7 +6,7 @@ using System.Globalization;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace DeviceCommand.Device
+namespace DeviceCommand.Devices
 {
     [ADPCommand]
     public class N69200 : Tcp
@@ -24,15 +24,22 @@ namespace DeviceCommand.Device
         #region 3.1. IEEE 488.2 公共命令
 
         /// <summary>
-        /// 清除状态命令。清除标准事件状态寄存器和错误队列
+        /// 清除状态命令。清除标准事件状态寄存器和错误队列 (*CLS)
         /// </summary>
         public virtual async Task 清除错误队列和状态字节(CancellationToken ct = default)
         {
             await SendAsync($"*CLS{ScpiDelimiter}", ct);
         }
+        /// <summary>
+        /// 查询错误信息
+        /// </summary>
+        public virtual async Task<string> 查询错误信息(CancellationToken ct = default)
+        {
+            return await WriteReadAsync($":SYSTem:ERRor?{ScpiDelimiter}", ScpiDelimiter, ct); //[cite: 1]
+        }
 
         /// <summary>
-        /// 读取电子负载设备识别字符串（制造商、产品型号、系统 SN、软件版本号）
+        /// 读取电子负载设备识别字符串 (*IDN?)
         /// </summary>
         public virtual async Task<string> 查询设备标识(CancellationToken ct = default)
         {
@@ -40,7 +47,7 @@ namespace DeviceCommand.Device
         }
 
         /// <summary>
-        /// 复位命令。使电子负载恢复到出厂默认配置状态
+        /// 复位命令。使电子负载恢复到出厂默认配置状态 (*RST)
         /// </summary>
         public virtual async Task 重置设备(CancellationToken ct = default)
         {
@@ -48,7 +55,7 @@ namespace DeviceCommand.Device
         }
 
         /// <summary>
-        /// 读取标准状态字节寄存器
+        /// 读取标准状态字节寄存器 (*STB?)
         /// </summary>
         public virtual async Task<string> 读取状态字节(CancellationToken ct = default)
         {
@@ -56,18 +63,24 @@ namespace DeviceCommand.Device
         }
 
         /// <summary>
-        /// 保存当前系统参数到指定的存储单元 (单元范围依型号而定)
+        /// 保存当前系统参数到指定的存储单元 (1~100)
         /// </summary>
         public virtual async Task 保存当前状态(int 单元, CancellationToken ct = default)
         {
+            if (单元 < 1 || 单元 > 100)
+                throw new ArgumentOutOfRangeException(nameof(单元), "存储单元位置应在 1~100 之间");
+
             await SendAsync($"*SAV {单元}{ScpiDelimiter}", ct);
         }
 
         /// <summary>
-        /// 调用指定存储单元中保存的系统参数
+        /// 调用指定存储单元中保存的系统参数 (1~100)
         /// </summary>
         public virtual async Task 调用存储状态(int 单元, CancellationToken ct = default)
         {
+            if (单元 < 1 || 单元 > 100)
+                throw new ArgumentOutOfRangeException(nameof(单元), "存储单元位置应在 1~100 之间");
+
             await SendAsync($"*RCL {单元}{ScpiDelimiter}", ct);
         }
 
@@ -76,34 +89,54 @@ namespace DeviceCommand.Device
         #region 3.2. 电子负载模式切换及拉载开关
 
         /// <summary>
-        /// 控制电子负载的输入控制开关（True: 开启拉载输入, False: 关闭拉载输入）
+        /// 控制电子负载的输入控制开关（INPut:STATe <bool>）
         /// </summary>
         public virtual async Task 设置DC输入(bool 开启, CancellationToken ct = default)
         {
-            string 参数 = 开启 ? "ON" : "OFF";
-            await SendAsync($":INPut {参数}{ScpiDelimiter}", ct);
+            string 参数 = 开启 ? "1" : "0";
+            await SendAsync($"INPut:STATe {参数}{ScpiDelimiter}", ct);
         }
 
         /// <summary>
-        /// 查询电子负载当前的拉载开关状态 (返回 ON 或 OFF)
+        /// 查询电子负载当前的拉载开关状态 (返回 0 或 1)
         /// </summary>
         public virtual async Task<string> 查询DC输入状态(CancellationToken ct = default)
         {
-            return await WriteReadAsync($":INPut?{ScpiDelimiter}", ScpiDelimiter, ct);
+            return await WriteReadAsync($"INPut:STATe?{ScpiDelimiter}", ScpiDelimiter, ct);
         }
 
         /// <summary>
-        /// 设置电子负载的基本工作模式
-        /// (CC: 恒电流, CV: 恒电压, CP: 恒功率, CR: 恒电阻)
+        /// 设置电子负载的基本工作模式 (INPut:FUNCtion <mode>)
+        /// (支持 CC, CV, CR, CP, CCD, CVD, CRD, CPD, OCP, OPP, ESR, MPP, SWEEP 等)
         /// </summary>
-        public virtual async Task 设置负载模式(string 模式, CancellationToken ct = default)
+        public enum DeviceWorkMode
         {
-            // 转换为大写以确保设备命令解析兼容
-            string modeUpper = 模式.ToUpper();
-            if (modeUpper != "CC" && modeUpper != "CV" && modeUpper != "CP" && modeUpper != "CR")
-                throw new ArgumentException("工作模式只能为 CC, CV, CP, 或 CR");
-
-            await SendAsync($":MODE {modeUpper}{ScpiDelimiter}", ct);
+            CC,
+            CV,
+            CR,
+            CP,
+            CCD,
+            ESR,
+            AUTO,
+            DISCHARGE,
+            CHARGE,
+            OCP,
+            CVD,
+            CRD,
+            MPP,
+            CVCC,
+            CRCC,
+            CPCC,
+            CVCR,
+            WAVE,
+            SWEEP,
+            OPP,
+            CPD,
+            SZ
+        }
+        public virtual async Task 设置负载模式(DeviceWorkMode 模式, CancellationToken ct = default)
+        {
+            await SendAsync($"INPut:FUNCtion {Enum.GetName(模式)}{ScpiDelimiter}", ct);
         }
 
         /// <summary>
@@ -111,79 +144,79 @@ namespace DeviceCommand.Device
         /// </summary>
         public virtual async Task<string> 查询负载模式(CancellationToken ct = default)
         {
-            return await WriteReadAsync($":MODE?{ScpiDelimiter}", ScpiDelimiter, ct);
+            return await WriteReadAsync($"INPut:FUNCtion?{ScpiDelimiter}", ScpiDelimiter, ct);
         }
 
         #endregion
 
-        #region 3.3. 负载参数设置 (CC / CV / CP / CR)
+        #region 3.3. 负载参数设置 (CC / CV / CP / CR 定态大量程)
 
         /// <summary>
-        /// 设定恒电流模式(CC)下的拉载电流目标值 (单位: A)
+        /// 设定恒电流模式(CC)大量程下的拉载电流目标值 (单位: A)
         /// </summary>
         public virtual async Task 设置恒电流CC(double 电流, CancellationToken ct = default)
         {
-            string cmd = string.Format(CultureInfo.InvariantCulture, ":CURRent {0:F4}{1}", 电流, ScpiDelimiter);
+            string cmd = string.Format(CultureInfo.InvariantCulture, "STATic:CC:HIGH:LEVel {0:F4}{1}", 电流, ScpiDelimiter);
             await SendAsync(cmd, ct);
         }
 
         /// <summary>
-        /// 查询恒电流模式下设定的拉载电流值
+        /// 查询恒电流模式大量程下设定的拉载电流值
         /// </summary>
         public virtual async Task<string> 查询恒电流CC设定(CancellationToken ct = default)
         {
-            return await WriteReadAsync($":CURRent?{ScpiDelimiter}", ScpiDelimiter, ct);
+            return await WriteReadAsync($"STATic:CC:HIGH:LEVel?{ScpiDelimiter}", ScpiDelimiter, ct);
         }
 
         /// <summary>
-        /// 设定恒电压模式(CV)下的拉载电压目标值 (单位: V)
+        /// 设定恒电压模式(CV)大量程下的拉载电压目标值 (单位: V)
         /// </summary>
         public virtual async Task 设置恒电压CV(double 电压, CancellationToken ct = default)
         {
-            string cmd = string.Format(CultureInfo.InvariantCulture, ":VOLTage {0:F3}{1}", 电压, ScpiDelimiter);
+            string cmd = string.Format(CultureInfo.InvariantCulture, "STATic:CV:HIGH:LEVel {0:F3}{1}", 电压, ScpiDelimiter);
             await SendAsync(cmd, ct);
         }
 
         /// <summary>
-        /// 查询恒电压模式下设定的拉载电压值
+        /// 查询恒电压模式大量程下设定的拉载电压值
         /// </summary>
         public virtual async Task<string> 查询恒电压CV设定(CancellationToken ct = default)
         {
-            return await WriteReadAsync($":VOLTage?{ScpiDelimiter}", ScpiDelimiter, ct);
+            return await WriteReadAsync($"STATic:CV:HIGH:LEVel?{ScpiDelimiter}", ScpiDelimiter, ct);
         }
 
         /// <summary>
-        /// 设定恒功率模式(CP)下的拉载功率目标值 (单位: W)
+        /// 设定恒功率模式(CP)大量程下的拉载功率目标值 (单位: W)
         /// </summary>
         public virtual async Task 设置恒功率CP(double 功率, CancellationToken ct = default)
         {
-            string cmd = string.Format(CultureInfo.InvariantCulture, ":POWer {0:F3}{1}", 功率, ScpiDelimiter);
+            string cmd = string.Format(CultureInfo.InvariantCulture, "STATic:CP:HIGH:LEVel {0:F3}{1}", 功率, ScpiDelimiter);
             await SendAsync(cmd, ct);
         }
 
         /// <summary>
-        /// 查询恒功率模式下设定的拉载功率值
+        /// 查询恒功率模式大量程下设定的拉载功率值
         /// </summary>
         public virtual async Task<string> 查询恒功率CP设定(CancellationToken ct = default)
         {
-            return await WriteReadAsync($":POWer?{ScpiDelimiter}", ScpiDelimiter, ct);
+            return await WriteReadAsync($"STATic:CP:HIGH:LEVel?{ScpiDelimiter}", ScpiDelimiter, ct);
         }
 
         /// <summary>
-        /// 设定恒电阻模式(CR)下的等效拉载电阻阻值 (单位: Ω)
+        /// 设定恒电阻模式(CR)大量程下的等效拉载电阻阻值 (单位: Ω)
         /// </summary>
         public virtual async Task 设置恒电阻CR(double 电阻, CancellationToken ct = default)
         {
-            string cmd = string.Format(CultureInfo.InvariantCulture, ":RESistance {0:F4}{1}", 电阻, ScpiDelimiter);
+            string cmd = string.Format(CultureInfo.InvariantCulture, "STATic:CR:HIGH:LEVel {0:F4}{1}", 电阻, ScpiDelimiter);
             await SendAsync(cmd, ct);
         }
 
         /// <summary>
-        /// 查询恒电阻模式下设定的拉载电阻值
+        /// 查询恒电阻模式大量程下设定的拉载电阻值
         /// </summary>
         public virtual async Task<string> 查询恒电阻CR设定(CancellationToken ct = default)
         {
-            return await WriteReadAsync($":RESistance?{ScpiDelimiter}", ScpiDelimiter, ct);
+            return await WriteReadAsync($"STATic:CR:HIGH:LEVel?{ScpiDelimiter}", ScpiDelimiter, ct);
         }
 
         #endregion
@@ -196,7 +229,7 @@ namespace DeviceCommand.Device
         [Monitorable("高压直流负载电压")]
         public virtual async Task<string> 查询实际电压(CancellationToken ct = default)
         {
-            return await WriteReadAsync($":MEASure:VOLTage?{ScpiDelimiter}", ScpiDelimiter, ct);
+            return await WriteReadAsync($"MEASure:VOLTage?{ScpiDelimiter}", ScpiDelimiter, ct);
         }
 
         /// <summary>
@@ -205,7 +238,7 @@ namespace DeviceCommand.Device
         [Monitorable("高压直流负载电流")]
         public virtual async Task<string> 查询实际电流(CancellationToken ct = default)
         {
-            return await WriteReadAsync($":MEASure:CURRent?{ScpiDelimiter}", ScpiDelimiter, ct);
+            return await WriteReadAsync($"MEASure:CURRent?{ScpiDelimiter}", ScpiDelimiter, ct);
         }
 
         /// <summary>
@@ -214,15 +247,7 @@ namespace DeviceCommand.Device
         [Monitorable("高压直流负载功率")]
         public virtual async Task<string> 查询实际功率(CancellationToken ct = default)
         {
-            return await WriteReadAsync($":MEASure:POWer?{ScpiDelimiter}", ScpiDelimiter, ct);
-        }
-
-        /// <summary>
-        /// 一键回读当前负载测得的电压、电流和功率的组合数组数据
-        /// </summary>
-        public virtual async Task<string> 查询电压电流功率数组(CancellationToken ct = default)
-        {
-            return await WriteReadAsync($":MEASure:VAP?{ScpiDelimiter}", ScpiDelimiter, ct);
+            return await WriteReadAsync($"MEASure:POWer?{ScpiDelimiter}", ScpiDelimiter, ct);
         }
 
         #endregion
@@ -230,29 +255,29 @@ namespace DeviceCommand.Device
         #region 3.5. 保护限制参数设置
 
         /// <summary>
-        /// 设置电子负载的过流保护(OCP)报警值 (单位: A)
+        /// 设置电子负载的电流软保护阈值 (单位: A, 设置为 0 表示关闭)
         /// </summary>
         public virtual async Task 设置过流保护值_OCP(double 电流, CancellationToken ct = default)
         {
-            string cmd = string.Format(CultureInfo.InvariantCulture, ":PROTection:CURRent {0:F3}{1}", 电流, ScpiDelimiter);
+            string cmd = string.Format(CultureInfo.InvariantCulture, "INPut:CURRent:PROTection {0:F3}{1}", 电流, ScpiDelimiter);
             await SendAsync(cmd, ct);
         }
 
         /// <summary>
-        /// 设置电子负载的过功率保护(OPP)报警值 (单位: W)
+        /// 设置电子负载的功率软保护阈值 (单位: W, 设置为 0 表示关闭)
         /// </summary>
         public virtual async Task 设置过功率保护值_OPP(double 功率, CancellationToken ct = default)
         {
-            string cmd = string.Format(CultureInfo.InvariantCulture, ":PROTection:POWer {0:F3}{1}", 功率, ScpiDelimiter);
+            string cmd = string.Format(CultureInfo.InvariantCulture, "INPut:POWer:PROTection {0:F3}{1}", 功率, ScpiDelimiter);
             await SendAsync(cmd, ct);
         }
 
         /// <summary>
-        /// 设置电子负载的过压保护(OVP)报警值 (单位: V)
+        /// 设置电子负载的电压软保护阈值 (单位: V, 设置为 0 表示关闭)
         /// </summary>
         public virtual async Task 设置过压保护值_OVP(double 电压, CancellationToken ct = default)
         {
-            string cmd = string.Format(CultureInfo.InvariantCulture, ":PROTection:VOLTage {0:F3}{1}", 电压, ScpiDelimiter);
+            string cmd = string.Format(CultureInfo.InvariantCulture, "INPut:VOLTage:PROTection {0:F3}{1}", 电压, ScpiDelimiter);
             await SendAsync(cmd, ct);
         }
 
@@ -261,37 +286,290 @@ namespace DeviceCommand.Device
         #region 3.6. 系统控制及报警清除
 
         /// <summary>
-        /// 读取仪器的出错记录记录 (当系统产生告警或指令解析异常时读取)
+        /// 读取负载报警/事件寄存器信息 (MEASure:EVENT?)
         /// </summary>
-        public virtual async Task<string> 查询错误信息(CancellationToken ct = default)
+        public virtual async Task<string> 查询报警事件信息(CancellationToken ct = default)
         {
-            return await WriteReadAsync($":SYSTem:ERRor?{ScpiDelimiter}", ScpiDelimiter, ct);
+            return await WriteReadAsync($"MEASure:EVENT?{ScpiDelimiter}", ScpiDelimiter, ct);
         }
 
         /// <summary>
-        /// 切换电子负载到本地面板操作状态 (前面板按键解锁)
-        /// </summary>
-        public virtual async Task 切换本地控制模式(CancellationToken ct = default)
-        {
-            await SendAsync($":SYSTem:LOCal{ScpiDelimiter}", ct);
-        }
-
-        /// <summary>
-        /// 切换电子负载到远程计算机操作状态 (前面板按键锁定)
-        /// </summary>
-        public virtual async Task 切换远程控制模式(CancellationToken ct = default)
-        {
-            await SendAsync($":SYSTem:REMote{ScpiDelimiter}", ct);
-        }
-
-        /// <summary>
-        /// 清除负载当前的软件过流/过功率等保护(Protection)锁定触发状态
+        /// 清除负载当前的保护触发锁定状态 (INPut:CLearPROTect)
         /// </summary>
         public virtual async Task 清除保护告警(CancellationToken ct = default)
         {
-            await SendAsync($":PROTection:CLEar{ScpiDelimiter}", ct);
+            await SendAsync($"INPut:CLearPROTect{ScpiDelimiter}", ct);
         }
 
         #endregion
+
+        #region 3.7. 手册第 112~124 页中的原子控制命令
+
+        #region 组合测试 (COMBination:*)
+
+        public virtual async Task 设置组合量程_CVCC(int 量程, CancellationToken ct = default)
+            => await SendAsync($"COMBination:CVCC:RANGE {量程}{ScpiDelimiter}", ct);
+
+        public virtual async Task 设置恒压速率_CVCC(int 速率, CancellationToken ct = default)
+            => await SendAsync($"COMBination:CVCC:HIGH:RATE {速率}{ScpiDelimiter}", ct);
+
+        public virtual async Task 设置恒压大量程电压_CVCC(double 电压, CancellationToken ct = default)
+            => await SendAsync(string.Format(CultureInfo.InvariantCulture, "COMBination:CVCC:HIGH:LEVel {0:F3}{1}", 电压, ScpiDelimiter), ct);
+
+        public virtual async Task 设置限定电流_CVCC(double 电流, CancellationToken ct = default)
+            => await SendAsync(string.Format(CultureInfo.InvariantCulture, "COMBination:CVCC:CLIMit {0:F3}{1}", 电流, ScpiDelimiter), ct);
+
+        public virtual async Task 设置组合量程_CRCC(int 量程, CancellationToken ct = default)
+            => await SendAsync($"COMBination:CRCC:RANGE {量程}{ScpiDelimiter}", ct);
+
+        public virtual async Task 设置恒阻小量程电阻_CRCC(double 电阻, CancellationToken ct = default)
+            => await SendAsync(string.Format(CultureInfo.InvariantCulture, "COMBination:CRCC:LOW:LEVel {0:F4}{1}", 电阻, ScpiDelimiter), ct);
+
+        public virtual async Task 设置限定电流_CRCC(double 电流, CancellationToken ct = default)
+            => await SendAsync(string.Format(CultureInfo.InvariantCulture, "COMBination:CRCC:CLIMit {0:F3}{1}", 电流, ScpiDelimiter), ct);
+
+        public virtual async Task 设置上升斜率_CRCC(double 斜率, CancellationToken ct = default)
+            => await SendAsync(string.Format(CultureInfo.InvariantCulture, "COMBination:CRCC:LOW:SLEWRate:RAIse {0:F1}{1}", 斜率, ScpiDelimiter), ct);
+
+        public virtual async Task 设置下降斜率_CRCC(double 斜率, CancellationToken ct = default)
+            => await SendAsync(string.Format(CultureInfo.InvariantCulture, "COMBination:CRCC:LOW:SLEWRate:FALL {0:F1}{1}", 斜率, ScpiDelimiter), ct);
+
+        public virtual async Task 设置组合量程_CPCC(int 量程, CancellationToken ct = default)
+            => await SendAsync($"COMBination:CPCC:RANGE {量程}{ScpiDelimiter}", ct);
+
+        public virtual async Task 设置恒功率小量程功率_CPCC(double 功率, CancellationToken ct = default)
+            => await SendAsync(string.Format(CultureInfo.InvariantCulture, "COMBination:CPCC:LOW:LEVel {0:F3}{1}", 功率, ScpiDelimiter), ct);
+
+        public virtual async Task 设置限定电流_CPCC(double 电流, CancellationToken ct = default)
+            => await SendAsync(string.Format(CultureInfo.InvariantCulture, "COMBination:CPCC:CLIMit {0:F3}{1}", 电流, ScpiDelimiter), ct);
+
+        public virtual async Task 设置组合量程_CVCR(int 量程, CancellationToken ct = default)
+            => await SendAsync($"COMBination:CVCR:RANGE {量程}{ScpiDelimiter}", ct);
+
+        public virtual async Task 设置恒压大量程电压_CVCR(double 电压, CancellationToken ct = default)
+            => await SendAsync(string.Format(CultureInfo.InvariantCulture, "COMBination:CVCR:HIGH:LEVel {0:F3}{1}", 电压, ScpiDelimiter), ct);
+
+        public virtual async Task 设置限定电阻_CVCR(double 电阻, CancellationToken ct = default)
+            => await SendAsync(string.Format(CultureInfo.InvariantCulture, "COMBination:CVCR:CLIMit {0:F4}{1}", 电阻, ScpiDelimiter), ct);
+
+        #endregion
+
+        #region 瞬态测试 (DYNAmic:*)
+
+        public virtual async Task 设置瞬态运行方式_CC(int 模式, CancellationToken ct = default)
+            => await SendAsync($"DYNAmic:CC:MODe {模式}{ScpiDelimiter}", ct); // 0-连续, 1-单次, 2-A/B
+
+        public virtual async Task 设置瞬态量程_CC(int 量程, CancellationToken ct = default)
+            => await SendAsync($"DYNAmic:CC:RANGE {量程}{ScpiDelimiter}", ct);
+
+        public virtual async Task 设置瞬态主值电流_CC(double 电流, CancellationToken ct = default)
+            => await SendAsync(string.Format(CultureInfo.InvariantCulture, "DYNAmic:CC:HIGH:LEVel:MAIN {0:F4}{1}", 电流, ScpiDelimiter), ct);
+
+        public virtual async Task 设置瞬态瞬态值电流_CC(double 电流, CancellationToken ct = default)
+            => await SendAsync(string.Format(CultureInfo.InvariantCulture, "DYNAmic:CC:HIGH:LEVel:TRANSient {0:F4}{1}", 电流, ScpiDelimiter), ct);
+
+        public virtual async Task 设置瞬态上升斜率_CC(double 斜率, CancellationToken ct = default)
+            => await SendAsync(string.Format(CultureInfo.InvariantCulture, "DYNAmic:CC:HIGH:SLEWRate:RAIse {0:F1}{1}", 斜率, ScpiDelimiter), ct);
+
+        public virtual async Task 设置瞬态下降斜率_CC(double 斜率, CancellationToken ct = default)
+            => await SendAsync(string.Format(CultureInfo.InvariantCulture, "DYNAmic:CC:HIGH:SLEWRate:FALL {0:F1}{1}", 斜率, ScpiDelimiter), ct);
+
+        public virtual async Task 设置瞬态主值脉宽_CC(double 时间_ms, CancellationToken ct = default)
+            => await SendAsync(string.Format(CultureInfo.InvariantCulture, "DYNAmic:CC:WIDth:MAIN {0:F1}{1}", 时间_ms, ScpiDelimiter), ct);
+
+        public virtual async Task 设置瞬态瞬态脉宽_CC(double 时间_ms, CancellationToken ct = default)
+            => await SendAsync(string.Format(CultureInfo.InvariantCulture, "DYNAmic:CC:WIDth:TRANSient {0:F1}{1}", 时间_ms, ScpiDelimiter), ct);
+
+        public virtual async Task 设置瞬态运行方式_CV(int 模式, CancellationToken ct = default)
+            => await SendAsync($"DYNAmic:CV:MODe {模式}{ScpiDelimiter}", ct);
+
+        public virtual async Task 设置瞬态量程_CV(int 量程, CancellationToken ct = default)
+            => await SendAsync($"DYNAmic:CV:RANGE {量程}{ScpiDelimiter}", ct);
+
+        public virtual async Task 设置瞬态主值电压_CV(double 电压, CancellationToken ct = default)
+            => await SendAsync(string.Format(CultureInfo.InvariantCulture, "DYNAmic:CV:HIGH:LEVel:MAIN {0:F3}{1}", 电压, ScpiDelimiter), ct);
+
+        public virtual async Task 设置瞬态瞬态值电压_CV(double 电压, CancellationToken ct = default)
+            => await SendAsync(string.Format(CultureInfo.InvariantCulture, "DYNAmic:CV:HIGH:LEVel:TRANSient {0:F3}{1}", 电压, ScpiDelimiter), ct);
+
+        public virtual async Task 设置瞬态主值脉宽_CV(double 时间_ms, CancellationToken ct = default)
+            => await SendAsync(string.Format(CultureInfo.InvariantCulture, "DYNAmic:CV:WIDth:MAIN {0:F1}{1}", 时间_ms, ScpiDelimiter), ct);
+
+        public virtual async Task 设置瞬态瞬态脉宽_CV(double 时间_ms, CancellationToken ct = default)
+            => await SendAsync(string.Format(CultureInfo.InvariantCulture, "DYNAmic:CV:WIDth:TRANSient {0:F1}{1}", 时间_ms, ScpiDelimiter), ct);
+
+        #endregion
+
+        #region 充放电测试 (DISCHarge:* / CHARge:*)
+
+        public virtual async Task 设置放电电流(double 电流, CancellationToken ct = default)
+            => await SendAsync(string.Format(CultureInfo.InvariantCulture, "DISCHarge:CURRent {0:F3}{1}", 电流, ScpiDelimiter), ct);
+
+        public virtual async Task 设置放电终止电压(double 电压, CancellationToken ct = default)
+            => await SendAsync(string.Format(CultureInfo.InvariantCulture, "DISCHarge:VOLTage {0:F3}{1}", 电压, ScpiDelimiter), ct);
+
+        public virtual async Task 设置放电终止时间(double 时间_s, CancellationToken ct = default)
+            => await SendAsync(string.Format(CultureInfo.InvariantCulture, "DISCHarge:TIMe {0:F0}{1}", 时间_s, ScpiDelimiter), ct);
+
+        public virtual async Task 设置放电终止容量(double 容量_Ah, CancellationToken ct = default)
+            => await SendAsync(string.Format(CultureInfo.InvariantCulture, "DISCHarge:CAPacity {0:F3}{1}", 容量_Ah, ScpiDelimiter), ct);
+
+        public virtual async Task<string> 查询放电实时时间(CancellationToken ct = default)
+            => await WriteReadAsync($"DISCHarge:ECHO:TIMe?{ScpiDelimiter}", ScpiDelimiter, ct);
+
+        public virtual async Task<string> 查询放电实时容量(CancellationToken ct = default)
+            => await WriteReadAsync($"DISCHarge:ECHo:CAPacity?{ScpiDelimiter}", ScpiDelimiter, ct);
+
+        public virtual async Task 设置充电电流(double 电流, CancellationToken ct = default)
+            => await SendAsync(string.Format(CultureInfo.InvariantCulture, "CHARge:CURRent {0:F3}{1}", 电流, ScpiDelimiter), ct);
+
+        public virtual async Task 设置充电电压(double 电压, CancellationToken ct = default)
+            => await SendAsync(string.Format(CultureInfo.InvariantCulture, "CHARge:VOLTage {0:F3}{1}", 电压, ScpiDelimiter), ct);
+
+        public virtual async Task 设置充电恒压时间(int 时间_s, CancellationToken ct = default)
+            => await SendAsync($"CHARge:TIMe {时间_s}{ScpiDelimiter}", ct);
+
+        #endregion
+
+        #region OCP / OPP 保护扫描测试 (OCP:* / OPP:*)
+
+        public virtual async Task 设置OCP初始电流(double 电流, CancellationToken ct = default)
+            => await SendAsync(string.Format(CultureInfo.InvariantCulture, "OCP:BCURrent {0:F3}{1}", 电流, ScpiDelimiter), ct);
+
+        public virtual async Task 设置OCP步进电流(double 电流, CancellationToken ct = default)
+            => await SendAsync(string.Format(CultureInfo.InvariantCulture, "OCP:SCURrent {0:F3}{1}", 电流, ScpiDelimiter), ct);
+
+        public virtual async Task 设置OCP单步时间(double 时间_s, CancellationToken ct = default)
+            => await SendAsync(string.Format(CultureInfo.InvariantCulture, "OCP:Time {0:F1}{1}", 时间_s, ScpiDelimiter), ct);
+
+        public virtual async Task 设置OCP终止电压(double 电压, CancellationToken ct = default)
+            => await SendAsync(string.Format(CultureInfo.InvariantCulture, "OCP:EVOLtage {0:F3}{1}", 电压, ScpiDelimiter), ct);
+
+        public virtual async Task<string> 查询OCP状态(CancellationToken ct = default)
+            => await WriteReadAsync($"OCP:STAtus?{ScpiDelimiter}", ScpiDelimiter, ct);
+
+        public virtual async Task<string> 读取OCP结果电流(CancellationToken ct = default)
+            => await WriteReadAsync($"OCP:RCURrent?{ScpiDelimiter}", ScpiDelimiter, ct);
+
+        public virtual async Task 设置OPP初始功率(double 功率, CancellationToken ct = default)
+            => await SendAsync(string.Format(CultureInfo.InvariantCulture, "OPP:BPOWer {0:F3}{1}", 功率, ScpiDelimiter), ct);
+
+        public virtual async Task 设置OPP步进功率(double 功率, CancellationToken ct = default)
+            => await SendAsync(string.Format(CultureInfo.InvariantCulture, "OPP:SPOWer {0:F3}{1}", 功率, ScpiDelimiter), ct);
+
+        public virtual async Task 设置OPP单步时间(double 时间_s, CancellationToken ct = default)
+            => await SendAsync(string.Format(CultureInfo.InvariantCulture, "OPP:TIME {0:F1}{1}", 时间_s, ScpiDelimiter), ct);
+
+        public virtual async Task 设置OPP终止电压(double 电压, CancellationToken ct = default)
+            => await SendAsync(string.Format(CultureInfo.InvariantCulture, "OPP:EVOLtage {0:F3}{1}", 电压, ScpiDelimiter), ct);
+
+        public virtual async Task<string> 查询OPP状态(CancellationToken ct = default)
+            => await WriteReadAsync($"OPP:STAtus?{ScpiDelimiter}", ScpiDelimiter, ct);
+
+        public virtual async Task<string> 读取OPP结果功率(CancellationToken ct = default)
+            => await WriteReadAsync($"OPP:RPOWer?{ScpiDelimiter}", ScpiDelimiter, ct);
+
+        #endregion
+
+        #region 扫频 SWEEP 与 波形拉载 WAVE (SWEEP:* / WAVE:*)
+
+        public virtual async Task 设置扫频最小电流(double 电流, CancellationToken ct = default)
+            => await SendAsync(string.Format(CultureInfo.InvariantCulture, "SWEEP:TCURrent {0:F3}{1}", 电流, ScpiDelimiter), ct);
+
+        public virtual async Task 设置扫频最大电流(double 电流, CancellationToken ct = default)
+            => await SendAsync(string.Format(CultureInfo.InvariantCulture, "SWEEP:MCURrent {0:F3}{1}", 电流, ScpiDelimiter), ct);
+
+        public virtual async Task 设置扫频起始频率(double 频率_Hz, CancellationToken ct = default)
+            => await SendAsync(string.Format(CultureInfo.InvariantCulture, "SWEEP:SFRequency {0:F1}{1}", 频率_Hz, ScpiDelimiter), ct);
+
+        public virtual async Task 设置扫频结束频率(double 频率_Hz, CancellationToken ct = default)
+            => await SendAsync(string.Format(CultureInfo.InvariantCulture, "SWEEP:EFRequency {0:F1}{1}", 频率_Hz, ScpiDelimiter), ct);
+
+        public virtual async Task 设置扫频单步时间(double 时间_ms, CancellationToken ct = default)
+            => await SendAsync(string.Format(CultureInfo.InvariantCulture, "SWEEP:STPTime {0:F1}{1}", 时间_ms, ScpiDelimiter), ct);
+
+        public virtual async Task 设置扫频占空比(double 占空比, CancellationToken ct = default)
+            => await SendAsync(string.Format(CultureInfo.InvariantCulture, "SWEEP:DUTYcycle {0:F1}{1}", 占空比, ScpiDelimiter), ct);
+
+        public virtual async Task<string> 读取扫频当前运行频率(CancellationToken ct = default)
+            => await WriteReadAsync($"SWEEP:CFRequency?{ScpiDelimiter}", ScpiDelimiter, ct);
+
+        public virtual async Task<string> 读取扫频测试结果(CancellationToken ct = default)
+            => await WriteReadAsync($"SWEEP:RESult?{ScpiDelimiter}", ScpiDelimiter, ct);
+
+        public virtual async Task 设置波形量程(int 量程, CancellationToken ct = default)
+            => await SendAsync($"WAVE:RANGe {量程}{ScpiDelimiter}", ct);
+
+        public virtual async Task 设置波形类型(int 类型, CancellationToken ct = default)
+            => await SendAsync($"WAVE:TYPe {类型}{ScpiDelimiter}", ct); // 0-正弦波, 1-方波, 2-三角波, 3-锯齿波, 4-自定义
+
+        public virtual async Task 设置波形频率(double 频率_Hz, CancellationToken ct = default)
+            => await SendAsync(string.Format(CultureInfo.InvariantCulture, "WAVE:FREQuency {0:F1}{1}", 频率_Hz, ScpiDelimiter), ct);
+
+        public virtual async Task 设置波形幅值(double 幅值, CancellationToken ct = default)
+            => await SendAsync(string.Format(CultureInfo.InvariantCulture, "WAVE:SETValue {0:F3}{1}", 幅值, ScpiDelimiter), ct);
+
+        public virtual async Task 设置波形时间(double 时间_ms, CancellationToken ct = default)
+            => await SendAsync(string.Format(CultureInfo.InvariantCulture, "WAVE:TIMe {0:F1}{1}", 时间_ms, ScpiDelimiter), ct);
+
+        public virtual async Task 设置波形叠加值(double 叠加值, CancellationToken ct = default)
+            => await SendAsync(string.Format(CultureInfo.InvariantCulture, "WAVE:BVALue {0:F3}{1}", 叠加值, ScpiDelimiter), ct);
+
+        #endregion
+
+        #region 内阻测试 ESR (ESR:*)
+
+        public virtual async Task 设置ESR带载量程(int 量程, CancellationToken ct = default)
+            => await SendAsync($"ESR:LOADRange {量程}{ScpiDelimiter}", ct);
+
+        public virtual async Task 设置ESR大量程带载电流(double 电流, CancellationToken ct = default)
+            => await SendAsync(string.Format(CultureInfo.InvariantCulture, "ESR:CURRenthigh {0:F3}{1}", 电流, ScpiDelimiter), ct);
+
+        public virtual async Task 设置ESR测量方法(int 方法, CancellationToken ct = default)
+            => await SendAsync($"ESR:MODE {方法}{ScpiDelimiter}", ct); // 0-方波平均法, 1-单脉冲法
+
+        public virtual async Task 设置ESR采样量程(int 量程, CancellationToken ct = default)
+            => await SendAsync($"ESR:MEASurerange {量程}{ScpiDelimiter}", ct); // 0-1000mV, 1-100mV, 2-10mV
+
+        public virtual async Task<string> 查询ESR状态(CancellationToken ct = default)
+            => await WriteReadAsync($"ESR:STAtus?{ScpiDelimiter}", ScpiDelimiter, ct);
+
+        public virtual async Task<string> 读取ESR结果(CancellationToken ct = default)
+            => await WriteReadAsync($"ESR:RESult?{ScpiDelimiter}", ScpiDelimiter, ct);
+
+        #endregion
+
+        #region MPPT 测试 (MPP:*)
+
+        public virtual async Task 设置MPPT步进电压(double 电压_V, CancellationToken ct = default)
+            => await SendAsync(string.Format(CultureInfo.InvariantCulture, "MPP:BVOLtage {0:F3}{1}", 电压_V, ScpiDelimiter), ct);
+
+        public virtual async Task 设置MPPT步进时间(double 时间_s, CancellationToken ct = default)
+            => await SendAsync(string.Format(CultureInfo.InvariantCulture, "MPP:TIME {0:F1}{1}", 时间_s, ScpiDelimiter), ct);
+
+        public virtual async Task 设置MPPT模式(int 模式, CancellationToken ct = default)
+            => await SendAsync($"MPP:MODE {模式}{ScpiDelimiter}", ct); // 0-扫描模式, 1-跟踪模式
+
+        public virtual async Task<string> 查询MPPT状态(CancellationToken ct = default)
+            => await WriteReadAsync($"MPP:STATus?{ScpiDelimiter}", ScpiDelimiter, ct);
+
+        public virtual async Task<string> 读取MPPT最大功率(CancellationToken ct = default)
+            => await WriteReadAsync($"MPP:MPOWer?{ScpiDelimiter}", ScpiDelimiter, ct);
+
+        public virtual async Task<string> 读取MPPT最大功率电压(CancellationToken ct = default)
+            => await WriteReadAsync($"MPP:MVOLtage?{ScpiDelimiter}", ScpiDelimiter, ct);
+
+        public virtual async Task<string> 读取MPPT最大功率电流(CancellationToken ct = default)
+            => await WriteReadAsync($"MPP:MCURrent?{ScpiDelimiter}", ScpiDelimiter, ct);
+
+        public virtual async Task<string> 读取MPPT开路电压(CancellationToken ct = default)
+            => await WriteReadAsync($"MPP:OVOLtage?{ScpiDelimiter}", ScpiDelimiter, ct);
+
+        public virtual async Task<string> 读取MPPT短路电流(CancellationToken ct = default)
+            => await WriteReadAsync($"MPP:SCURrent?{ScpiDelimiter}", ScpiDelimiter, ct);
+
+        #endregion
+
+        #endregion
     }
 }

DeviceCommand/Devices/SDS2000X_HD.cs

@@ -7,7 +7,7 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace DeviceCommand.Device
+namespace DeviceCommand.Devices
 {
     [ADPCommand]
     public class SDS2000X_HD : Tcp
@@ -31,7 +31,13 @@ namespace DeviceCommand.Device
         {
             await SendAsync($"*CLS{ScpiDelimiter}", ct);
         }
-
+        /// <summary>
+        /// 查询错误信息
+        /// </summary>
+        public virtual async Task<string> 查询错误信息(CancellationToken ct = default)
+        {
+            return await WriteReadAsync($":SYSTem:ERRor?{ScpiDelimiter}", ScpiDelimiter, ct); //[cite: 1]
+        }
         /// <summary>
         /// 读取示波器识别字符串（制造商、型号、序列号、固件版本）
         /// </summary>

DeviceCommand/Devices/SPAW7000.cs

@@ -6,7 +6,7 @@ using System.Globalization;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace DeviceCommand.Device
+namespace DeviceCommand.Devices
 {
     [ADPCommand]
     public class SPAW7000 : Tcp
@@ -31,7 +31,14 @@ namespace DeviceCommand.Device
         {
             await SendAsync($"*CLS{ScpiDelimiter}", ct);
         }
-
+        /// <summary>
+        /// 查询错误信息 发hsl居然可以但是手册上没有而且软件上也用不了这个命令
+        /// </summary>
+        //public virtual async Task<string> 查询错误信息(CancellationToken ct = default)
+        //{
+        //    string query = string.Format(":SYSTem:ERRor?", ScpiDelimiter);
+        //    return await WriteReadAsync(query, ScpiDelimiter, ct);
+        //}
         /// <summary>
         /// 读取功率分析仪识别字符串（制造商、产品型号、系统 SN、软件版本号）
         /// </summary>

DeviceCommand/Flexible/FModbusRTU.cs

@@ -0,0 +1,193 @@
+using Common.Attributes;
+using NModbus;
+using NModbus.Serial;
+using System;
+using System.IO.Ports;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace DeviceCommand.Flexible
+{
+    [ADPCommand]
+    public static class FModbusRTU
+    {
+        private static readonly SemaphoreSlim _commLock = new(1, 1);
+
+        private static SerialPort CreatePort(
+            string portName,
+            int baudRate,
+            int dataBits,
+            StopBits stopBits,
+            Parity parity,
+            int readTimeout,
+            int writeTimeout)
+        {
+            return new SerialPort(portName, baudRate, parity, dataBits, stopBits)
+            {
+                ReadTimeout = readTimeout > 0 ? readTimeout : SerialPort.InfiniteTimeout,
+                WriteTimeout = writeTimeout > 0 ? writeTimeout : SerialPort.InfiniteTimeout
+            };
+        }
+
+        private static IModbusMaster CreateMaster(SerialPort port)
+        {
+            return new ModbusFactory().CreateRtuMaster(port);
+        }
+
+        #region Holding Register
+
+        public static async Task<ushort[]> ReadHoldingRegistersAsync(
+            string portName,
+            int baudRate,
+            byte slaveAddress,
+            ushort startAddress,
+            ushort numberOfPoints,
+            int dataBits = 8,
+            StopBits stopBits = StopBits.One,
+            Parity parity = Parity.None,
+            int readTimeout = 3000,
+            int writeTimeout = 3000,
+            CancellationToken ct = default)
+        {
+            await _commLock.WaitAsync(ct);
+            try
+            {
+                using var port = CreatePort(
+                    portName, baudRate, dataBits, stopBits, parity, readTimeout, writeTimeout);
+
+                port.Open();
+
+                var master = CreateMaster(port);
+
+                using var cts = CancellationTokenSource.CreateLinkedTokenSource(ct);
+                if (readTimeout > 0)
+                    cts.CancelAfter(readTimeout);
+
+                return await master
+                    .ReadHoldingRegistersAsync(slaveAddress, startAddress, numberOfPoints)
+                    .WaitAsync(TimeSpan.FromMilliseconds(readTimeout),cts.Token);
+            }
+            finally
+            {
+                _commLock.Release();
+            }
+        }
+
+        public static async Task WriteSingleRegisterAsync(
+            string portName,
+            int baudRate,
+            byte slaveAddress,
+            ushort registerAddress,
+            ushort value,
+            int dataBits = 8,
+            StopBits stopBits = StopBits.One,
+            Parity parity = Parity.None,
+            int readTimeout = 3000,
+            int writeTimeout = 3000,
+            CancellationToken ct = default)
+        {
+            await _commLock.WaitAsync(ct);
+            try
+            {
+                using var port = CreatePort(
+                    portName, baudRate, dataBits, stopBits, parity, readTimeout, writeTimeout);
+
+                port.Open();
+
+                var master = CreateMaster(port);
+
+                using var cts = CancellationTokenSource.CreateLinkedTokenSource(ct);
+                if (writeTimeout > 0)
+                    cts.CancelAfter(writeTimeout);
+
+                await master
+                    .WriteSingleRegisterAsync(slaveAddress, registerAddress, value)
+                    .WaitAsync(TimeSpan.FromMilliseconds(writeTimeout),cts.Token);
+            }
+            finally
+            {
+                _commLock.Release();
+            }
+        }
+
+        #endregion
+
+        #region Coil
+
+        public static async Task<bool[]> ReadCoilsAsync(
+            string portName,
+            int baudRate,
+            byte slaveAddress,
+            ushort startAddress,
+            ushort numberOfPoints,
+            int dataBits = 8,
+            StopBits stopBits = StopBits.One,
+            Parity parity = Parity.None,
+            int readTimeout = 3000,
+            int writeTimeout = 3000,
+            CancellationToken ct = default)
+        {
+            await _commLock.WaitAsync(ct);
+            try
+            {
+                using var port = CreatePort(
+                    portName, baudRate, dataBits, stopBits, parity, readTimeout, writeTimeout);
+
+                port.Open();
+
+                var master = CreateMaster(port);
+
+                using var cts = CancellationTokenSource.CreateLinkedTokenSource(ct);
+                if (readTimeout > 0)
+                    cts.CancelAfter(readTimeout);
+
+                return await master
+                    .ReadCoilsAsync(slaveAddress, startAddress, numberOfPoints)
+                    .WaitAsync(TimeSpan.FromMilliseconds(readTimeout),cts.Token);
+            }
+            finally
+            {
+                _commLock.Release();
+            }
+        }
+
+        public static async Task WriteSingleCoilAsync(
+            string portName,
+            int baudRate,
+            byte slaveAddress,
+            ushort coilAddress,
+            bool value,
+            int dataBits = 8,
+            StopBits stopBits = StopBits.One,
+            Parity parity = Parity.None,
+            int readTimeout = 3000,
+            int writeTimeout = 3000,
+            CancellationToken ct = default)
+        {
+            await _commLock.WaitAsync(ct);
+            try
+            {
+                using var port = CreatePort(
+                    portName, baudRate, dataBits, stopBits, parity, readTimeout, writeTimeout);
+
+                port.Open();
+
+                var master = CreateMaster(port);
+
+                using var cts = CancellationTokenSource.CreateLinkedTokenSource(ct);
+                if (writeTimeout > 0)
+                    cts.CancelAfter(writeTimeout);
+
+                await master
+                    .WriteSingleCoilAsync(slaveAddress, coilAddress, value)
+                    .WaitAsync(TimeSpan.FromMilliseconds(writeTimeout), cts.Token);
+            }
+            finally
+            {
+                _commLock.Release();
+            }
+        }
+
+        #endregion
+    }
+}

DeviceCommand/Flexible/FModbusTCP.cs

@@ -0,0 +1,133 @@
+using Common.Attributes;
+using NModbus;
+using System;
+using System.Net.Sockets;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace DeviceCommand.Flexible
+{
+    [ADPCommand]
+    public static class FModbusTCP
+    {
+        private static readonly SemaphoreSlim _commLock = new(1, 1);
+
+        private static  async Task<IModbusMaster> ConnectAsync(string ipAddress, int port, int sendTimeout, int receiveTimeout, CancellationToken ct)
+        {
+            var tcpClient = new TcpClient();
+            using var cts = CancellationTokenSource.CreateLinkedTokenSource(ct);
+            if (sendTimeout > 0)
+                cts.CancelAfter(sendTimeout);
+
+            await tcpClient.ConnectAsync(ipAddress, port, cts.Token);
+            return new ModbusFactory().CreateMaster(tcpClient);
+        }
+
+        #region Holding Registers
+
+        public static async Task<ushort[]> ReadHoldingRegistersAsync(
+            string ipAddress,
+            int port,
+            byte slaveAddress,
+            ushort startAddress,
+            ushort numberOfPoints,
+            int sendTimeout = 3000,
+            int receiveTimeout = 3000,
+            CancellationToken ct = default)
+        {
+            await _commLock.WaitAsync(ct);
+            try
+            {
+                using var master = await ConnectAsync(ipAddress, port, sendTimeout, receiveTimeout, ct) as IDisposable;
+                var result = await ((IModbusMaster)master)
+                    .ReadHoldingRegistersAsync(slaveAddress, startAddress, numberOfPoints)
+                    .WaitAsync(TimeSpan.FromMilliseconds(receiveTimeout), ct);
+                return result;
+            }
+            finally
+            {
+                _commLock.Release();
+            }
+        }
+
+        public static async Task WriteSingleRegisterAsync(
+            string ipAddress,
+            int port,
+            byte slaveAddress,
+            ushort registerAddress,
+            ushort value,
+            int sendTimeout = 3000,
+            int receiveTimeout = 3000,
+            CancellationToken ct = default)
+        {
+            await _commLock.WaitAsync(ct);
+            try
+            {
+                using var master = await ConnectAsync(ipAddress, port, sendTimeout, receiveTimeout, ct) as IDisposable;
+                await ((IModbusMaster)master)
+                    .WriteSingleRegisterAsync(slaveAddress, registerAddress, value)
+                    .WaitAsync(TimeSpan.FromMilliseconds(sendTimeout),ct);
+            }
+            finally
+            {
+                _commLock.Release();
+            }
+        }
+
+        #endregion
+
+        #region Coils
+
+        public static async Task<bool[]> ReadCoilsAsync(
+            string ipAddress,
+            int port,
+            byte slaveAddress,
+            ushort startAddress,
+            ushort numberOfPoints,
+            int sendTimeout = 3000,
+            int receiveTimeout = 3000,
+            CancellationToken ct = default)
+        {
+            await _commLock.WaitAsync(ct);
+            try
+            {
+                using var master = await ConnectAsync(ipAddress, port, sendTimeout, receiveTimeout, ct) as IDisposable;
+                var result = await ((IModbusMaster)master)
+                    .ReadCoilsAsync(slaveAddress, startAddress, numberOfPoints)
+                    .WaitAsync(TimeSpan.FromMilliseconds(receiveTimeout), ct);
+                return result;
+            }
+            finally
+            {
+                _commLock.Release();
+            }
+        }
+
+        public static async Task WriteSingleCoilAsync(
+            string ipAddress,
+            int port,
+            byte slaveAddress,
+            ushort coilAddress,
+            bool value,
+            int sendTimeout = 3000,
+            int receiveTimeout = 3000,
+            CancellationToken ct = default)
+        {
+            await _commLock.WaitAsync(ct);
+            try
+            {
+                using var master = await ConnectAsync(ipAddress, port, sendTimeout, receiveTimeout, ct) as IDisposable;
+                await ((IModbusMaster)master)
+                    .WriteSingleCoilAsync(slaveAddress, coilAddress, value)
+                    .WaitAsync(TimeSpan.FromMilliseconds(sendTimeout),ct);
+            }
+            finally
+            {
+                _commLock.Release();
+            }
+        }
+
+        #endregion
+    }
+}

DeviceCommand/Flexible/FSerialPort.cs

@@ -0,0 +1,104 @@
+using Common.Attributes;
+using System;
+using System.IO.Ports;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace DeviceCommand.Flexible
+{
+    [ADPCommand]
+    public static class FSerialPort
+    {
+        private static readonly SemaphoreSlim _commLock = new(1, 1);
+
+        private static SerialPort CreatePort(string portName, int baudRate, Parity parity, int dataBits, StopBits stopBits, int sendTimeout,int receiveTimeout)
+        {
+            return new SerialPort(portName, baudRate, parity, dataBits, stopBits)
+            {
+                Encoding = Encoding.UTF8,
+                WriteTimeout = sendTimeout > 0 ? sendTimeout : SerialPort.InfiniteTimeout,
+                ReadTimeout = receiveTimeout > 0 ? receiveTimeout : SerialPort.InfiniteTimeout
+            };
+        }
+
+        #region 最常用：只发送字符串
+
+        public static async Task SendAsync(string portName,int baudRate,Parity parity,int dataBits,StopBits stopBits,int sendTimeout,int receiveTimeout,string command,CancellationToken ct = default)
+        {
+            await _commLock.WaitAsync(ct);
+            try
+            {
+                using var port = CreatePort(
+                    portName, baudRate, parity, dataBits, stopBits, sendTimeout, receiveTimeout);
+
+                port.Open();
+
+                using var cts = CancellationTokenSource.CreateLinkedTokenSource(ct);
+                if (sendTimeout > 0)
+                    cts.CancelAfter(sendTimeout);
+
+                var bytes = port.Encoding.GetBytes(command);
+                await port.BaseStream.WriteAsync(bytes, 0, bytes.Length, cts.Token);
+                await port.BaseStream.FlushAsync(cts.Token);
+            }
+            finally
+            {
+                _commLock.Release();
+            }
+        }
+
+        #endregion
+
+        #region 最常用：发送字符串并读取字符串
+
+        public static async Task<string> SendReadAsync(string portName,int baudRate, Parity parity, int dataBits, StopBits stopBits,int sendTimeout, int receiveTimeout,string command,string delimiter = "\n", CancellationToken ct = default)
+        {
+            await _commLock.WaitAsync(ct);
+            try
+            {
+                using var port = CreatePort(
+                    portName, baudRate, parity, dataBits, stopBits, sendTimeout, receiveTimeout);
+
+                port.Open();
+
+                // Send
+                var sendBytes = port.Encoding.GetBytes(command);
+                await port.BaseStream.WriteAsync(sendBytes, 0, sendBytes.Length, ct);
+                await port.BaseStream.FlushAsync(ct);
+
+                // Read
+                delimiter ??= "\n";
+                var sb = new StringBuilder();
+                byte[] buffer = new byte[256];
+
+                using var cts = CancellationTokenSource.CreateLinkedTokenSource(ct);
+                if (receiveTimeout > 0)
+                    cts.CancelAfter(receiveTimeout);
+
+                while (!cts.Token.IsCancellationRequested)
+                {
+                    int read = await port.BaseStream.ReadAsync(
+                        buffer, 0, buffer.Length, cts.Token);
+
+                    if (read == 0)
+                        break;
+
+                    sb.Append(port.Encoding.GetString(buffer, 0, read));
+
+                    int index = sb.ToString().IndexOf(delimiter, StringComparison.Ordinal);
+                    if (index >= 0)
+                        return sb.ToString(0, index).Trim();
+                }
+
+                throw new TimeoutException("串口读取超时");
+            }
+            finally
+            {
+                _commLock.Release();
+            }
+        }
+
+        #endregion
+    }
+}

DeviceCommand/Flexible/FTCP.cs

@@ -0,0 +1,115 @@
+using Common.Attributes;
+using System.Net.Sockets;
+using System.Text;
+
+namespace DeviceCommand.Flexible
+{
+    [ADPCommand]
+    public static class FTCP
+    {
+        private static readonly SemaphoreSlim _commLock = new(1, 1);
+
+        #region Send
+
+        public static async Task SendAsync(string ipAddress,int port,int sendTimeout, byte[] buffer, CancellationToken ct = default)
+        {
+            await _commLock.WaitAsync(ct);
+            try
+            {
+                using var client = new TcpClient();
+                client.SendTimeout = sendTimeout;
+
+                await client.ConnectAsync(ipAddress, port, ct);
+
+                using NetworkStream stream = client.GetStream();
+                await stream.WriteAsync(buffer, 0, buffer.Length, ct).WaitAsync(TimeSpan.FromMilliseconds(sendTimeout));
+            }
+            finally
+            {
+                _commLock.Release();
+            }
+        }
+
+        public static Task SendAsync(string ipAddress, int port,int sendTimeout, string text,CancellationToken ct = default)
+        {
+            return SendAsync( ipAddress, port, sendTimeout, Encoding.UTF8.GetBytes(text),ct);
+        }
+
+        #endregion
+
+        #region Read
+
+        public static async Task<byte[]> ReadAsync(string ipAddress,int port,int receiveTimeout,int length,CancellationToken ct = default)
+        {
+            await _commLock.WaitAsync(ct);
+            try
+            {
+                using var client = new TcpClient();
+                client.ReceiveTimeout = receiveTimeout;
+
+                await client.ConnectAsync(ipAddress, port, ct);
+
+                using NetworkStream stream = client.GetStream();
+                byte[] buffer = new byte[length];
+                int offset = 0;
+
+                using var cts = CancellationTokenSource.CreateLinkedTokenSource(ct);
+                if (receiveTimeout > 0)
+                    cts.CancelAfter(receiveTimeout);
+
+                while (offset < length)
+                {
+                    int read = await stream.ReadAsync(buffer, offset, length - offset, cts.Token);
+                    if (read == 0) break;
+                    offset += read;
+                }
+
+                return buffer[..offset];
+            }
+            finally
+            {
+                _commLock.Release();
+            }
+        }
+
+        public static async Task<string> ReadLineAsync( string ipAddress,   int port,   int receiveTimeout,  string delimiter = "\n",CancellationToken ct = default)
+        {
+            await _commLock.WaitAsync(ct);
+            try
+            {
+                using var client = new TcpClient();
+                client.ReceiveTimeout = receiveTimeout;
+
+                await client.ConnectAsync(ipAddress, port, ct);
+
+                using NetworkStream stream = client.GetStream();
+                var sb = new StringBuilder();
+                byte[] buffer = new byte[1024];
+
+                using var cts = CancellationTokenSource.CreateLinkedTokenSource(ct);
+                if (receiveTimeout > 0)
+                    cts.CancelAfter(receiveTimeout);
+
+                while (!cts.Token.IsCancellationRequested)
+                {
+                    int bytesRead = await stream.ReadAsync(buffer, 0, buffer.Length, cts.Token);
+                    if (bytesRead == 0) break;
+
+                    sb.Append(Encoding.UTF8.GetString(buffer, 0, bytesRead));
+
+                    int index = sb.ToString().IndexOf(delimiter, StringComparison.Ordinal);
+                    if (index >= 0)
+                        return sb.ToString(0, index).Trim();
+                }
+
+                throw new TimeoutException("读取超时或对端关闭");
+            }
+            finally
+            {
+                _commLock.Release();
+            }
+        }
+
+        #endregion
+    }
+}

DeviceEditModule/ViewModels/IT7800EViewModel.cs

@@ -1,4 +1,4 @@
-using DeviceCommand.Device;
+using DeviceCommand.Devices;
 using Prism.Commands;
 using Prism.Ioc;
 using System;
@@ -92,9 +92,9 @@ namespace DeviceEditModule.ViewModels
             set => SetProperty(ref _currentLimit, value);
         }
 
-        private string _selectedMode = "AC";
+        private PowerCouplingMode _selectedMode = PowerCouplingMode.AC;
         /// <summary>待设置的电源工作模式：AC / DC / ACDC。</summary>
-        public string SelectedMode
+        public PowerCouplingMode SelectedMode
         {
             get => _selectedMode;
             set => SetProperty(ref _selectedMode, value);

DeviceEditModule/ViewModels/N36200ViewModel.cs

@@ -1,4 +1,4 @@
-using DeviceCommand.Device;
+using DeviceCommand.Devices;
 using Prism.Commands;
 using Prism.Ioc;
 using System;

DeviceEditModule/ViewModels/N36600ViewModel.cs

@@ -1,4 +1,4 @@
-using DeviceCommand.Device;
+using DeviceCommand.Devices;
 using Prism.Commands;
 using Prism.Ioc;
 using System;

DeviceEditModule/ViewModels/N69200ViewModel.cs

@@ -1,4 +1,4 @@
-using DeviceCommand.Device;
+using DeviceCommand.Devices;
 using Prism.Commands;
 using Prism.Ioc;
 using System;
@@ -6,6 +6,7 @@ using System.Threading;
 using System.Windows.Input;
 using UIShare.GlobalVariable;
 using UIShare.ViewModelBase;
+using static DeviceCommand.Devices.N69200;
 
 namespace DeviceEditModule.ViewModels
 {
@@ -49,9 +50,9 @@ namespace DeviceEditModule.ViewModels
 
         #region 输入参数属性
 
-        private string _selectedMode = "CC";
+        private DeviceWorkMode _selectedMode = DeviceWorkMode.CC;
         /// <summary>工作模式：CC / CV / CP / CR。</summary>
-        public string SelectedMode
+        public DeviceWorkMode SelectedMode
         {
             get => _selectedMode;
             set => SetProperty(ref _selectedMode, value);
@@ -155,8 +156,7 @@ namespace DeviceEditModule.ViewModels
         public ICommand SetOcpCommand          { get; }
         public ICommand SetOppCommand          { get; }
         public ICommand ClearAlarmCommand      { get; }
-        public ICommand SetRemoteModeCommand   { get; }
-        public ICommand SetLocalModeCommand    { get; }
+   
 
         #endregion
 
@@ -174,32 +174,30 @@ namespace DeviceEditModule.ViewModels
             SetOcpCommand          = new DelegateCommand(async () => await Exec(async () => { await _device!.设置过流保护值_OCP(OcpValue, Ct()); AppendLog($"OCP已设为 {OcpValue} A"); }));
             SetOppCommand          = new DelegateCommand(async () => await Exec(async () => { await _device!.设置过功率保护值_OPP(OppValue, Ct()); AppendLog($"OPP已设为 {OppValue} W"); }));
             ClearAlarmCommand      = new DelegateCommand(async () => await Exec(async () => { await _device!.清除保护告警(Ct()); AppendLog("保护告警已清除"); }));
-            SetRemoteModeCommand   = new DelegateCommand(async () => await Exec(async () => { await _device!.切换远程控制模式(Ct()); AppendLog("已切换到远程控制模式"); }));
-            SetLocalModeCommand    = new DelegateCommand(async () => await Exec(async () => { await _device!.切换本地控制模式(Ct()); AppendLog("已切换到本地控制模式"); }));
+  
 
             SetLoadValueCommand = new DelegateCommand(async () => await Exec(async () =>
             {
-                var mode = SelectedMode.ToUpperInvariant();
-                switch (mode)
+                switch (SelectedMode)
                 {
-                    case "CC":
+                    case DeviceWorkMode.CC:
                         await _device!.设置恒电流CC(LoadValue, Ct());
                         AppendLog($"恒流 CC 已设为 {LoadValue} A");
                         break;
-                    case "CV":
+                    case DeviceWorkMode.CV:
                         await _device!.设置恒电压CV(LoadValue, Ct());
                         AppendLog($"恒压 CV 已设为 {LoadValue} V");
                         break;
-                    case "CP":
+                    case DeviceWorkMode.CP:
                         await _device!.设置恒功率CP(LoadValue, Ct());
                         AppendLog($"恒功率 CP 已设为 {LoadValue} W");
                         break;
-                    case "CR":
+                    case DeviceWorkMode.CR:
                         await _device!.设置恒电阻CR(LoadValue, Ct());
                         AppendLog($"恒电阻 CR 已设为 {LoadValue} Ω");
                         break;
                     default:
-                        AppendLog($"未知模式 {SelectedMode}，无法设置设定值");
+                        AppendLog($"模式 {SelectedMode} 不支持设置设定值");
                         break;
                 }
             }));

DeviceEditModule/ViewModels/SDS2000X_HDViewModel.cs

@@ -1,4 +1,4 @@
-using DeviceCommand.Device;
+using DeviceCommand.Devices;
 using Prism.Commands;
 using Prism.Ioc;
 using System;
@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 using System.Windows.Input;
 using UIShare.GlobalVariable;
 using UIShare.ViewModelBase;
-using static DeviceCommand.Device.SDS2000X_HD;
+using static DeviceCommand.Devices.SDS2000X_HD;
 
 namespace DeviceEditModule.ViewModels
 {

DeviceEditModule/ViewModels/SPAW7000ViewModel.cs

@@ -1,4 +1,4 @@
-using DeviceCommand.Device;
+using DeviceCommand.Devices;
 using Prism.Commands;
 using Prism.Ioc;
 using System;

DeviceEditModule/Views/N69200View.xaml

@@ -100,14 +100,15 @@
                             <!-- 工作模式 -->
                             <StackPanel Orientation="Horizontal" Margin="0,4">
                                 <TextBlock Text="工作模式" Style="{StaticResource ParamLabel}"/>
-                                <ComboBox Width="90" Height="32" Margin="4,0"
+                                <ComboBox  xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                                    Width="90" Height="32" Margin="4,0"
                                           materialDesign:HintAssist.Hint=""
                                           SelectedItem="{Binding SelectedMode}"
                                           VerticalContentAlignment="Center" FontSize="12">
-                                    <ComboBoxItem Content="CC"/>
-                                    <ComboBoxItem Content="CV"/>
-                                    <ComboBoxItem Content="CP"/>
-                                    <ComboBoxItem Content="CR"/>
+                                    <sys:String>CC</sys:String>
+                                    <sys:String>CV</sys:String>
+                                    <sys:String>CP</sys:String>
+                                    <sys:String>CR</sys:String>
                                 </ComboBox>
                                 <Button Content="设置" Command="{Binding SetModeCommand}"
                                         Style="{StaticResource CmdBtn}"/>
@@ -115,13 +116,13 @@
                                         Style="{StaticResource CmdBtn}"/>
                             </StackPanel>
                             <!-- 远程/本地 -->
-                            <StackPanel Orientation="Horizontal" Margin="0,4">
+                            <!--<StackPanel Orientation="Horizontal" Margin="0,4">
                                 <TextBlock Text="控制模式" Style="{StaticResource ParamLabel}"/>
                                 <Button Content="远程控制" Command="{Binding SetRemoteModeCommand}"
                                         Style="{StaticResource CmdBtn}"/>
                                 <Button Content="本地控制" Command="{Binding SetLocalModeCommand}"
                                         Style="{StaticResource CmdBtn}"/>
-                            </StackPanel>
+                            </StackPanel>-->
                             <!-- 系统操作 -->
                             <StackPanel Orientation="Horizontal" Margin="0,4">
                                 <TextBlock Text="系统操作" Style="{StaticResource ParamLabel}"/>

ExportModule/ExportModule.cs

@@ -0,0 +1,20 @@
+
+using ExportModule.Views;
+using System.Reflection;
+
+namespace ExportModule
+{
+    public class ExportModule: IModule
+    {
+        public void OnInitialized(IContainerProvider containerProvider)
+        {
+            IRegionManager regionManager = containerProvider.Resolve<IRegionManager>();
+        }
+
+        public void RegisterTypes(IContainerRegistry containerRegistry)
+        {
+            containerRegistry.RegisterForNavigation<ExportView>("ExportView");
+        }
+    }
+
+}

ExportModule/ExportModule.csproj

@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows</TargetFramework>
+    <Nullable>enable</Nullable>
+    <UseWPF>true</UseWPF>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="ClosedXML" Version="0.104.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\ORM\ORM.csproj" />
+    <ProjectReference Include="..\Service\Service.csproj" />
+    <ProjectReference Include="..\UIShare\UIShare.csproj" />
+  </ItemGroup>
+
+</Project>

ExportModule/ViewModels/ExportViewModel.cs

@@ -0,0 +1,262 @@
+using ClosedXML.Excel;
+using Logger;
+using Microsoft.Win32;
+using Model;
+using Model.Entity;
+using Model.Models;
+using Service.Interface;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows.Input;
+using UIShare.ViewModelBase;
+
+namespace ExportModule.ViewModels
+{
+    public class ExportViewModel : NavigateViewModelBase, IRegionMemberLifetime, IDisposable
+    {
+        #region 属性
+        public bool KeepAlive => true;
+
+        private ObservableCollection<TestReportModel> _testReportModelList = new();
+
+        public ObservableCollection<TestReportModel> TestReportModelList
+        {
+            get { return _testReportModelList; }
+            set { SetProperty(ref _testReportModelList, value); }
+        }
+
+        private DateTime? _startTime;
+        public DateTime? StartTime
+        {
+            get => _startTime;
+            set => SetProperty(ref _startTime, value);
+        }
+
+        private DateTime? _endTime;
+        public DateTime? EndTime
+        {
+            get => _endTime;
+            set => SetProperty(ref _endTime, value);
+        }
+
+        private string _selectedScope = "全部";
+        public string SelectedScope
+        {
+            get => _selectedScope;
+            set => SetProperty(ref _selectedScope, value);
+        }
+
+        public ObservableCollection<string> ScopeOptions { get; } = new()
+        {
+            "全部",
+            "TestCell1", "TestCell2", "TestCell3", "TestCell4",
+            "TestCell5", "TestCell6", "TestCell7", "TestCell8"
+        };
+
+        private string _statusMessage = "就绪";
+        public string StatusMessage
+        {
+            get => _statusMessage;
+            set => SetProperty(ref _statusMessage, value);
+        }
+
+        private int _totalCount;
+        public int TotalCount
+        {
+            get => _totalCount;
+            set => SetProperty(ref _totalCount, value);
+        }
+
+        private TestReportModel? _selectedTestReport;
+        public TestReportModel? SelectedTestReport
+        {
+            get => _selectedTestReport;
+            set => SetProperty(ref _selectedTestReport, value);
+        }
+        #endregion
+
+        #region 命令
+        public ICommand LoadedCommand { get; }
+        public ICommand QueryCommand { get; }
+        public ICommand ExportCommand { get; }
+        #endregion
+
+        #region 私有字段
+        private readonly ITestReportService _testReportService;
+        #endregion
+
+        public ExportViewModel(IContainerProvider containerProvider) : base(containerProvider)
+        {
+            _testReportService = containerProvider.Resolve<ITestReportService>();
+
+            LoadedCommand = new AsyncDelegateCommand(OnLoad);
+            QueryCommand = new AsyncDelegateCommand(OnQuery);
+            ExportCommand = new AsyncDelegateCommand(OnExport);
+        }
+
+        #region 命令处理
+
+        /// <summary>
+        /// 加载全部（无筛选条件）
+        /// </summary>
+        private async Task OnLoad()
+        {
+            var result = await _testReportService.GetFilterList();
+            if (result.IsSuccess)
+            {
+                TestReportModelList = new ObservableCollection<TestReportModel>(result.Data ?? new List<TestReportModel>());
+                TotalCount = TestReportModelList.Count;
+                ShowInfoMessageBox($"加载完成，共 {TotalCount} 条记录", () => { });
+            }
+            else
+            {
+                TestReportModelList = new ObservableCollection<TestReportModel>();
+                TotalCount = 0;
+                ShowErrorMessageBox($"加载失败：{result.Msg}", () => { });
+                LoggerHelper.Error(result.Msg);
+            }
+        }
+
+        /// <summary>
+        /// 查询（根据开始日期、结束日期、台架名称筛选）
+        /// </summary>
+        private async Task OnQuery()
+        {
+            // 处理结束日期：若用户只选了日期没选时间，默认到当天末尾
+            DateTime? queryEnd = EndTime;
+            if (queryEnd.HasValue)
+            {
+                queryEnd = queryEnd.Value.Date.AddDays(1).AddSeconds(-1);
+            }
+
+            string? scope = SelectedScope == "全部" ? null : SelectedScope;
+
+            var result = await _testReportService.GetFilterList(StartTime, queryEnd, scope);
+            if (result.IsSuccess)
+            {
+                TestReportModelList = new ObservableCollection<TestReportModel>(result.Data ?? new List<TestReportModel>());
+                TotalCount = TestReportModelList.Count;
+                ShowInfoMessageBox($"查询完成，共 {TotalCount} 条记录", () => { });
+            }
+            else
+            {
+                TestReportModelList = new ObservableCollection<TestReportModel>();
+                TotalCount = 0;
+                ShowErrorMessageBox($"查询失败：{result.Msg}", () => { });
+                LoggerHelper.Error(result.Msg);
+            }
+        }
+
+        /// <summary>
+        /// 导出 Excel：根据用户在表格中选中的 TestReportModel.TestRoundId 查询并导出完整步骤数据
+        /// </summary>
+        private async Task OnExport()
+        {
+            if (SelectedTestReport == null)
+            {
+                ShowErrorMessageBox("请先在列表中选择一条测试记录。", () => { });
+                return;
+            }
+
+            StatusMessage = "正在查询导出数据...";
+            var entityResult = await _testReportService.GetByTestRoundIdAsync(SelectedTestReport.TestRoundId);
+            if (!entityResult.IsSuccess || entityResult.Data == null || entityResult.Data.Count == 0)
+            {
+                ShowErrorMessageBox("未找到该测试记录的详细步骤数据。", () => { });
+                return;
+            }
+
+            var dialog = new SaveFileDialog
+            {
+                Filter = "Excel 工作簿 (*.xlsx)|*.xlsx|所有文件 (*.*)|*.*",
+                DefaultExt = ".xlsx",
+                FileName = $"测试报告_{SelectedTestReport.Scope}_{SelectedTestReport.StartTime:yyyyMMdd_HHmmss}.xlsx"
+            };
+
+            if (dialog.ShowDialog() != true) return;
+
+            var entities = entityResult.Data;
+            StatusMessage = $"正在导出 {entities.Count} 条步骤记录...";
+            await Task.Run(() => ExportToExcel(dialog.FileName, entities));
+            ShowInfoMessageBox($"导出完成，共 {entities.Count} 条步骤记录，已保存至：{dialog.FileName}", () => { });
+        }
+
+        #endregion
+
+        #region 辅助方法
+
+        private static void ExportToExcel(string filePath, List<TestReportEntity> entities)
+        {
+            using var workbook = new XLWorkbook();
+            var ws = workbook.Worksheets.Add("测试报告");
+
+            // 表头
+            string[] headers = {
+                "Id", "CreateTime", "TestRoundId", "Scope", "FileName",
+                "StepIndex", "StepName", "StepType", "MethodName", "MethodFullName",
+                "Result", "RunTimeMs", "OutputValue", "Depth", "IsErrorStep", "LoopRemaining"
+            };
+
+            for (int c = 0; c < headers.Length; c++)
+            {
+                ws.Cell(1, c + 1).Value = headers[c];
+            }
+
+            // 标题行样式
+            var headerRange = ws.Range(1, 1, 1, headers.Length);
+            headerRange.Style.Font.Bold = true;
+            headerRange.Style.Fill.BackgroundColor = XLColor.FromArgb(0xECEFF4);
+            headerRange.Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
+            headerRange.Style.Border.InsideBorder = XLBorderStyleValues.Thin;
+
+            // 填充数据
+            for (int i = 0; i < entities.Count; i++)
+            {
+                var e = entities[i];
+                int row = i + 2;
+
+                ws.Cell(row, 1).Value = e.Id;
+                ws.Cell(row, 2).Value = e.CreateTime.ToString("yyyy-MM-dd HH:mm:ss");
+                ws.Cell(row, 3).Value = e.TestRoundId.ToString();
+                ws.Cell(row, 4).Value = e.Scope ?? "";
+                ws.Cell(row, 5).Value = e.FileName ?? "";
+                ws.Cell(row, 6).Value = e.StepIndex;
+                ws.Cell(row, 7).Value = e.StepName ?? "";
+                ws.Cell(row, 8).Value = e.StepType ?? "";
+                ws.Cell(row, 9).Value = e.MethodName ?? "";
+                ws.Cell(row, 10).Value = e.MethodFullName ?? "";
+                ws.Cell(row, 11).Value = e.Result;
+                ws.Cell(row, 12).Value = e.RunTimeMs;
+                ws.Cell(row, 13).Value = e.OutputValue ?? "";
+                ws.Cell(row, 14).Value = e.Depth;
+                ws.Cell(row, 15).Value = e.IsErrorStep ? "是" : "否";
+                ws.Cell(row, 16).Value = e.LoopRemaining;
+
+                // 数据行边框
+                var dataRange = ws.Range(row, 1, row, headers.Length);
+                dataRange.Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
+                dataRange.Style.Border.InsideBorder = XLBorderStyleValues.Thin;
+            }
+
+            ws.Columns().AdjustToContents();
+            workbook.SaveAs(filePath);
+        }
+
+        #endregion
+
+        #region 生命周期
+
+        public override void OnNavigatedTo(NavigationContext navigationContext)
+        {
+        }
+
+        public void Dispose()
+        {
+        }
+
+        #endregion
+    }
+}

ExportModule/Views/ExportView.xaml

@@ -0,0 +1,204 @@
+<UserControl x:Class="ExportModule.Views.ExportView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:prism="http://prismlibrary.com/"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:converters="clr-namespace:UIShare.Converters;assembly=UIShare"
+             prism:ViewModelLocator.AutoWireViewModel="True"
+             mc:Ignorable="d"
+             d:DesignHeight="700"
+             d:DesignWidth="1200">
+    <UserControl.Resources>
+        <converters:LessThanConverter x:Key="LessThanConverter"/>
+    </UserControl.Resources>
+
+    <Border Background="#F5F7FA">
+        <Grid x:Name="RootGrid" Margin="8">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="Auto"/>
+            </Grid.RowDefinitions>
+
+            <!-- ========== 标题 ========== -->
+            <TextBlock Grid.Row="0"
+                       Text="测试报告导出"
+                       FontSize="20" FontWeight="Bold"
+                       Margin="4,4,0,12"/>
+
+            <!-- ========== 主内容卡片 ========== -->
+            <Border Grid.Row="1"
+                    Background="White"
+                    BorderBrush="#DDD" BorderThickness="1"
+                    CornerRadius="4">
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <!-- 工具栏 -->
+                        <RowDefinition Height="Auto"/>
+                        <!-- 数据表格 -->
+                        <RowDefinition Height="*"/>
+                    </Grid.RowDefinitions>
+
+                    <!-- ====== 工具栏（筛选条件 + 操作按钮） ====== -->
+                    <Border Grid.Row="0"
+                            Background="#ECEFF4"
+                            Padding="12,8"
+                            BorderBrush="#DDD" BorderThickness="0,0,0,1">
+
+                        <!-- 第一行：筛选条件 -->
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="160"/>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="160"/>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="120"/>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+
+                            <!-- 开始日期 -->
+                            <TextBlock Grid.Column="0"
+                                       Text="开始日期："
+                                       VerticalAlignment="Center"
+                                       FontWeight="SemiBold"
+                                       Margin="0,0,4,0"/>
+                            <DatePicker Grid.Column="1"
+                                        materialDesign:HintAssist.Hint=""
+                                        SelectedDate="{Binding StartTime}"
+                                        VerticalAlignment="Center"
+                                        Margin="0,0,16,0"/>
+
+                            <!-- 结束日期 -->
+                            <TextBlock Grid.Column="2"
+                                       Text="结束日期："
+                                       VerticalAlignment="Center"
+                                       FontWeight="SemiBold"
+                                       Margin="0,0,4,0"/>
+                            <DatePicker Grid.Column="3"
+                                        materialDesign:HintAssist.Hint=""
+                                        SelectedDate="{Binding EndTime}"
+                                        VerticalAlignment="Center"
+                                        Margin="0,0,16,0"/>
+
+                            <!-- 台架选择 -->
+                            <TextBlock Grid.Column="4"
+                                       Text="台架："
+                                       VerticalAlignment="Center"
+                                       FontWeight="SemiBold"
+                                       Margin="0,0,4,0"/>
+                            <ComboBox Grid.Column="5"
+                                      materialDesign:HintAssist.Hint=""
+                                      ItemsSource="{Binding ScopeOptions}"
+                                      SelectedItem="{Binding SelectedScope}"
+                                      VerticalAlignment="Center"
+                                      Margin="0,0,16,0"/>
+
+                            <!-- 操作按钮 -->
+                            <Button Grid.Column="6"
+                                    Content="查询"
+                                    Command="{Binding QueryCommand}"
+                                    Style="{StaticResource MaterialDesignFlatButton}"
+                                    Padding="16,6"
+                                    Margin="4,0"
+                                    VerticalAlignment="Center"/>
+                            <Button Grid.Column="7"
+                                    Content="导出 Excel"
+                                    Command="{Binding ExportCommand}"
+                                    Style="{StaticResource MaterialDesignFlatButton}"
+                                    Padding="16,6"
+                                    Margin="4,0"
+                                    VerticalAlignment="Center"/>
+                            <Button Grid.Column="8"
+                                    Content="加载全部"
+                                    Command="{Binding LoadedCommand}"
+                                    Style="{StaticResource MaterialDesignFlatButton}"
+                                    Padding="16,6"
+                                    Margin="4,0"
+                                    VerticalAlignment="Center"/>
+                        </Grid>
+                    </Border>
+
+                    <!-- ====== 数据展示区 ====== -->
+                    <DataGrid Grid.Row="1"
+                              ItemsSource="{Binding TestReportModelList}"
+                              AutoGenerateColumns="False"
+                              IsReadOnly="True"
+                              RowHeaderWidth="0"
+                              BorderThickness="0"
+                              Background="White"
+                              AlternatingRowBackground="#F5F7FA"
+                              SelectionMode="Single"
+                              SelectedItem="{Binding SelectedTestReport}"
+                              Margin="8">
+                        <DataGrid.Columns>
+                            <DataGridTextColumn Header="TestRoundId"
+                                                Width="280"
+                                                Binding="{Binding TestRoundId}"/>
+                            <DataGridTextColumn Header="台架名称"
+                                                Width="120"
+                                                Binding="{Binding Scope}"/>
+                            <DataGridTextColumn Header="开始时间"
+                                                Width="180"
+                                                Binding="{Binding StartTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"/>
+                            <DataGridTextColumn Header="结束时间"
+                                                Width="180"
+                                                Binding="{Binding EndTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"/>
+                            <DataGridTextColumn Header="文件名"
+                                                Width="*"
+                                                Binding="{Binding FileName}"/>
+                        </DataGrid.Columns>
+                        <DataGrid.Resources>
+                            <!-- 标题行样式：与项目风格一致 -->
+                            <Style TargetType="DataGridColumnHeader">
+                                <Setter Property="Background" Value="#ECEFF4"/>
+                                <Setter Property="FontWeight" Value="Bold"/>
+                                <Setter Property="BorderBrush" Value="#DDD"/>
+                                <Setter Property="BorderThickness" Value="0,0,1,1"/>
+                                <Setter Property="Padding" Value="8,6"/>
+                            </Style>
+                            <Style TargetType="DataGridCell">
+                                <Setter Property="BorderThickness" Value="0"/>
+                                <Setter Property="Padding" Value="8,4"/>
+                                <Setter Property="VerticalAlignment" Value="Center"/>
+                            </Style>
+                        </DataGrid.Resources>
+                    </DataGrid>
+                </Grid>
+            </Border>
+
+            <!-- ========== 状态栏 ========== -->
+            <Border Grid.Row="2"
+                    Background="#ECEFF4"
+                    Padding="10,6"
+                    Margin="0,8,0,0"
+                    CornerRadius="2">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="Auto"/>
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Grid.Column="0"
+                               Text="{Binding StatusMessage}"
+                               Foreground="#444"
+                               FontSize="12"
+                               VerticalAlignment="Center"/>
+                    <TextBlock Grid.Column="1"
+                               Foreground="#666"
+                               FontSize="12"
+                               VerticalAlignment="Center"
+                               Margin="8,0,0,0">
+                        <Run Text="记录数："/>
+                        <Run Text="{Binding TotalCount}"/>
+                    </TextBlock>
+                </Grid>
+            </Border>
+        </Grid>
+    </Border>
+</UserControl>

ExportModule/Views/ExportView.xaml.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace ExportModule.Views
+{
+    /// <summary>
+    /// ExportView.xaml 的交互逻辑
+    /// </summary>
+    public partial class ExportView : UserControl
+    {
+        public ExportView()
+        {
+            InitializeComponent();
+        }
+    }
+}

MainModule/MainModule.cs

@@ -1,5 +1,5 @@
 using DeviceCommand.Base;
-using DeviceCommand.Device;
+using DeviceCommand.Devices;
 using MainModule.Views;
 using System.Reflection;
 using UIShare.GlobalVariable;

MainModule/ViewModels/AutomatedTestingViewModel.cs

@@ -1,7 +1,9 @@
 using System;
 using System.IO;
+using System.Linq;
+using System.Threading;
 using System.Windows.Input;
-using DeviceCommand.Device;
+using DeviceCommand.Devices;
 using Logger;
 using Prism.Ioc;
 using TestingModule.ViewModels;
@@ -20,6 +22,8 @@ namespace MainModule.ViewModels
         private string _testStatus;
         private readonly IScopedProvider _scope;
         private bool IsInitialized =false;
+        private bool _isRunningErrorSteps = false;
+        private SubscriptionToken? _alarmToken;
         #endregion
 
         #region 属性
@@ -65,6 +69,10 @@ namespace MainModule.ViewModels
                     string json = System.IO.File.ReadAllText(filePath);
                     Newtonsoft.Json.JsonConvert.PopulateObject(json, _systemConfig);
                 }
+                else
+                {
+                    _systemConfig = new SystemConfig();
+                }
             }
             //容器解析顺序不要改变！！！
             _scopedContext = _scope.Resolve<ScopedContext>();
@@ -80,24 +88,108 @@ namespace MainModule.ViewModels
             BackToProtocolCommand = new DelegateCommand(OnBackToProtocol);
             LoadedCommand = new AsyncDelegateCommand(OnLoad);
             _eventAggregator.GetEvent<SilenceBuzzerEvent>().Subscribe(async (scope) => await SilenceBuzzer(scope));
+            _alarmToken = _eventAggregator.GetEvent<AlarmEvent>().Subscribe(OnAlarmTriggered);
         }
 
         private async Task SilenceBuzzer(string scope)
         {
-            if (_deviceManager.DeviceMap.TryGetValue("IO板卡(蜂鸣器)", out var lazyIoBoard))
+            if (_deviceManager.IOGroup == null) return;
+
+            if (scope == "default")
             {
-                if (lazyIoBoard is IOBoard io)
+                for(int i = 1; i <= 8; i++)
                 {
-                    if (scope == "default")
-                        await io.批量写输出开关(1, 0, [false, false, false, false, false, false, false, false]);
-                    else if (scope != TestStatus) return;
-                    else
-                    {
-                        int index = _systemConfig.SharedParameterList.Where(x => x.ParameterName == "蜂鸣器").FirstOrDefault().Value;
-                        await io.写输出开关(1, (ushort)index, false);
-                    }
+                    await _deviceManager.IOGroup.执行台架动作Async(i, 功能动作.蜂鸣器报警, false);
                 }
             }
+            else if (scope == TestStatus)
+            {
+                int 台架号 = _systemConfig.SharedParameterList
+                    .FirstOrDefault(x => x.ParameterName == "台架序号")?.Value ?? 0;
+                if (台架号 >= 1 && 台架号 <= 8)
+                {
+                    await _deviceManager.IOGroup.执行台架动作Async(台架号, 功能动作.蜂鸣器报警, false);
+                }
+            }
+        }
+
+        /// <summary>
+        /// AlarmEvent 回调：
+        ///   上下限 → 蜂鸣器报警 true
+        ///   上下极限 → 蜂鸣器报警 true + 执行对应 scope 的异常流程
+        /// </summary>
+        private async void OnAlarmTriggered((string Scope, string Fingerprint, string Status) args)
+        {
+            if (args.Scope != TestStatus) return;
+            if (_deviceManager?.IOGroup == null) return;
+
+            int 台架号 = _systemConfig.SharedParameterList
+                .FirstOrDefault(x => x.ParameterName == "台架序号")?.Value ?? 0;
+            if (台架号 < 1 || 台架号 > 8) return;
+
+            // 上下限 / 上下极限 均触发蜂鸣器报警
+            await _deviceManager.IOGroup.执行台架动作Async(台架号, 功能动作.蜂鸣器报警, true);
+            LoggerHelper.WarnWithNotify(args.Scope, $"[{args.Scope}] 报警触发: {args.Status} ({args.Fingerprint})，蜂鸣器已开启。");
+
+            // 上下极限额外触发异常流程
+            if (args.Status == "超上极限" || args.Status == "超下极限")
+            {
+                _ = TriggerErrorStepsAsync();
+            }
+        }
+
+        /// <summary>
+        /// 执行异常流程（带并发保护，同一时间仅允许一次）。
+        /// 如果正常流程正在运行，先取消并等待其停止，再执行异常流程。
+        /// </summary>
+        private async Task TriggerErrorStepsAsync()
+        {
+            if (_isRunningErrorSteps) return;
+            _isRunningErrorSteps = true;
+            try
+            {
+                // 1. 如果正常流程正在运行，先停止它
+                //    IsStop == false 表示正在运行；IsStop == null 表示未启动或已结束
+                if (_scopedContext.IsStop == false)
+                {
+                    LoggerHelper.WarnWithNotify(TestStatus, $"[{TestStatus}] 报警触发，正在停止正常流程...");
+                    _stepRunning.stepCTS.Cancel();
+
+                    // 等待 ShellViewModel 清理完毕（IsStop 变回 null、stepCTS 被重置）
+                    // ExecuteMethodStep 内部硬编码使用 stepCTS.Token，必须等它重置后才能跑异常流程
+                    var deadline = DateTime.Now.AddSeconds(5);
+                    while ((_scopedContext.IsStop != null || _stepRunning.stepCTS.IsCancellationRequested)
+                           && DateTime.Now < deadline)
+                    {
+                        await Task.Delay(50);
+                    }
+
+                    // 超时后仍未重置则强制重置，确保异常流程的设备命令能拿到有效 Token
+                    if (_stepRunning.stepCTS.IsCancellationRequested)
+                    {
+                        _stepRunning.stepCTS = new CancellationTokenSource();
+                        _scopedContext.IsStop = null;
+                        _scopedContext.RunState = "运行";
+                    }
+
+                    LoggerHelper.WarnWithNotify(TestStatus, $"[{TestStatus}] 正常流程已停止，开始执行异常流程");
+                }
+
+                // 2. 执行异常流程
+                await _stepRunning.ExecuteErrorSteps(
+                    _scopedContext.Program,
+                    cancellationToken: _stepRunning.errorStepCTS.Token);
+            }
+            catch (Exception ex)
+            {
+                LoggerHelper.ErrorWithNotify(TestStatus, $"[{TestStatus}] 报警触发异常流程失败: {ex.Message}");
+            }
+            finally
+            {
+                _isRunningErrorSteps = false;
+                if (_stepRunning.errorStepCTS.IsCancellationRequested)
+                    _stepRunning.errorStepCTS = new CancellationTokenSource();
+            }
         }
 
         public void Dispose()
@@ -111,6 +203,8 @@ namespace MainModule.ViewModels
 
             try
             {
+                if (_alarmToken != null)
+                    _eventAggregator.GetEvent<AlarmEvent>().Unsubscribe(_alarmToken);
                 _eventAggregator.GetEvent<SilenceBuzzerEvent>().Unsubscribe(async (scope) => await SilenceBuzzer(scope));
                 // 2. 显式释放硬件资源（防止端口占用/死锁）
                 if (_deviceManager is IDisposable disposableDevice)
@@ -176,6 +270,7 @@ namespace MainModule.ViewModels
                 if(_systemConfig.DefaultProgramFilePath != null&&File.Exists(_systemConfig.DefaultProgramFilePath))
                 {
                     var filePath = _systemConfig.DefaultProgramFilePath;
+                    _systemConfig.CurrentADPFile= _systemConfig.DefaultProgramFilePath;
                     // 读取 JSON 文件
                     string json = File.ReadAllText(filePath);
 

MainModule/Views/MainView.xaml

@@ -231,7 +231,7 @@
         </ContentControl>
 
         <!-- 单元 9：TestCell9，默认 (2,2) -->
-        <ContentControl prism:RegionManager.RegionName="TestCell9" Margin="2">
+        <!--<ContentControl prism:RegionManager.RegionName="TestCell9" Margin="2">
             <ContentControl.Style>
                 <Style TargetType="ContentControl">
                     <Setter Property="Grid.Row" Value="2"/>
@@ -253,6 +253,6 @@
                     </Style.Triggers>
                 </Style>
             </ContentControl.Style>
-        </ContentControl>
+        </ContentControl>-->
     </Grid>
 </UserControl>

Model/Entity/TestReportEntity.cs

@@ -0,0 +1,67 @@
+using SqlSugar;
+using System;
+
+namespace Model.Entity
+{
+    /// <summary>
+    /// 测试报告记录：每次 ExecuteSteps / ExecuteErrorSteps 中每个步骤的执行结果。
+    /// 同一次运行的所有步骤共享同一个 TestRoundId。
+    /// </summary>
+    public class TestReportEntity : BaseEntity
+    {
+        /// <summary>同一次运行的统一标识（StepRunning.TestRoundID）</summary>
+        [SugarColumn(ColumnName = "TestRoundId", ColumnDescription = "运行轮次标识")]
+        public Guid TestRoundId { get; set; }
+
+        /// <summary>作用域/台架名称</summary>
+        [SugarColumn(ColumnName = "Scope", ColumnDescription = "台架名称")]
+        public string Scope { get; set; } = string.Empty;
+        /// <summary>测试项名称（当前ADP文件路径）</summary>
+        [SugarColumn(ColumnName = "FileName", ColumnDescription = "测试项名称")]
+        public string FileName { get; set; } = string.Empty;
+
+        /// <summary>步骤序号</summary>
+        [SugarColumn(ColumnName = "StepIndex")]
+        public int StepIndex { get; set; }
+
+        /// <summary>步骤名称</summary>
+        [SugarColumn(ColumnName = "StepName", Length = 200)]
+        public string StepName { get; set; } = string.Empty;
+
+        /// <summary>步骤类型（普通步骤/循环开始/循环结束）</summary>
+        [SugarColumn(ColumnName = "StepType", Length = 50)]
+        public string StepType { get; set; } = string.Empty;
+
+        /// <summary>执行的方法名称</summary>
+        [SugarColumn(ColumnName = "MethodName", Length = 200, IsNullable = true)]
+        public string? MethodName { get; set; }
+
+        /// <summary>方法的完整类型名（实际方法所属类）</summary>
+        [SugarColumn(ColumnName = "MethodFullName", Length = 500, IsNullable = true)]
+        public string? MethodFullName { get; set; }
+
+        /// <summary>执行结果（成功/失败/未执行/跳过）</summary>
+        [SugarColumn(ColumnName = "Result", Length = 20)]
+        public string Result { get; set; } = string.Empty;
+
+        /// <summary>执行耗时（毫秒）</summary>
+        [SugarColumn(ColumnName = "RunTimeMs", IsNullable = true)]
+        public int? RunTimeMs { get; set; }
+
+        /// <summary>输出值（如果有）</summary>
+        [SugarColumn(ColumnName = "OutputValue", Length = 500, IsNullable = true)]
+        public string? OutputValue { get; set; }
+
+        /// <summary>子程序嵌套深度（0=主程序）</summary>
+        [SugarColumn(ColumnName = "Depth")]
+        public int Depth { get; set; }
+
+        /// <summary>是否异常流程步骤</summary>
+        [SugarColumn(ColumnName = "IsErrorStep")]
+        public bool IsErrorStep { get; set; }
+
+        /// <summary>循环剩余次数（仅循环步骤有值）</summary>
+        [SugarColumn(ColumnName = "LoopRemaining", IsNullable = true)]
+        public int? LoopRemaining { get; set; }
+    }
+}

Model/Model.csproj

@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="SqlSugarCore" Version="5.1.4.215-preview13" />
-	<PackageReference Include="System.IO.Ports" Version="11.0.0-preview.4.26230.115" />
+	  <PackageReference Include="System.IO.Ports" Version="8.0.0" />
   </ItemGroup>
 
 </Project>

Model/Models/TestReportModel.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model.Models
+{
+    public class TestReportModel
+    {
+        public Guid TestRoundId { get; set; }
+        public string Scope { get; set; }
+        public DateTime StartTime { get; set; }
+        public DateTime EndTime { get; set; }
+        public string FileName { get; set; }
+    }
+}

MonitorModule/ViewModels/RecordViewModel.cs

@@ -64,10 +64,15 @@ namespace MonitorModule.ViewModels
         }
 
         /// <summary>查询日期（null = 全部日期）</summary>
-        public DateTime? SelectedDate
+        public DateTime? SelectedStartDate
         {
-            get => _selectedDate;
-            set => SetProperty(ref _selectedDate, value);
+            get => _selectedStartDate;
+            set => SetProperty(ref _selectedStartDate, value);
+        }   
+        public DateTime? SelectedEndDate
+        {
+            get => _selectedEndDate;
+            set => SetProperty(ref _selectedEndDate, value);
         }
 
         public DataTable ResultTable
@@ -142,7 +147,8 @@ namespace MonitorModule.ViewModels
         private string? _selectedMonitorName;
         private ObservableCollection<string> _scopeNames = new(new[] { "全部", "TestCell1", "TestCell2", "TestCell3", "TestCell4", "TestCell5", "TestCell6", "TestCell7", "TestCell8" });
         private string? _selectedScope = "全部";
-        private DateTime? _selectedDate;
+        private DateTime? _selectedStartDate;
+        private DateTime? _selectedEndDate;
         private DataTable _resultTable = new();
         private string _statusMessage = "未连接";
         private int _pageIndex = 1;
@@ -257,7 +263,8 @@ namespace MonitorModule.ViewModels
         {
             SelectedMonitorName = null;
             SelectedScope = "全部";
-            SelectedDate = null;
+            SelectedStartDate = null;
+            SelectedEndDate = null;
             PageIndex = 1;
             Query();
         }
@@ -274,8 +281,8 @@ namespace MonitorModule.ViewModels
                 var db = SqlSugarContext.DbContext;
 
                 // 预计算日期范围，避免在表达式树中访问可空属性
-                DateTime? dateStart = SelectedDate?.Date;
-                DateTime? dateEnd = dateStart?.AddDays(1);
+                DateTime? dateStart = SelectedStartDate?.Date;
+                DateTime? dateEnd = SelectedEndDate?.Date.AddDays(1);
 
                 var query = db.Queryable<MonitorValueEntity>()
                     .WhereIF(!string.IsNullOrEmpty(SelectedMonitorName), x => x.MonitorName == SelectedMonitorName)
@@ -317,8 +324,8 @@ namespace MonitorModule.ViewModels
             {
                 var db = SqlSugarContext.DbContext;
 
-                DateTime? dateStart = SelectedDate?.Date;
-                DateTime? dateEnd = dateStart?.AddDays(1);
+                DateTime? dateStart = SelectedStartDate?.Date;
+                DateTime? dateEnd = SelectedEndDate?.Date.AddDays(1);
 
                 var query = db.Queryable<MonitorValueEntity>()
                     .WhereIF(!string.IsNullOrEmpty(SelectedMonitorName), x => x.MonitorName == SelectedMonitorName)

MonitorModule/Views/RecordView.xaml

@@ -52,6 +52,7 @@
                         <ColumnDefinition Width="150"/>
                         <ColumnDefinition Width="Auto"/>
                         <ColumnDefinition Width="150"/>
+                        <ColumnDefinition Width="150"/>
                         <ColumnDefinition Width="Auto"/>
                         <ColumnDefinition Width="Auto"/>
                         <ColumnDefinition Width="Auto"/>
@@ -88,20 +89,25 @@
                                VerticalAlignment="Center"
                                Margin="12,0,4,0"/>
                     <DatePicker Grid.Column="5"
-                                SelectedDate="{Binding SelectedDate}"
-                                materialDesign:HintAssist.Hint="全部"
+                                SelectedDate="{Binding SelectedStartDate}"
+                                materialDesign:HintAssist.Hint="开始时间"
+                                VerticalAlignment="Center"/>  
+                    <DatePicker Grid.Column="6"
+                                Margin=" 5 0 0 0"
+                                SelectedDate="{Binding SelectedEndDate}"
+                                materialDesign:HintAssist.Hint="结束时间"
                                 VerticalAlignment="Center"/>
 
                     <!-- 按钮 -->
-                    <Button Grid.Column="6"
+                    <Button Grid.Column="7"
                             Content="查询"
                             Command="{Binding QueryCommand}"
                             Padding="12,4" Margin="12,0,0,0"/>
-                    <Button Grid.Column="7"
+                    <Button Grid.Column="8"
                             Content="清除"
                             Command="{Binding ClearFilterCommand}"
                             Padding="12,4" Margin="6,0,0,0"/>
-                    <Button Grid.Column="8"
+                    <Button Grid.Column="9"
                             Content="导出 CSV"
                             Command="{Binding ExportCsvCommand}"
                             Padding="12,4" Margin="6,0,0,0"/>

Service/Implement/TestReportService.cs

@@ -0,0 +1,109 @@
+using Model;
+using Model.Entity;
+using Model.Models;
+using ORM;
+using Service.Interface;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using static System.Formats.Asn1.AsnWriter;
+
+namespace Service.Implement
+{
+    public class TestReportService : BaseService<TestReportEntity>, ITestReportService
+    {
+        public TestReportService(SqlSugarRepository<TestReportEntity> repository) : base(repository)
+        {
+        }
+
+        /// <summary>
+        /// 根据 TestRoundId 获取符合条件的测试步骤
+        /// </summary>
+        public async Task<Result<List<TestReportEntity>>> GetByTestRoundIdAsync(Guid testRoundId)
+        {
+            try
+            {
+                var list = await _repository.Entities
+                    .Where(x => x.TestRoundId == testRoundId)
+                    .ToListAsync();
+
+                return Result<List<TestReportEntity>>.Success(list);
+            }
+            catch (Exception ex)
+            {
+                return Result<List<TestReportEntity>>.Error("根据 TestRoundId 查询数据失败", ex);
+            }
+        }
+
+        /// <summary>
+        /// 根据 TestRoundId 分组，获取唯一记录并按分组统计最大与最小时间，
+        /// 支持按日期范围与台架名称筛选。
+        /// </summary>
+        public async Task<Result<IList<TestReportModel>>> GetFilterList(DateTime? startTime = null, DateTime? endTime = null, string? scope = null)
+        {
+            try
+            {
+                // 使用 SqlSugar 的 GroupBy 查询，聚合最大/最小时间
+                // 推荐采用这种按组投影的方式，将分组计算交由数据库处理，性能最佳
+                var query = _repository.Context.Queryable<TestReportEntity>();
+
+                // 日期范围筛选
+                if (startTime.HasValue)
+                    query = query.Where(x => x.CreateTime >= startTime.Value);
+                if (endTime.HasValue)
+                    query = query.Where(x => x.CreateTime <= endTime.Value);
+
+                // 台架名称筛选
+                if (!string.IsNullOrEmpty(scope))
+                    query = query.Where(x => x.Scope == scope);
+
+                var list = await query
+                    .GroupBy(x => x.TestRoundId)
+                    .Select(x => new TestReportModel
+                    {
+                        TestRoundId = x.TestRoundId,
+                        StartTime = SqlFunc.AggregateMin(x.CreateTime),
+                        EndTime = SqlFunc.AggregateMax(x.CreateTime),
+                        Scope = x.Scope,
+                        FileName = x.FileName,
+                    })
+                    .ToListAsync();
+
+                return Result<IList<TestReportModel>>.Success(list);
+            }
+            catch (Exception ex)
+            {
+                return Result<IList<TestReportModel>>.Error("获取分组过滤列表失败", ex);
+            }
+        }
+        /// <summary>
+        /// 根据日期和台架名称筛选获取完整的测试步骤实体列表（无分组，用于导出）
+        /// </summary>
+        public async Task<Result<List<TestReportEntity>>> GetEntitiesByFilter(DateTime? startTime = null, DateTime? endTime = null, string? scope = null)
+        {
+            try
+            {
+                var query = _repository.Context.Queryable<TestReportEntity>();
+
+                if (startTime.HasValue)
+                    query = query.Where(x => x.CreateTime >= startTime.Value);
+                if (endTime.HasValue)
+                    query = query.Where(x => x.CreateTime <= endTime.Value);
+                if (!string.IsNullOrEmpty(scope))
+                    query = query.Where(x => x.Scope == scope);
+
+                var list = await query
+                    .OrderBy(x => x.CreateTime)
+                    .ToListAsync();
+
+                return Result<List<TestReportEntity>>.Success(list);
+            }
+            catch (Exception ex)
+            {
+                return Result<List<TestReportEntity>>.Error("获取导出数据失败", ex);
+            }
+        }
+    }
+}

Service/Interface/ITestReportService.cs

@@ -0,0 +1,37 @@
+using Model;
+using Model.Entity;
+using Model.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Service.Interface
+{
+    public interface ITestReportService:IBaseService<TestReportEntity>
+    {
+        /// <summary>
+        /// 根据TestRoundId获符合的测试步骤
+        /// </summary>
+        /// <param name="TestRoundId">TestRoundId</param>
+        /// <returns>返回符合的TestReportEntity列表</returns>
+        Task<Result<List<TestReportEntity>>> GetByTestRoundIdAsync(Guid TestRoundId);
+
+        /// <summary>
+        /// 根据 TestRoundId 分组，获取唯一记录并按分组统计最大与最小时间
+        /// </summary>
+        /// <param name="startTime">开始日期筛选（可选）</param>
+        /// <param name="endTime">结束日期筛选（可选）</param>
+        /// <param name="scope">台架名称筛选（可选）</param>
+        Task<Result<IList<TestReportModel>>> GetFilterList(DateTime? startTime = null, DateTime? endTime = null, string? scope = null);
+
+        /// <summary>
+        /// 根据日期和台架名称筛选获取完整的测试步骤实体列表（无分组，用于导出）
+        /// </summary>
+        /// <param name="startTime">开始日期筛选（可选）</param>
+        /// <param name="endTime">结束日期筛选（可选）</param>
+        /// <param name="scope">台架名称筛选（可选）</param>
+        Task<Result<List<TestReportEntity>>> GetEntitiesByFilter(DateTime? startTime = null, DateTime? endTime = null, string? scope = null);
+    }
+}

SettingModule/Views/SettingView.xaml

@@ -402,11 +402,11 @@
                                         <Border Background="White"
                                                 BorderBrush="#E0E0E0" BorderThickness="1"
                                                 CornerRadius="4" Padding="14">
-                                            <StackPanel>
+                                            <!--<StackPanel>
                                                 <TextBlock Text="高级设置" FontWeight="Bold" FontSize="14" Margin="0,0,0,10"/>
                                                 <TextBlock Foreground="#888" FontSize="12" TextWrapping="Wrap"
                                                            Text="超时、重试、缓存策略等高级选项后续在此扩展。"/>
-                                            </StackPanel>
+                                            </StackPanel>-->
                                         </Border>
                                     </StackPanel>
                                 </ScrollViewer>

TestingModule/ViewModels/CommandTreeViewModel.cs

@@ -333,7 +333,7 @@ namespace TestingModule.ViewModels
                     foreach (var type in validTypes)
                     {
                         //拦截没有在设备列表中的设备类型
-                        //if (_systemConfig.DeviceList.Where(x=>x.Remark==type.Name).ToList().Count==0 && type.FullName.Contains("DeviceCommand.Device"))
+                        //if (_systemConfig.DeviceList.Where(x=>x.Remark==type.Name).ToList().Count==0 && type.FullName.Contains("DeviceCommand.Devices"))
                         //{
                         //    continue;
                         //}

TestingModule/ViewModels/Dialogs/ParameterSettingViewModel.cs

@@ -93,7 +93,20 @@ namespace TestingModule.ViewModels.Dialogs
                 var index = Program.Parameters
                       .Select((x, i) => new { x, i })
                       .FirstOrDefault(p => p.x.ID == _ScopedContext.SelectedParameter.ID)?.i;
-
+                if (!_ScopedContext.SelectedParameter.IsEditable)
+                {
+                    //公共变量只允许更改ParameterCategory为Input,Temp
+                    if (Program.Parameters[index.Value].Value != Parameter.Value
+    || Program.Parameters[index.Value].UpperLimit != Parameter.UpperLimit
+    || Program.Parameters[index.Value].LowerLimit != Parameter.LowerLimit
+    || Program.Parameters[index.Value].Name != Parameter.Name
+    || Parameter.Category == ParameterCategory.Output
+    || Program.Parameters[index.Value].Type != Parameter.Type)
+                    {
+                        RequestClose.Invoke(ButtonResult.Yes);
+                        return;
+                    }
+                }
                 if (index.HasValue)
                 {
                     Program.Parameters[index.Value] = Parameter;

TestingModule/ViewModels/ParametersManagerViewModel.cs

@@ -190,13 +190,13 @@ namespace TestingModule.ViewModels
 
         private void ParameterDelete()
         {
-            if (!_globalInfo.IsAdmin) return;
+            if (!_globalInfo.IsAdmin || !SelectedParameter.IsEditable) return;
             Program.Parameters.Remove(SelectedParameter);
         }
 
         private void ParameterEdit()
         {
-            if (!_globalInfo.IsAdmin||!SelectedParameter.IsEditable) return;
+            if (!_globalInfo.IsAdmin) return;
             var param = new DialogParameters
             {
                 { "Mode",SelectedParameter==null?"ADD":"Edit" },
@@ -207,10 +207,11 @@ namespace TestingModule.ViewModels
                 if (r.Result == ButtonResult.OK)
                 {
                     _eventAggregator.GetEvent<ParamsChangedEvent>().Publish();
+                    ShowInfoMessageBox("保存成功", () => { });
                 }
-                else
+                else if (r.Result == ButtonResult.Yes)
                 {
-
+                ShowErrorMessageBox("公共变量只能设置变量类型（Input,Temp）", ()=>{ });
                 }
                 
             });

TestingModule/ViewModels/StepsManagerViewModel.cs

@@ -101,6 +101,7 @@ namespace TestingModule.ViewModels
             _ScopedContext = scopedContext;
             _systemConfig = systemConfig;
             _globalInfo = globalInfo;
+            Title = _systemConfig.Title;
             EditStepCommand = new DelegateCommand(EditStep);
             CopyStepCommand = new DelegateCommand(CopyStep);
             PasteStepCommand = new DelegateCommand(PasteStep);

TestingModule/Views/StepsManager.xaml

@@ -12,7 +12,7 @@
              d:DesignWidth="800"
              mc:Ignorable="d">
     <Grid>
-        <GroupBox Header="程序编辑区域">
+        <GroupBox Header="{Binding Title}">
             <TabControl   SelectedIndex="{Binding SelectedTabIndex, Mode=TwoWay}">
                 <i:Interaction.Behaviors>
                     <behaviors:TabControlSelectionChangedBehavior Command="{Binding TabSelectionChangedCommand}"

UIShare/Converters/LessThanConverter.cs

@@ -13,7 +13,9 @@ namespace UIShare.Converters // 确保命名空间跟你项目一致
                 if (double.TryParse(parameter.ToString(), out double targetWidth))
                 {
                     // 如果实际宽度 小于 设定的阈值（比如600），返回 True
-                    return actualWidth < targetWidth;
+                    //return actualWidth < targetWidth;
+                    //工控机屏幕较大直接给1000
+                    return actualWidth < 1000;
                 }
             }
             return false;

UIShare/GlobalVariable/CANSignalBroadcaster.cs

@@ -96,10 +96,10 @@ namespace UIShare.GlobalVariable
                         Time = now
                     });
 
-                    string MonitorSatus = ValueLimitAlarmHelper.CheckAlarm(scope, signalFingerprint, methodName, physicalValue, _globalInfo);
-                    if(MonitorSatus!=""|| MonitorSatus != "未报警")
+                    string MonitorStatus = ValueLimitAlarmHelper.CheckAlarm(scope, signalFingerprint, methodName, physicalValue, _globalInfo);
+                    if (MonitorStatus != "" && MonitorStatus != "未报警")
                     {
-                        //_eventAggregator.GetEvent<AlarmEvent>().Publish(canFingerprint, MonitorSatus);
+                        _eventAggregator.GetEvent<AlarmEvent>().Publish((scope,canFingerprint, MonitorStatus));
                     }
                 }
             }

UIShare/GlobalVariable/ConfigService.cs

@@ -29,52 +29,7 @@ namespace UIShare.GlobalVariable
             }
             return true;
         }
-        /// <summary>
-        /// 根据标题（格子标识）加载独立的配置文件
-        /// </summary>
-        public static SystemConfig Load(string title)
-        {
-            if (string.IsNullOrEmpty(title))
-            {
-                throw new ArgumentException("配置标题不能为空", nameof(title));
-            }
       
-            // 临时实例化一个对象以获取默认的 SystemPath
-            var dummy = new SystemConfig();
-            string configPath = Path.Combine(dummy.SystemPath, $"{title}.json");
-
-            if (!File.Exists(configPath))
-            {
-                // 如果不存在，创建一个带 Title 的默认配置并保存
-                var defaultConfig = new SystemConfig { Title = title };
-                EnsureDefaultCanDevice(defaultConfig);
-                Save(defaultConfig);
-                return defaultConfig;
-            }
-
-            lock (_fileLock)
-            {
-                try
-                {
-                    string json = File.ReadAllText(configPath);
-                    var config = JsonConvert.DeserializeObject<SystemConfig>(json, new JsonSerializerSettings
-                    {
-                        TypeNameHandling = TypeNameHandling.All
-                    });
-
-                    config ??= new SystemConfig { Title = title };
-                    EnsureDefaultCanDevice(config);
-                    return config;
-                }
-                catch (Exception ex)
-                {
-                    LoggerHelper.ErrorWithNotify(title, $"格子 [{title}] 配置加载失败: {ex.Message}");
-                    var fallback = new SystemConfig { Title = title };
-                    EnsureDefaultCanDevice(fallback);
-                    return fallback;
-                }
-            }
-        }
 
         /// <summary>
         /// 保存指定的配置实例

UIShare/GlobalVariable/DeviceManager.cs

@@ -1,4 +1,5 @@
 using DeviceCommand.Base;
+using DeviceCommand.Devices;
 using Logger;
 using Model.Models;
 using Prism.Events;
@@ -34,6 +35,7 @@ namespace UIShare.GlobalVariable
         /// <summary>类名 → Type 的反射缓存（仅扫描一次）。</summary>
         private static readonly IReadOnlyDictionary<string, Type> _deviceTypeMap = BuildDeviceTypeMap();
         public ZLGCANFD CANFD { get; set; }
+        public IOBoardGroup IOGroup { get; set; }
 
         public DeviceManager(SystemConfig systemConfig, GlobalInfo globalInfo, IEventAggregator eventAggregator)
         {
@@ -207,6 +209,25 @@ namespace UIShare.GlobalVariable
                     LoggerHelper.ErrorWithNotify(_scopeName, $"设备 [{config.DeviceName}] 实例化失败：{inner}");
                 }
             }
+
+            // IOGroup 初始化：从已实例化的设备中取出前两个 IOBoard 实例组建 IOBoardGroup
+            try
+            {
+                var ioBoards = DeviceMap.Values.OfType<IOBoard>().Take(2).ToList();
+                if (ioBoards.Count == 2)
+                {
+                    IOGroup = new IOBoardGroup(ioBoards[0], ioBoards[1]);
+                    LoggerHelper.Info($"IOBoardGroup 已初始化，Board1={ioBoards[0].GetType().Name}, Board2={ioBoards[1].GetType().Name}。");
+                }
+                else
+                {
+                    LoggerHelper.Warn($"IOBoardGroup 初始化跳过：需要 2 个 IOBoard 实例，当前仅找到 {ioBoards.Count} 个。");
+                }
+            }
+            catch (Exception ex)
+            {
+                LoggerHelper.ErrorWithNotify(_scopeName, $"IOBoardGroup 初始化失败：{ex.Message}");
+            }
         }
 
         public async Task ConnectAllDevices(CancellationToken ct = default)
@@ -407,12 +428,16 @@ namespace UIShare.GlobalVariable
 
         private static async Task<bool> ConnectTcpAsync(string name, IBaseInterface device, CancellationToken ct)
         {
-            if (device is not ITcp tcp)
+            if (device is  ITcp tcp)
             {
-                LoggerHelper.Warn($"设备 [{name}] 配置为 Tcp 但未实现 ITcp，实际类型为 {device.GetType().Name}。");
-                return false;
+                return await tcp.ConnectAsync(ct);
             }
-            return await tcp.ConnectAsync(ct);
+            if (device is IModbusDevice modbusTCP)
+            {
+                return await modbusTCP.ConnectAsync(ct);
+            }
+            LoggerHelper.Warn($"设备 [{name}] 配置为 Tcp 但未实现 ITcp，实际类型为 {device.GetType().Name}。");
+            return false;
         }
 
         private static async Task<bool> ConnectSerialAsync(string name, IBaseInterface device, CancellationToken ct)

UIShare/GlobalVariable/HardwareDataBroadcaster.cs

@@ -181,10 +181,10 @@ namespace UIShare.GlobalVariable
                             });
 
                             // 同步检查该作用域 ValueLimitList 是否超限
-                            string MonitorSatus= ValueLimitAlarmHelper.CheckAlarm(scope, entry.Fingerprint, entry.MethodName, value, _globalInfo);
-                            if (MonitorSatus != "" || MonitorSatus != "未报警")
+                            string MonitorStatus= ValueLimitAlarmHelper.CheckAlarm(scope, entry.Fingerprint, entry.MethodName, value, _globalInfo);
+                            if (MonitorStatus != "" && MonitorStatus != "未报警")
                             {
-                               // _eventAggregator.GetEvent<AlarmEvent>().Publish(entry.Fingerprint, MonitorSatus);
+                                 _eventAggregator.GetEvent<AlarmEvent>().Publish((scope,entry.Fingerprint, MonitorStatus));
                             }
                         }
                     }

UIShare/GlobalVariable/StepRunning.cs

@@ -3,6 +3,8 @@ using UIShare.PubEvent;
 using Common.Tools;
 using Logger;
 using MaterialDesignThemes.Wpf;
+using Model.Entity;
+using Service.Interface;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -26,6 +28,7 @@ namespace UIShare
         //private Devices _devices;
         private IContainerProvider containerProvider;
         private IEventAggregator _eventAggregator;
+        private ITestReportService _testReportService;
         
         private  readonly Dictionary<Guid, ParameterVM> tmpParameters = [];
 
@@ -42,13 +45,14 @@ namespace UIShare
         /// <summary>标记是否已被注销，执行方法据此安全退出</summary>
         private volatile bool _disposed = false;
 
-        private  Guid TestRoundID;
-        public StepRunning(ScopedContext ScopedContext, SystemConfig systemConfig,IEventAggregator eventAggregator, DeviceManager deviceManager)
+        public  Guid TestRoundID;
+        public StepRunning(ScopedContext ScopedContext, SystemConfig systemConfig,IEventAggregator eventAggregator, DeviceManager deviceManager, ITestReportService testReportService)
         {
             _scopedContext = ScopedContext;
             _systemConfig = systemConfig;
             _eventAggregator = eventAggregator;
             _deviceManager= deviceManager;
+            _testReportService = testReportService;
             //_devices = containerProvider.Resolve<Devices>();
         }
         public async Task<bool> ExecuteErrorSteps(ProgramVM program, int depth = 0, CancellationToken cancellationToken = default)
@@ -114,6 +118,7 @@ namespace UIShare
                     step.CurrentLoopCount = context.LoopCount;
                     LoggerHelper.InfoWithNotify(_systemConfig.Title, $"循环开始，共{context.LoopCount}次", depth);
                     index++;
+                    await SaveStepRecordAsync(step, depth, true);
                 }
 
                 // 处理循环结束
@@ -124,6 +129,7 @@ namespace UIShare
                         LoggerHelper.ErrorWithNotify(_systemConfig.Title, "未匹配的循环结束指令", depth: depth);
                         step.Result = 2;
                         index++;
+                        await SaveStepRecordAsync(step, depth, true);
                         continue;
                     }
 
@@ -138,6 +144,7 @@ namespace UIShare
                         // 继续循环：跳转到循环开始后的第一条指令
                         index = context.StartIndex + 1;
                         LoggerHelper.InfoWithNotify(_systemConfig.Title, $"循环第{context.CurrentLoop}次结束，跳回开始，剩余{context.LoopCount - context.CurrentLoop}次", depth);
+                        await SaveStepRecordAsync(step, depth, true);
                     }
                     else
                     {
@@ -154,6 +161,7 @@ namespace UIShare
                             program.ErrorStepCollection.First(x => x.ID == step.LoopStartStepId).Result = 1;
                             loopStopwatchStack.Pop();
                         }
+                        await SaveStepRecordAsync(step, depth, true);
                     }
                 }
 
@@ -212,6 +220,7 @@ namespace UIShare
                         stepStopwatch.Stop();
                         step.RunTime = (int)stepStopwatch.ElapsedMilliseconds;
                     }
+                    await SaveStepRecordAsync(step, depth, true);
                 }
             }
 
@@ -284,6 +293,7 @@ namespace UIShare
                     step.CurrentLoopCount = context.LoopCount;
                      LoggerHelper.InfoWithNotify(_systemConfig.Title, $"循环开始({step.Name})，共{context.LoopCount}次", depth);
                     index++;
+                    await SaveStepRecordAsync(step, depth, false);
                 }
 
                 // 处理循环结束
@@ -294,6 +304,7 @@ namespace UIShare
                         LoggerHelper.ErrorWithNotify(_systemConfig.Title, "未匹配的循环结束指令", depth:depth);
                         step.Result = 2;
                         index++;
+                        await SaveStepRecordAsync(step, depth, false);
                         continue;
                     }
 
@@ -308,6 +319,7 @@ namespace UIShare
                         // 继续循环：跳转到循环开始后的第一条指令
                         index = context.StartIndex + 1;
                         LoggerHelper.InfoWithNotify(_systemConfig.Title, $"循环第{context.CurrentLoop}次结束，跳回开始，剩余{context.LoopCount - context.CurrentLoop}次", depth);
+                        await SaveStepRecordAsync(step, depth, false);
                     }
                     else
                     {
@@ -324,6 +336,7 @@ namespace UIShare
                             program.StepCollection.First(x => x.ID == step.LoopStartStepId).Result = 1;
                             loopStopwatchStack.Pop();
                         }
+                        await SaveStepRecordAsync(step, depth, false);
                     }
                 }
 
@@ -389,6 +402,7 @@ namespace UIShare
                         _scopedContext.SingleStep = false;
                         _eventAggregator.GetEvent<RunSingalCompletedEvent>().Publish("Play");
                     }
+                    await SaveStepRecordAsync(step, depth, false);
                 }
             }
 
@@ -568,6 +582,10 @@ namespace UIShare
                         {
                             instance = _deviceManager.CANFD;
                         }
+                        else if (targetType.Name == "IOBoardGroup")
+                        {
+                            instance = _deviceManager.IOGroup;
+                        }
                         else instance = _deviceManager.DeviceMap[targetType.Name];
                     }
                     catch (Exception ex)
@@ -665,6 +683,61 @@ namespace UIShare
             }
         }
 
+        /// <summary>
+        /// 将单个步骤的执行结果保存到数据库（测试报告）。
+        /// 同一次运行的所有步骤共享 TestRoundID，导出时按此 Guid 查询。
+        /// </summary>
+        private async Task SaveStepRecordAsync(StepVM step, int depth, bool isErrorStep)
+        {
+            try
+            {
+                // 获取输出参数值
+                string? outputValue = null;
+                if (step.Method != null)
+                {
+                    var outputParam = step.Method.Parameters.FirstOrDefault(p => p.Category == ParameterCategory.Output);
+                    if (outputParam?.Value != null)
+                        outputValue = outputParam.Value.ToString();
+                }
+
+                var entity = new TestReportEntity
+                {
+                    TestRoundId = TestRoundID,
+                    Scope = _systemConfig.Title,
+                    FileName = _systemConfig.CurrentADPFile ?? "",
+                    StepIndex = step.Index,
+                    StepName = step.Name ?? "",
+                    StepType = step.StepType ?? "普通步骤",
+                    MethodName = step.Method?.Name,
+                    MethodFullName = step.Method?.FullName,
+                    Result = step.Result switch
+                    {
+                        -1 => "未执行",
+                        0 => "执行中",
+                        1 => "成功",
+                        2 => "失败",
+                        _ => "未知"
+                    },
+                    RunTimeMs = step.RunTime,
+                    OutputValue = outputValue,
+                    Depth = depth,
+                    IsErrorStep = isErrorStep,
+                    LoopRemaining = step.CurrentLoopCount,
+                    CreateTime = DateTime.Now
+                };
+
+                var result = await _testReportService.InsertAsync(entity);
+                if (!result.IsSuccess)
+                {
+                    LoggerHelper.Error($"保存步骤记录失败 [{step.Index}]: {result.Msg}");
+                }
+            }
+            catch (Exception ex)
+            {
+                LoggerHelper.Error($"保存步骤记录失败 [{step.Index}]: {ex.Message}");
+            }
+        }
+
         public  void ResetAllStepStatus(ObservableCollection<StepVM> StepCollection)
         {
             foreach (var step in StepCollection)

UIShare/GlobalVariable/SystemConfig.cs

@@ -24,6 +24,7 @@ namespace UIShare.GlobalVariable
         public string TSMasterName { get; set; } = "ADP测试上位机";
         public string SubProgramFilePath { get; set; } = @"D:\ADP\子程序\";
         public string Title { get; set; } = string.Empty;
+        public string CurrentADPFile { get; set; }
         public int PerformanceLevel { get; set; } = 50;
         public string DefaultProgramFilePath { get; set; } = "";
         public string DefaultBLFFilePath { get; set; } = "";
@@ -47,15 +48,7 @@ namespace UIShare.GlobalVariable
             {
                 Category = ParameterCategory.Input,
                 Type = typeof(int),
-                Name = "单相充电",
-                Value = 0,
-                IsEditable=false
-            },
-            new ParameterVM
-            {
-                Category = ParameterCategory.Input,
-                Type = typeof(int),
-                Name = "抛负载",
+                Name = "台架序号",
                 Value = 1,
                 IsEditable=false
             },
@@ -63,22 +56,15 @@ namespace UIShare.GlobalVariable
             {
                 Category = ParameterCategory.Input,
                 Type = typeof(int),
-                Name = "短路测试",
-                Value = 0,
-                IsEditable=false
-            },  new ParameterVM
-            {
-                Category = ParameterCategory.Input,
-                Type = typeof(int),
-                Name = "初始化供电",
-                Value = 0,
+                Name = "直流负载通道",
+                Value = 1,
                 IsEditable=false
             },
-            new ParameterVM
+              new ParameterVM
             {
                 Category = ParameterCategory.Input,
                 Type = typeof(int),
-                Name = "蜂鸣器",
+                Name = "交流电源通道",
                 Value = 1,
                 IsEditable=false
             },
@@ -94,7 +80,15 @@ namespace UIShare.GlobalVariable
             {
                 Category = ParameterCategory.Input,
                 Type = typeof(int),
-                Name = "示波器通道",
+                Name = "示波器通道1",
+                Value = 0,
+                IsEditable=false
+            },
+              new ParameterVM
+            {
+                Category = ParameterCategory.Input,
+                Type = typeof(int),
+                Name = "示波器通道2",
                 Value = 0,
                 IsEditable=false
             },

UIShare/PubEvent/AlarmEvent.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace UIShare.PubEvent
 {
-    public class AlarmEvent :PubSubEvent<Tuple<string,string>>
+    public class AlarmEvent : PubSubEvent<(string Scope, string Fingerprint, string Status)>
     {
     }
 }

UIShare/UIShare.csproj

@@ -21,6 +21,8 @@
 	  <ProjectReference Include="..\Common\Common.csproj" />
 	  <ProjectReference Include="..\DeviceCommand\DeviceCommand.csproj" />
 	  <ProjectReference Include="..\Logger\Logger.csproj" />
+	  <ProjectReference Include="..\ORM\ORM.csproj" />
+	  <ProjectReference Include="..\Service\Service.csproj" />
 	  <ProjectReference Include="..\ZLGUSBCANFD\ZLGUSBCANFD.csproj" />
 	</ItemGroup>
 </Project>

UIShare/UIViewModel/ParameterVM.cs

@@ -5,6 +5,8 @@ using System.Collections.Generic;
 
 namespace UIShare.UIViewModel
 {
+   
+  
     public class ParameterVM : BindableBase
     {
         #region 构造函数

UIShare/ViewModelBase/DialogViewModelBase.cs

@@ -28,7 +28,7 @@ namespace UIShare.ViewModelBase
             dialogParams.Add("Message", Message);
             dialogParams.Add("Icon", "info");
             dialogParams.Add("ShowOk", true);
-            _dialogService.ShowDialog("MessageBoxView", dialogParams, result =>
+            _dialogService.ShowDialog("MessageBox", dialogParams, result =>
             {
                 callback();
             });
@@ -41,7 +41,7 @@ namespace UIShare.ViewModelBase
             dialogParams.Add("Message", Message);
             dialogParams.Add("Icon", "info");
             dialogParams.Add("ShowOk", true);
-            _dialogService.ShowDialog("MessageBoxView", dialogParams, result =>
+            _dialogService.ShowDialog("MessageBox", dialogParams, result =>
             {
                 callback();
             });

UIShare/ViewModelBase/NavigateViewModelBase.cs

@@ -34,7 +34,7 @@ namespace UIShare.ViewModelBase
             dialogParams.Add("Message", Message);
             dialogParams.Add("Icon", "info");
             dialogParams.Add("ShowOk", true);
-            _dialogService.ShowDialog("MessageBoxView", dialogParams, result =>
+            _dialogService.ShowDialog("MessageBox", dialogParams, result =>
             {
                 callback();
             });
@@ -44,9 +44,9 @@ namespace UIShare.ViewModelBase
             var dialogParams = new DialogParameters();
             dialogParams.Add("Title", "错误");
             dialogParams.Add("Message", Message);
-            dialogParams.Add("Icon", "info");
+            dialogParams.Add("Icon", "error");
             dialogParams.Add("ShowOk", true);
-            _dialogService.ShowDialog("MessageBoxView", dialogParams, result =>
+            _dialogService.ShowDialog("MessageBox", dialogParams, result =>
             {
                 callback();
             });

ZLGUSBCANFD/USBCANFD.cs

@@ -619,7 +619,7 @@ namespace ZLGUSBCANFD
         /// <param name="物理值">要写入的实际物理数值</param>
         /// <param name="循环发送间隔毫秒">0 = 单次发送；>0 = 周期循环发送（单位毫秒）</param>
         /// <returns>操作是否成功</returns>
-        public virtual bool 设置报文(uint 通道号, string 帧IDStr, string 信号名称, double 物理值, int 循环发送间隔毫秒 = 0, bool 直接发送=false)
+        public virtual bool 设置报文(uint 通道号, string 帧IDStr, string 信号名称, double 物理值, int 循环发送间隔毫秒 = 0, bool 直接发送 = false)
         {
             if (!TryParseFrameId(帧IDStr, out uint 帧ID))
             {

加密狗/加密狗.csproj

@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <!-- 配置 ViKey.dll 复制到输出目录 -->
+    <None Include="ViKey.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+</Project>

加密狗/加密狗API类.cs

@@ -0,0 +1,252 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace 加密狗
+{
+    public enum VikeyType
+    {
+        ViKeyAPP = 0,                       //实用型加密狗
+        ViKeySTD = 1,                       //标准型加密狗
+        ViKeyNET = 2,                       //网络型加密狗
+        ViKeyPRO = 3,                       //专业型加密狗
+        ViKeyWEB = 4,                       //身份认证型加密狗
+        ViKeyTIME = 5,                      //时钟型加密狗，内部独立时钟
+        ViKeyMultiFunctional = 0x0A,        //多功能加密狗  支持软件加密 支持文档加密
+        ViKeyMultiFunctionalTime = 0x0B,    //多功能时钟加密狗
+        ViKeyInvalid    //无效类型
+    };
+    public enum 返回值 : uint
+    {
+        /// <summary>
+        /// 成功
+        /// </summary>
+        VIKEY_SUCCESS = 0x00000000,
+        /// <summary>
+        /// 没有找到ViKey加密锁
+        /// </summary>
+        VIKEY_ERROR_NO_VIKEY = 0x80000001,
+        /// <summary>
+        /// 密码错误
+        /// </summary>
+        VIKEY_ERROR_INVALID_PASSWORD = 0x80000002,
+        /// <summary>
+        /// 请先查找加密锁
+        /// </summary>
+        VIKEY_ERROR_NEED_FIND = 0x80000003,
+        /// <summary>
+        /// 无效的句柄
+        /// </summary>
+        VIKEY_ERROR_INVALID_INDEX = 0x80000004,
+        /// <summary>
+        /// 数值错误
+        /// </summary>
+        VIKEY_ERROR_INVALID_VALUE = 0x80000005,
+        /// <summary>
+        /// 秘钥无效
+        /// </summary>
+        VIKEY_ERROR_INVALID_KEY = 0x80000006,
+        /// <summary>
+        /// 读取信息错误
+        /// </summary>
+        VIKEY_ERROR_GET_VALUE = 0x80000007,
+        /// <summary>
+        /// 设置信息错误
+        /// </summary>
+        VIKEY_ERROR_SET_VALUE = 0x80000008,
+        /// <summary>
+        /// 没有机会
+        /// </summary>
+        VIKEY_ERROR_NO_CHANCE = 0x80000009,
+        /// <summary>
+        /// 权限不足
+        /// </summary>
+        VIKEY_ERROR_NO_TAUTHORITY = 0x8000000A,
+        /// <summary>
+        /// 地址或长度错误
+        /// </summary>
+        VIKEY_ERROR_INVALID_ADDR_OR_SIZE = 0x8000000B,
+        /// <summary>
+        /// 获取随机数错误
+        /// </summary>
+        VIKEY_ERROR_RANDOM = 0x8000000C,
+        /// <summary>
+        /// 获取种子错误
+        /// </summary>
+        VIKEY_ERROR_SEED = 0x8000000D,
+        /// <summary>
+        /// 通信错误
+        /// </summary>
+        VIKEY_ERROR_CONNECTION = 0x8000000E,
+        /// <summary>
+        /// 算法或计算错误
+        /// </summary>
+        VIKEY_ERROR_CALCULATE = 0x8000000F,
+        /// <summary>
+        /// 计数器错误
+        /// </summary>
+        VIKEY_ERROR_MODULE = 0x80000010,
+        /// <summary>
+        /// 产生密码错误
+        /// </summary>
+        VIKEY_ERROR_GENERATE_NEW_PASSWORD = 0x80000011,
+        /// <summary>
+        /// 加密数据错误
+        /// </summary>
+        VIKEY_ERROR_ENCRYPT_FAILED = 0x80000012,
+        /// <summary>
+        /// 解密数据错误
+        /// </summary>
+        VIKEY_ERROR_DECRYPT_FAILED = 0x80000013,
+        /// <summary>
+        /// ViKey加密锁已经被锁定
+        /// </summary>
+        VIKEY_ERROR_ALREADY_LOCKED = 0x80000014,
+        /// <summary>
+        /// 无效的命令
+        /// </summary>
+        VIKEY_ERROR_UNKNOWN_COMMAND = 0x80000015,
+        /// <summary>
+        /// 当前ViKey加密锁不支持此功能
+        /// </summary>
+        VIKEY_ERROR_NO_SUPPORT = 0x80000016,
+        /// <summary>
+        /// 发生异常
+        /// </summary>
+        VIKEY_ERROR_CATCH = 0x80000017,
+        /// <summary>
+        /// 未知错误
+        /// </summary>
+        VIKEY_ERROR_UNKNOWN_ERROR = 0xFFFFFFFF,
+    }
+
+    public class 加密狗API类
+    {
+        /// <summary>
+        /// 查找加密锁。使用其他API前必须先调用次函数。
+        /// </summary>
+        /// <param name="pdwCount">[out]     如果查找到系统中存在加密狗，返回查找到加密狗的个数</param>
+        /// <returns>0表示系统中存在ViKey加密狗。</returns>
+        [DllImport("ViKey.dll")]
+        public static extern uint VikeyFind(ref uint pdwCount);
+        /// <summary>
+        /// 获取加密狗的硬件ID,加密狗的硬件ID是加密狗的唯一标识，每个加密狗的硬件ID都不一样。
+        /// </summary>
+        /// <param name="Index">[in]指定要操作加密狗的序号</param>
+        /// <param name="pdwHID">[out]返回加密狗的硬件ID</param>
+        /// <returns></returns>
+        [DllImport("ViKey.dll")]
+        public static extern uint VikeyGetHID(ushort Index, out uint pdwHID);
+
+        /// <summary>
+        /// 获取加密狗的当前权限
+        /// </summary>
+        /// <param name="Index">指定要操作加密狗的序号</param>
+        /// <param name="pLevel">返回加密狗的当前权限 0表示加密狗尚未登录  1表示加密狗是用户权限  2表示加密狗是管理员权限</param>
+        /// <returns></returns>
+        [DllImport("ViKey.dll", CallingConvention = CallingConvention.StdCall)]
+        public static extern uint VikeyGetLevel(ushort Index, out byte pLevel);
+
+        /// <summary>
+        /// 以用户权限登录加密狗
+        /// </summary>
+        /// <param name="Index"></param>
+        /// <param name="pUserPassushort"></param>
+        /// <returns></returns>
+        [DllImport("ViKey.dll", CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Ansi)]
+        public static extern uint VikeyUserLogin(ushort Index, Byte[] pUserPassword);
+        /// <summary>
+        /// 以管理员权限登录加密狗
+        /// </summary>
+        /// <param name="Index"></param>
+        /// <param name="pAdminPassword"></param>
+        /// <returns></returns>
+        [DllImport("ViKey.dll", CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Ansi)]
+        public static extern uint VikeyAdminLogin(ushort Index, Byte[] pAdminPassword);
+        /// <summary>
+        /// 注销登录加密狗 注销后的加密狗权限为0 
+        /// </summary>
+        /// <param name="Index">[in]指定要操作加密狗的序号</param>
+        /// <returns></returns>
+        [DllImport("ViKey.dll", CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Ansi)]
+        public static extern uint VikeyLogoff(ushort Index);
+
+        [StructLayout(LayoutKind.Sequential, Pack = 1)]
+        public struct SVikeyTime
+        {
+            public byte cYear;
+            public byte cMonth;
+            public byte cDay;
+            public byte cHour;
+            public byte cMinute;
+            public byte cSecond;
+        }
+        /// <summary>
+        /// 获取时钟型加密狗中的内部独立时间
+        /// </summary>
+        /// <param name="Index"></param>
+        /// <param name="pTime"></param>
+        /// <returns></returns>
+        [DllImport("ViKey.dll", CallingConvention = CallingConvention.StdCall)]
+        public static extern uint VikeyGetTime(ushort Index, out SVikeyTime pTime);
+        /// <summary>
+        /// 获取时钟型加密狗中的到期时间
+        /// </summary>
+        /// <param name="Index"></param>
+        /// <param name="pTime"></param>
+        /// <returns></returns>
+        [DllImport("ViKey.dll", CallingConvention = CallingConvention.StdCall)]
+        public static extern uint VikeyGetValidTime(ushort Index, out SVikeyTime pTime);
+        /// <summary>
+        /// 检测时钟型加密狗的时钟功能是否到期
+        /// </summary>
+        /// <param name="Index">[in]指定要操作加密狗的序号</param>
+        /// <param name="pIsValid">[out]返回是否到期结果 1表示没有到期   0表示已经到期</param>
+        /// <returns></returns>
+        [DllImport("ViKey.dll", CallingConvention = CallingConvention.StdCall)]
+        public static extern uint VikeyCheckValidTime(ushort Index, out byte pIsValid);
+        /// <summary>
+        /// 从加密狗中的获取4个双字的随机数数据
+        /// </summary>
+        /// <param name="Index">指定要操作加密狗的序号</param>
+        /// <param name="pwRandom1"></param>
+        /// <param name="pwRandom2"></param>
+        /// <param name="pwRandom3"></param>
+        /// <param name="pwRandom4"></param>
+        /// <returns></returns>
+        [DllImport("ViKey.dll", CallingConvention = CallingConvention.StdCall)]
+        public static extern uint ViKeyRandom(ushort Index, 
+            out ushort pwRandom1, out ushort pwRandom2, out ushort pwRandom3, out ushort pwRandom4);
+        [DllImport("ViKey.dll", CallingConvention = CallingConvention.StdCall)]
+        public static extern uint VikeyReadData(ushort Index, ushort Addr, ushort Length, byte[] buffer);
+        [DllImport("ViKey.dll", CallingConvention = CallingConvention.StdCall)]
+        public static extern uint VikeyWriteData(ushort Index, ushort Addr, ushort Length, byte[] buffer);
+
+        /// <summary>
+        /// // 7.4.6版本(含)以后的加密狗必须在查找加密狗前调用VikeySetUserSN并输入正确的UserSN后面才能查找到所属用户的加密狗
+        // 7.4.6版本以前的加密狗可以忽略此函数 不用调用此函数
+        // UserSN在ViKey加密管理工具的->帮助中心页面->复制出来
+        /// </summary>
+        /// <param name="pUserSN"></param>
+        /// <returns></returns>
+        [DllImport("ViKey")]
+        public static extern uint VikeySetUserSN(Byte[] pUserSN);
+
+        /// <summary>
+        /// //设置加密狗ApiKey 硬件版本为7.4.5(含)以后的加密狗必须要调用此接口才能登录
+			//ApiKey 是由ViKey加密管理工具的->加密狗管理->密钥设置页面  通过Api密钥种子生成的
+        /// </summary>
+        /// <param name="Index"></param>
+        /// <param name="pApiKey"></param>
+        /// <returns></returns>
+        [DllImport("ViKey")]
+        public static extern uint VikeySetApiKey(ushort Index, Byte[] pApiKey);
+
+        [DllImport("ViKey")]
+        public static extern uint VikeyUninitialization();
+
+    }
+}

加密狗/加密狗驱动类.cs

@@ -0,0 +1,145 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace 加密狗
+{
+    public class 加密狗驱动类
+    {
+        public static void Uninitialization()
+        {
+            加密狗API类.VikeyUninitialization();
+        }
+
+        // 保留原有方法，但添加新方法
+        public static int 写入加密狗(ushort Index, string 管理密码, string 校验密码)
+        {
+            // 保持不变
+            uint 加密狗数量 = 0;
+            var re = 加密狗API类.VikeyFind(ref 加密狗数量);
+            if (re != 0) return -1;
+            加密狗API类.VikeyAdminLogin(Index, Encoding.Default.GetBytes(管理密码));
+            SHA256 sHA256 = SHA256.Create();
+            加密狗API类.VikeyGetHID(Index, out uint pid);
+            byte[] HID = BitConverter.GetBytes(pid);
+            var pswd = Encoding.UTF8.GetBytes(校验密码);
+            byte[] 校验数组 = HID.Concat(pswd).ToArray();
+            var 校验值 = sHA256.ComputeHash(校验数组);
+            加密狗API类.VikeyWriteData(Index, 0, 32, 校验值);
+            byte[] randomBytes = new byte[96];
+            Random random = new Random();
+            random.NextBytes(randomBytes);
+            加密狗API类.VikeyWriteData(Index, 32, 96, randomBytes);
+            return 0;
+        }
+
+        /// <summary>
+        /// 新方法：仅检查加密狗时间，不验证密码和数据
+        /// </summary>
+        public static int 寻找加密狗仅检查时间()
+        {
+            uint 加密狗数量 = 0;
+            var re = 加密狗API类.VikeyFind(ref 加密狗数量);
+            if (re != 0 || 加密狗数量 == 0) return -1;
+
+            // 直接返回第一个找到的加密狗
+            return 0;
+        }
+
+        /// <summary>
+        /// 原有方法：寻找加密狗并进行完整验证
+        /// </summary>
+        public static int 寻找加密狗(string 用户密码,string 校验密码)
+        {
+            uint 加密狗数量 = 0;
+            var re = 加密狗API类.VikeyFind(ref 加密狗数量);
+            if (re != 0) return -1;
+            int 找到的加密狗 = -1;
+            for (ushort i = 0; i < 加密狗数量; i++)
+            {
+                re = 加密狗API类.VikeyUserLogin(i, Encoding.Default.GetBytes(用户密码));
+                if (检查加密狗数据(i, 校验密码)) return i;
+            }
+            return (int)加密狗数量;
+        }
+
+        public static bool 检查加密狗数据(ushort Index, string 校验密码)
+        {
+            // 保持不变
+            SHA256 sHA256 = SHA256.Create();
+            加密狗API类.VikeyGetHID(Index, out uint pid);
+            byte[] HID = BitConverter.GetBytes(pid);
+            var pswd = Encoding.UTF8.GetBytes(校验密码);
+
+            byte[] 校验数组 = HID.Concat(pswd).ToArray();
+            var 校验值 = sHA256.ComputeHash(校验数组);
+            var buffer = new byte[32];
+            加密狗API类.VikeyReadData(Index, 0, 32, buffer);
+
+            return buffer.SequenceEqual(校验值);
+        }
+
+        public static TimeSpan 检查剩余时间(int 加密狗)
+        {
+            ushort 序号 = (ushort)加密狗;
+
+            try
+            {
+                // 读时间前必须先登录（用户权限即可）
+                uint re = 加密狗API类.VikeyUserLogin(序号, Encoding.Default.GetBytes("11111111"));
+                if (re != 0)
+                {
+                    Console.WriteLine($"VikeyUserLogin 失败: 0x{re:X}");
+                    return TimeSpan.Zero;
+                }
+
+                re = 加密狗API类.VikeyGetTime(序号, out 加密狗API类.SVikeyTime 现在时间);
+                if (re != 0)
+                {
+                    Console.WriteLine($"VikeyGetTime 失败: 0x{re:X}");
+                    return TimeSpan.Zero;
+                }
+
+                re = 加密狗API类.VikeyGetValidTime(序号, out 加密狗API类.SVikeyTime 到期时间);
+                if (re != 0)
+                {
+                    Console.WriteLine($"VikeyGetValidTime 失败: 0x{re:X}");
+                    return TimeSpan.Zero;
+                }
+
+                re = 加密狗API类.VikeyCheckValidTime(序号, out byte isValid);
+                Console.WriteLine($"VikeyCheckValidTime: ret=0x{re:X}, isValid={isValid}");
+
+                // cYear 是 byte，ViKey 用距 2000 年的偏移量
+                DateTime _现在时间 = new DateTime(现在时间.cYear + 2000, 现在时间.cMonth, 现在时间.cDay,
+                                      现在时间.cHour, 现在时间.cMinute, 现在时间.cSecond);
+                DateTime _到期时间 = new DateTime(到期时间.cYear + 2000, 到期时间.cMonth, 到期时间.cDay,
+                                      到期时间.cHour, 到期时间.cMinute, 到期时间.cSecond);
+
+                Console.WriteLine($"加密狗当前时间: {_现在时间:yyyy-MM-dd HH:mm:ss}");
+                Console.WriteLine($"加密狗到期时间: {_到期时间:yyyy-MM-dd HH:mm:ss}");
+
+                return _到期时间 - _现在时间;
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"检查剩余时间异常: {ex.Message}");
+                return TimeSpan.Zero;
+            }
+        }
+
+        public static uint 验证加密狗SN(Byte[] buffer)
+        {
+            return 加密狗API类.VikeySetUserSN(buffer);
+        }
+
+        public static uint 验证加密狗APIkey(ushort index, Byte[] buffer)
+        {
+            return 加密狗API类.VikeySetApiKey(index, buffer);
+        }
+    }
+}

加密狗/本项目的加密狗刷入.cs

@@ -0,0 +1,15 @@
+using System;
+using 加密狗;
+
+// ═══════════════════════════════════════════════════════
+// 刷入脚本（独立运行，不属于 ADP 主程序流程）
+// 使用前请先用 ViKey 管理工具设置好密码和到期时间
+// ═══════════════════════════════════════════════════════
+public class Program
+{
+    public static void Main(string[] args)
+    {
+        //写入加密狗（需管理员密码）
+        加密狗驱动类.写入加密狗(0, "00000000", "ADP项目");
+    }
+}