From 2d98b2d8b8eadd4f76f7b6fdcd13cf693714a97b Mon Sep 17 00:00:00 2001 From: liyaobang <884131781@qq.com> Date: Thu, 27 Mar 2025 11:37:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=95=B4=E4=BD=93=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DH.Commons/Base/GloablConfig.cs | 12 - DH.Commons/Base/GlobalConfig.cs | 131 ++ DH.Commons/Base/PLCBase.cs | 65 +- DH.Commons/Enums/Enum.cs | 15 +- DH.Commons/Helper/ConfigHelper.cs | 10 +- DH.Commons/Models/SystemModel.cs | 1 + DH.Devices.PLC/XinJEPLCTcpNet.cs | 1189 ++++++++--------- DHSoftware/DHSoftware.csproj | 4 + DHSoftware/LoginWindow.cs | 22 + DHSoftware/MainWindow.cs | 426 +----- DHSoftware/Views/AddGlobalControl.Designer.cs | 162 +++ DHSoftware/Views/AddGlobalControl.cs | 48 + DHSoftware/Views/AddGlobalControl.resx | 120 ++ DHSoftware/Views/GlobalControl.Designer.cs | 425 ++++++ DHSoftware/Views/GlobalControl.cs | 819 ++++++++++++ DHSoftware/Views/GlobalControl.resx | 120 ++ DHSoftware/Views/MotionControl.Designer.cs | 285 ---- DHSoftware/Views/MotionControl.cs | 584 +------- .../Views/MotionProcessEdit.Designer.cs | 20 +- DHSoftware/Views/MotionProcessEdit.cs | 38 +- DHSoftware/Views/SettingWindow.Designer.cs | 42 +- DHSoftware/Views/SettingWindow.cs | 54 +- 22 files changed, 2560 insertions(+), 2032 deletions(-) delete mode 100644 DH.Commons/Base/GloablConfig.cs create mode 100644 DH.Commons/Base/GlobalConfig.cs create mode 100644 DHSoftware/Views/AddGlobalControl.Designer.cs create mode 100644 DHSoftware/Views/AddGlobalControl.cs create mode 100644 DHSoftware/Views/AddGlobalControl.resx create mode 100644 DHSoftware/Views/GlobalControl.Designer.cs create mode 100644 DHSoftware/Views/GlobalControl.cs create mode 100644 DHSoftware/Views/GlobalControl.resx diff --git a/DH.Commons/Base/GloablConfig.cs b/DH.Commons/Base/GloablConfig.cs deleted file mode 100644 index ce0e51d..0000000 --- a/DH.Commons/Base/GloablConfig.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace DH.Commons.Base -{ - internal class GloablConfig - { - } -} diff --git a/DH.Commons/Base/GlobalConfig.cs b/DH.Commons/Base/GlobalConfig.cs new file mode 100644 index 0000000..0141774 --- /dev/null +++ b/DH.Commons/Base/GlobalConfig.cs @@ -0,0 +1,131 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; +using AntdUI; + +namespace DH.Commons.Base +{ + public class GlobalConfig : NotifyProperty + { + string _name; + private BindingList _InitProcessList = new BindingList(); + private BindingList _StartProcessList = new BindingList(); + private BindingList _StopProcessList = new BindingList(); + private BindingList _StartResetList = new BindingList(); + private BindingList _StopResetList = new BindingList(); + public string Name + { + get => _name; + set + { + if (_name != value) + { + _name = value; + OnPropertyChanged(nameof(Name)); + } + } + } + + public BindingList InitProcessList + { + get => _InitProcessList; + set + { + if (_InitProcessList == value) return; + _InitProcessList = value; + OnPropertyChanged(nameof(InitProcessList)); + } + } + public BindingList StartProcessList + { + get => _StartProcessList; + set + { + if (_StartProcessList == value) return; + _StartProcessList = value; + OnPropertyChanged(nameof(StartProcessList)); + } + } + public BindingList StopProcessList + { + get => _StopProcessList; + set + { + if (_StopProcessList == value) return; + _StopProcessList = value; + OnPropertyChanged(nameof(StopProcessList)); + } + } + public BindingList StartResetList + { + get => _StartResetList; + set + { + if (_StartResetList == value) return; + _StartResetList = value; + OnPropertyChanged(nameof(StartResetList)); + } + } + public BindingList StopResetList + { + get => _StopResetList; + set + { + if (_StopResetList == value) return; + _StopResetList = value; + OnPropertyChanged(nameof(StopResetList)); + } + } + + + string _imgSavePath; + string _dbSavePath; + string _configSavePath; + + public string ImgSavePath + { + get => _imgSavePath; + set + { + if (_imgSavePath != value) + { + _imgSavePath = value; + OnPropertyChanged(nameof(ImgSavePath)); + } + } + } + + public string DbSavePath + { + get => _dbSavePath; + set + { + if (_dbSavePath != value) + { + _dbSavePath = value; + OnPropertyChanged(nameof(DbSavePath)); + } + } + } + + public string ConfigSavePath + { + get => _configSavePath; + set + { + if (_configSavePath != value) + { + _configSavePath = value; + OnPropertyChanged(nameof(ConfigSavePath)); + } + } + } + } + + + +} diff --git a/DH.Commons/Base/PLCBase.cs b/DH.Commons/Base/PLCBase.cs index 621f876..dbe97a5 100644 --- a/DH.Commons/Base/PLCBase.cs +++ b/DH.Commons/Base/PLCBase.cs @@ -21,10 +21,7 @@ namespace DH.Commons.Base private string _ip = "192.168.6.61"; private int _port = 502; private BindingList _PLCItemList = new BindingList(); - private BindingList _PLCStartProcessList = new BindingList(); - private BindingList _PLCStopProcessList = new BindingList(); - private BindingList _PLCStartResetList = new BindingList(); - private BindingList _PLCStopResetList = new BindingList(); + [Category("设备配置")] [DisplayName("是否启用")] [Description("是否启用")] @@ -194,46 +191,7 @@ namespace DH.Commons.Base } } - public BindingList PLCStartProcessList - { - get => _PLCStartProcessList; - set - { - if (_PLCStartProcessList == value) return; - _PLCStartProcessList = value; - OnPropertyChanged(nameof(PLCStartProcessList)); - } - } - public BindingList PLCStopProcessList - { - get => _PLCStopProcessList; - set - { - if (_PLCStopProcessList == value) return; - _PLCStopProcessList = value; - OnPropertyChanged(nameof(PLCStopProcessList)); - } - } - public BindingList PLCStartResetList - { - get => _PLCStartResetList; - set - { - if (_PLCStartResetList == value) return; - _PLCStartResetList = value; - OnPropertyChanged(nameof(PLCStartResetList)); - } - } - public BindingList PLCStopResetList - { - get => _PLCStopResetList; - set - { - if (_PLCStopResetList == value) return; - _PLCStopResetList = value; - OnPropertyChanged(nameof(PLCStopResetList)); - } - } + public virtual bool PLCConnect() { Connected = true; @@ -246,16 +204,23 @@ namespace DH.Commons.Base return true; } + public virtual Int16 ReadInt16(string address) { return 0; } - public virtual ushort ReadShort(string address) { return 0; } - public virtual int ReadInt(string address) { return 0; } + public virtual Int32 ReadInt32(string address) { return 0; } + + public virtual UInt16 ReadUInt16(string address) { return 0; } + + public virtual UInt32 ReadUInt32(string address) { return 0; } public virtual float ReadFloat(string address) { return 0; } public virtual bool ReadBool(string address) { return false; } - public virtual bool WriteShort(string address, short value, bool waitForReply = true) { return false; } - public virtual bool WriteInt(string address, int value, bool waitForReply = true) { return false; } - public virtual bool WriteDInt(string address, int value, bool waitForReply = true) { return false; } - public virtual bool WriteDInt1(string address, int value, bool waitForReply = true) { return false; } + public virtual bool WriteInt16(string address, Int16 value, bool waitForReply = true) { return false; } + public virtual bool WriteInt32(string address, Int32 value, bool waitForReply = true) { return false; } + + + public virtual bool WriteUInt16(string address, UInt16 value, bool waitForReply = true) { return false; } + public virtual bool WriteUInt32(string address, UInt32 value, bool waitForReply = true) { return false; } + public virtual bool WriteFloat(string address, float value, bool waitForReply = true) { return false; } public virtual bool WriteBool(string address, bool value, bool waitForReply = true) { return false; } } diff --git a/DH.Commons/Enums/Enum.cs b/DH.Commons/Enums/Enum.cs index 8c50b95..0ab4203 100644 --- a/DH.Commons/Enums/Enum.cs +++ b/DH.Commons/Enums/Enum.cs @@ -91,10 +91,8 @@ namespace DH.Commons.Enums 工位8 , 工位9 , 工位10 , - OK料盒 , - NG料盒, - OK吹气时间, - NG吹气时间, + 相机触发时间, + 吹气时间, 产品计数, 计数清零, 工件最小值, @@ -109,6 +107,9 @@ namespace DH.Commons.Enums 挡料电机位置, OK脉冲, NG脉冲, + 状态复位, + 启用定位, + 定位完成脉冲值 @@ -129,7 +130,11 @@ namespace DH.Commons.Enums 关闭, 启用 } - + public enum EnumBool1 + { + False, + True + } public enum StreamFormat { [Description("8位图像")] diff --git a/DH.Commons/Helper/ConfigHelper.cs b/DH.Commons/Helper/ConfigHelper.cs index 8bb6248..e1678af 100644 --- a/DH.Commons/Helper/ConfigHelper.cs +++ b/DH.Commons/Helper/ConfigHelper.cs @@ -101,7 +101,8 @@ namespace DH.Commons.Helper { ConfigModel.CameraBaseList, ConfigModel.PLCBaseList, - ConfigModel.DetectionList + ConfigModel.DetectionList, + ConfigModel.GlobalList, }, _jsonOptions); // 写入新配置 @@ -157,8 +158,9 @@ namespace DH.Commons.Helper var data = JsonSerializer.Deserialize(json, _jsonOptions); ConfigModel.CameraBaseList = data?.Cameras ?? new List(); - ConfigModel.PLCBaseList = data?.PLCs ?? new List(); ConfigModel.DetectionList = data?.Detections ?? new List(); + ConfigModel.PLCBaseList = data?.PLCs ?? new List(); + ConfigModel.GlobalList = data?.GlobalConfigs ?? new List(); } /// @@ -261,6 +263,10 @@ namespace DH.Commons.Helper [JsonPropertyName("detectionList")] public List Detections { get; set; } = new List(); + [JsonPropertyName("globalList")] + public List GlobalConfigs { get; set; } = new List(); + + } } } \ No newline at end of file diff --git a/DH.Commons/Models/SystemModel.cs b/DH.Commons/Models/SystemModel.cs index eb0d2f5..c2a4264 100644 --- a/DH.Commons/Models/SystemModel.cs +++ b/DH.Commons/Models/SystemModel.cs @@ -25,5 +25,6 @@ namespace DH.Commons.Models public static List CameraBaseList = new List(); public static List PLCBaseList = new List(); public static List DetectionList = new List(); + public static List GlobalList = new List(); } } diff --git a/DH.Devices.PLC/XinJEPLCTcpNet.cs b/DH.Devices.PLC/XinJEPLCTcpNet.cs index b3e55cf..820831f 100644 --- a/DH.Devices.PLC/XinJEPLCTcpNet.cs +++ b/DH.Devices.PLC/XinJEPLCTcpNet.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.ComponentModel; using System.Data; using System.Diagnostics; using System.Linq; @@ -10,6 +11,7 @@ using System.Threading.Tasks; using System.Xml.Linq; using DH.Commons.Base; using DH.Commons.Enums; +using DH.Commons.Models; using HslCommunication; using HslCommunication.Enthernet; using HslCommunication.Profinet.XINJE; @@ -43,84 +45,159 @@ namespace DH.Devices.PLC TcpNet.SleepTime = 0; TcpNet.AddressStartWithZero = true; TcpNet.IsStringReverse = false; - TcpNet.DataFormat = HslCommunication.Core.DataFormat.ABCD; TcpNet.Station = 1; - TcpNet.Series = XinJESeries.XD; - - PLCItem itemSpeed = PLCItemList.FirstOrDefault(u => u.Name == "转盘速度"); - if(itemSpeed== null) + switch (PLCType) { - return false; + case EnumPLCType.信捷XD网口: + TcpNet.Series = XinJESeries.XD; + TcpNet.DataFormat = HslCommunication.Core.DataFormat.CDAB; + break; + case EnumPLCType.信捷XC网口: + TcpNet.Series = XinJESeries.XC; + TcpNet.DataFormat = HslCommunication.Core.DataFormat.CDAB; + break; } OperateResult ret = TcpNet.ConnectServer(); if (ret.IsSuccess) { Connected = true; - CountToZero(); - TcpNet.Write("M122", true); - MonitorPieces(); - TurntableStop(); - PrepareMotion();//心跳监听 + //初始化流程 + InitProcess(); return true; } else { - return false; + Connected = false; + throw new Exception($"{IP}:{Port}PLC连接失败!"); } } - catch + catch(Exception ex) { - return false; + Connected = false; + throw new Exception($"{IP}:{Port}PLC连接失败!失败原因:{ex.ToString()}"); } } - - public override ushort ReadShort(string address) + public override Int16 ReadInt16(string address) { try { - // 读取Int变量 - var result = TcpNet.ReadInt16(address); - if (result.IsSuccess) + if (Connected) { - return (ushort)result.Content; + // 读取Int变量 + var result = TcpNet.ReadInt16(address); + if (result.IsSuccess) + { + return result.Content; + } + else + { + + throw new Exception($"PLC操作读取int16失败,地址{address}"); + + } } else { - return 0; + throw new Exception($"PLC未连接,地址{address}"); } } catch (Exception ex) { + throw new Exception($"PLC操作读取int16失败,地址{address},失败原因:{ex.ToString()}"); + } + } - return 0; + public override Int32 ReadInt32(string address) + { + try + { + if (Connected) + { + // 读取Int变量 + var result = TcpNet.ReadInt32(address); + if (result.IsSuccess) + { + return result.Content; + } + else + { + + throw new Exception($"PLC操作读取int32失败,地址{address}"); + } + } + else + { + throw new Exception($"PLC未连接,地址{address}"); + } + } + catch (Exception ex) + { + throw new Exception($"PLC操作读取int32失败,地址{address},失败原因:{ex.ToString()}"); } } - - public override int ReadInt(string address) + public override UInt16 ReadUInt16(string address) { try { - // 读取Int变量 - var result = TcpNet.ReadInt32(address); - if (result.IsSuccess) + if (Connected) { - return result.Content; + // 读取Int变量 + var result = TcpNet.ReadUInt16(address); + if (result.IsSuccess) + { + return result.Content; + } + else + { + + throw new Exception($"PLC操作读取uint16失败,地址{address}"); + + } } else { + throw new Exception($"PLC未连接,地址{address}"); + } + + } + catch (Exception ex) + { + throw new Exception($"PLC操作读取uint16失败,地址{address},失败原因:{ex.ToString()}"); + } + } - return -1; + public override UInt32 ReadUInt32(string address) + { + try + { + if (Connected) + { + // 读取Int变量 + var result = TcpNet.ReadUInt32(address); + if (result.IsSuccess) + { + return result.Content; + } + else + { + + throw new Exception($"PLC操作uint32失败,地址{address}"); + } + } + else + { + throw new Exception($"PLC未连接,地址{address}"); } } catch (Exception ex) { - return -1; + throw new Exception($"PLC操作读取uint32失败,地址{address},失败原因:{ex.ToString()}"); } } @@ -129,228 +206,244 @@ namespace DH.Devices.PLC { try { - // 读取Float变量 - var result = TcpNet.ReadFloat(address); - if (result.IsSuccess) + if (Connected) { - return result.Content; + // 读取Float变量 + var result = TcpNet.ReadFloat(address); + if (result.IsSuccess) + { + return result.Content; + } + else + { + throw new Exception($"PLC操作读取float失败,地址{address}"); + } } else { - return -1; + throw new Exception($"PLC未连接,地址{address}"); } } catch (Exception ex) { - return -1; + throw new Exception($"PLC操作读取float失败,地址{address},失败原因:{ex.ToString()}"); } } public override bool ReadBool(string address) { try - { - // 读取Bool变量 - var result = TcpNet.ReadBool(address); - if (result.IsSuccess) + { if (Connected) { - return result.Content; + // 读取Bool变量 + var result = TcpNet.ReadBool(address); + if (result.IsSuccess) + { + return result.Content; + } + else + { + throw new Exception($"PLC操作读取bool失败,地址{address}"); + } } else { - return false; // 或者可以考虑返回其他的错误标识符 + throw new Exception($"PLC未连接,地址{address}"); } } catch (Exception ex) { - return false; // 或者返回其他的错误标识符 + throw new Exception($"PLC操作读取bool失败,地址{address},失败原因:{ex.ToString()}"); } } /// - /// 写单独地址 short 值 + /// 写单独地址 uint32 值 /// /// 地址 /// 要写入的 int 值 /// 是否等待回复 - public override bool WriteShort(string address, short writeValue, bool waitForReply = true) + public override bool WriteUInt32(string address, UInt32 writeValue, bool waitForReply = true) { - if (string.IsNullOrEmpty(address)) + if (Connected) { - return false; + + if (string.IsNullOrEmpty(address)) + { + return false; + } + + int repeatTime = 3; + + do + { + try + { + var result = TcpNet.Write(address, writeValue); + if (result.IsSuccess) + { + return true; + } + } + catch (Exception ex) + { + repeatTime--; + if (repeatTime <= 0) + { + throw new Exception($"PLC操作写入uint32失败,地址{address},失败原因:{ex.ToString()}"); + } + } + } while (repeatTime > 0); } - - int repeatTime = 3; - Stopwatch sw = new Stopwatch(); - sw.Start(); // 启动计时 - - do + else { - try - { - var result = TcpNet.Write(address, (short)writeValue); - if (result.IsSuccess) - { - sw.Stop(); - //LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"{Name} {address}，写入 {writeValue} 完成，耗时:{sw.ElapsedMilliseconds} ms"); - return true; - } - } - catch (Exception ex) - { - repeatTime--; - if (repeatTime <= 0) - { - return false; - } - } - } while (repeatTime > 0); - - sw.Stop(); + throw new Exception($"PLC未连接,地址{address}"); + } return false; } - /// - /// 写单独地址 int 值 + /// 写单独地址 uint16 值 /// /// 地址 /// 要写入的 int 值 /// 是否等待回复 - public override bool WriteInt(string address, int writeValue, bool waitForReply = true) + + public override bool WriteUInt16(string address, UInt16 writeValue, bool waitForReply = true) { - if (string.IsNullOrEmpty(address)) + if (Connected) { - return false; + if (string.IsNullOrEmpty(address)) + { + return false; + } + + int repeatTime = 3; + + do + { + try + { + var result = TcpNet.Write(address, writeValue); + if (result.IsSuccess) + { + return true; + } + } + catch (Exception ex) + { + repeatTime--; + if (repeatTime <= 0) + { + throw new Exception($"PLC操作写入uint16失败,地址{address},失败原因:{ex.ToString()}"); + } + } + } while (repeatTime > 0); } - - int repeatTime = 3; - Stopwatch sw = new Stopwatch(); - sw.Start(); // 启动计时 - - do + else { - try - { - var result = TcpNet.Write(address, writeValue); - if (result.IsSuccess) - { - sw.Stop(); - return true; - } - } - catch (Exception ex) - { - repeatTime--; - if (repeatTime <= 0) - { - return false; - } - } - } while (repeatTime > 0); - - sw.Stop(); + throw new Exception($"PLC未连接,地址{address}"); + } return false; } + /// - /// 写单独地址 Dint 值 + /// 写单独地址 int32 值 /// /// 地址 - /// 要写入的 Dint 值 + /// 要写入的 int 值 /// 是否等待回复 - public override bool WriteDInt(string address, int writeValue, bool waitForReply = true) + public override bool WriteInt32(string address, Int32 writeValue, bool waitForReply = true) { - if (string.IsNullOrEmpty(address)) + if (Connected) { - return false; + if (string.IsNullOrEmpty(address)) + { + return false; + } + + int repeatTime = 3; + + do + { + try + { + var result = TcpNet.Write(address, writeValue); + if (result.IsSuccess) + { + return true; + } + } + catch (Exception ex) + { + repeatTime--; + if (repeatTime <= 0) + { + throw new Exception($"PLC操作写入int32失败,地址{address},失败原因:{ex.ToString()}"); + } + } + } while (repeatTime > 0); } - - int repeatTime = 3; - Stopwatch sw = new Stopwatch(); - sw.Start(); // 启动计时 - - do + else { - try - { - string result = Regex.Replace(address, @"\D", ""); - int r = Convert.ToInt32(result) + 1; - string address1 = "HD" + r.ToString(); - short high = (short)(writeValue >> 16); // 高 16 位 - short low = (short)(writeValue & 0xFFFF); // 低 16 位 - TcpNet.Write(address1, high); - Thread.Sleep(10); - var res = TcpNet.Write(address, low); - if (res.IsSuccess) - { - sw.Stop(); - return true; - } - } - catch (Exception ex) - { - repeatTime--; - if (repeatTime <= 0) - { - return false; - } - } - } while (repeatTime > 0); - - sw.Stop(); + throw new Exception($"PLC未连接,地址{address}"); + } return false; } /// - /// 写单独地址 Dint 值- 待测试 + /// 写单独地址 int16 值 /// - /// - /// - /// - /// - public override bool WriteDInt1(string address, int writeValue, bool waitForReply = true) + /// 地址 + /// 要写入的 int 值 + /// 是否等待回复 + + public override bool WriteInt16(string address, Int16 writeValue, bool waitForReply = true) { - // 1. 地址格式解析 - var match = Regex.Match(address, @"^([A-Za-z]+)(\d+)$"); - if (!match.Success) + if (Connected) { - Console.WriteLine($"地址格式错误: {address}"); - return false; + if (string.IsNullOrEmpty(address)) + { + return false; + } + + int repeatTime = 3; + + do + { + try + { + var result = TcpNet.Write(address, writeValue); + if (result.IsSuccess) + { + return true; + } + } + catch (Exception ex) + { + repeatTime--; + if (repeatTime <= 0) + { + throw new Exception($"PLC操作写入int16失败,地址{address},失败原因:{ex.ToString()}"); + } + } + } while (repeatTime > 0); } - - string prefix = match.Groups[1].Value; // 提取字母部分（如"D"或"HD"） - int baseAddr = int.Parse(match.Groups[2].Value); // 提取数字部分（如100） - - // 2. 数值拆分为两个16位值（大端序） - byte[] bytes = BitConverter.GetBytes(writeValue); - short high = BitConverter.ToInt16(bytes, 2); // 高16位 - short low = BitConverter.ToInt16(bytes, 0); // 低16位 - - // 3. 构造高低位地址 - string highAddress = $"{prefix}{baseAddr + 1}"; // 如"D101"或"HD101" - string lowAddress = $"{prefix}{baseAddr}"; // 如"D100"或"HD100" - - // 4. 写入操作（带重试） - for (int i = 0; i < 3; i++) + else { - try - { - if (!TcpNet.Write(highAddress, high).IsSuccess) continue; - Thread.Sleep(10); - return TcpNet.Write(lowAddress, low).IsSuccess; - } - catch (Exception ex) - { - Console.WriteLine($"写入失败: {ex.Message}"); - Thread.Sleep(50 * (i + 1)); - } + throw new Exception($"PLC未连接,地址{address}"); } + return false; } + + + + /// /// 写单独地址 float 值 /// @@ -359,37 +452,39 @@ namespace DH.Devices.PLC /// 是否等待回复 public override bool WriteFloat(string address, float writeValue, bool waitForReply = true) { - if (string.IsNullOrEmpty(address)) + if (Connected) { - return false; + if (string.IsNullOrEmpty(address)) + { + return false; + } + + int repeatTime = 3; + + do + { + try + { + var result = TcpNet.Write(address, writeValue); + if (result.IsSuccess) + { + return true; + } + } + catch (Exception ex) + { + repeatTime--; + if (repeatTime <= 0) + { + throw new Exception($"PLC操作写入float失败,地址{address},失败原因:{ex.ToString()}"); + } + } + } while (repeatTime > 0); } - - int repeatTime = 3; - Stopwatch sw = new Stopwatch(); - sw.Start(); // 启动计时 - - do + else { - try - { - var result = TcpNet.Write(address, writeValue); - if (result.IsSuccess) - { - sw.Stop(); - return true; - } - } - catch (Exception ex) - { - repeatTime--; - if (repeatTime <= 0) - { - return false; - } - } - } while (repeatTime > 0); - - sw.Stop(); + throw new Exception($"PLC未连接,地址{address}"); + } return false; } @@ -401,38 +496,41 @@ namespace DH.Devices.PLC /// 是否等待回复 public override bool WriteBool(string address, bool writeValue, bool waitForReply = true) { - if (string.IsNullOrEmpty(address)) + if(Connected) { - return false; + if (string.IsNullOrEmpty(address)) + { + return false; + } + + int repeatTime = 3; + do + { + try + { + var result = TcpNet.Write(address, writeValue); + if (result.IsSuccess) + { + return true; + } + } + catch (Exception ex) + { + repeatTime--; + if (repeatTime <= 0) + { + throw new Exception($"PLC操作写入bool失败,地址{address},失败原因:{ex.ToString()}"); + } + } + } while (repeatTime > 0); + + Thread.Sleep(30); } - - int repeatTime = 3; - Stopwatch sw = new Stopwatch(); - sw.Start(); // 启动计时 - - do + else { - try - { - var result = TcpNet.Write(address, writeValue); - if (result.IsSuccess) - { - sw.Stop(); - return true; - } - } - catch (Exception ex) - { - repeatTime--; - if (repeatTime <= 0) - { - return false; - } - } - } while (repeatTime > 0); - - sw.Stop(); - Thread.Sleep(10); + throw new Exception($"PLC未连接,地址{address}"); + } + return false; } @@ -441,7 +539,7 @@ namespace DH.Devices.PLC { if (Connected) { - TurntableStop(); + var res = TcpNet.ConnectClose(); if (res.IsSuccess) { @@ -487,19 +585,15 @@ namespace DH.Devices.PLC OnNewPieces?.Invoke(axisIndex, pieceNumber); }); } - public async Task HeartbeatAsync1() + public async Task HeartbeatAsync1() { - - - - + PLCItem? pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "心跳地址"); while (Connected) { - PLCItem pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "心跳地址"); + if (pLCItem == null) return; - string HeartbeatAddress = pLCItem.Type + pLCItem.Address; - TcpNet.Write(HeartbeatAddress, true); + WriteBool(pLCItem.Name, true); await Task.Delay(900); // 非阻塞，等待1秒 } } @@ -513,7 +607,7 @@ namespace DH.Devices.PLC PLCItem pLCItem= PLCItemList.FirstOrDefault(u => u.Name == "产品计数"); if (pLCItem == null) return; - string Count = pLCItem.Type + pLCItem.Address; + string Count = pLCItem.Address; DateTime startTime = DateTime.Now; DateTime endTime = startTime; TimeSpan timeSpan = endTime - startTime; @@ -526,7 +620,7 @@ namespace DH.Devices.PLC sw.Start(); // var ret = TcpNet.ReadUInt16("D1016"); - var ret = TcpNet.ReadUInt16(Count); + var ret = TcpNet.ReadUInt32(Count); sw.Stop(); if (ret.IsSuccess) @@ -562,176 +656,178 @@ namespace DH.Devices.PLC } } - - - - /// - /// 转盘开启操作 - /// - public void TurntableOpen() + public void InitProcess() { - PLCItem pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "计数清零"); - if (pLCItem == null) - return; - string CountToZero = pLCItem.Type + pLCItem.Address; - PLCItem DiskSpeedItem = PLCItemList.FirstOrDefault(u => u.Name == "转盘速度"); - if (DiskSpeedItem == null) - return; - string diskSpeedadress = DiskSpeedItem.Type + DiskSpeedItem.Address; - int diskSpeedValue= Convert.ToInt32( DiskSpeedItem.Value); - PLCItem DiskDirectionItem = PLCItemList.FirstOrDefault(u => u.Name == "转盘方向"); - if (DiskDirectionItem == null) - return; - string diskDirectionadress = DiskDirectionItem.Type + DiskDirectionItem.Address; - bool Direction =Convert.ToBoolean( DiskDirectionItem.Value); - PLCItem DiskOpenItem = PLCItemList.FirstOrDefault(u => u.Name == "转盘使能"); - if (DiskOpenItem == null) - return; - string diskopenadress = DiskOpenItem.Type + DiskOpenItem.Address; - PLCItem DiskRunItem = PLCItemList.FirstOrDefault(u => u.Name == "转盘启动"); - if (DiskRunItem == null) - return; - string diskadress = DiskRunItem.Type + DiskRunItem.Address; - + //启用心跳 + OpenHeartbeat(true); + //状态复位 + StatusReset(); + //关闭定位 + VisionPos(false); - WriteBool(CountToZero, true); - Thread.Sleep(10); - WriteBool("M10", false); - Thread.Sleep(10); - //速度 - TcpNet.Write(diskSpeedadress, (ushort)diskSpeedValue); - Thread.Sleep(10); - //方向 - WriteBool(diskDirectionadress, Direction); - Thread.Sleep(10); - //使能 - WriteBool(diskopenadress, true); - Thread.Sleep(10); - //启动 - WriteBool(diskadress, true); + //写入流程加载点位配置 + InitProcessAction(); + //计数清零 + CountToZero(); + //停止转盘 + TurnStart(false); + //转盘使能 + TurnEnable(true); + //开启入料监听 + MonitorPieces(); - //WriteBool("M122", true); - //Thread.Sleep(10); - //WriteBool("M10", false); - //Thread.Sleep(10); - ////速度 - //TcpNet.Write("HD10", (ushort)10000); - //Thread.Sleep(10); - ////方向 - //WriteBool("M1", Direction); - //Thread.Sleep(10); - ////使能 - //WriteBool("M2", true); - //Thread.Sleep(10); - ////启动 - //WriteBool("M0", true); - Thread.Sleep(10); - // _mainMotion.CurrentState = DeviceState.DSOpen; - piecesCount = 0; } - - /// - /// 转盘停止操作 - /// - public void TurntableStop() + + public void StartProcess() + { + //状态复位 + StatusReset(); + //关闭定位 + VisionPos(false); + //写入流程启动点位配置 + StartProcessAction(); + //计数清零 + CountToZero(); + //转盘启动 + TurnStart(true); + } + + + public void InitProcessAction() => + ProcessAction(ConfigModel.GlobalList?.FirstOrDefault()?.InitProcessList?.ToList() ?? new List()); + + public void StartProcessAction() => + ProcessAction(ConfigModel.GlobalList?.FirstOrDefault()?.StartProcessList?.ToList() ?? new List()); + + public void StopProcessAction() => + ProcessAction(ConfigModel.GlobalList?.FirstOrDefault()?.StopProcessList?.ToList() ?? new List()); + + public void StartResetAction() => + ProcessAction(ConfigModel.GlobalList?.FirstOrDefault()?.StartResetList?.ToList() ?? new List()); + + public void StopResetAction() => + ProcessAction(ConfigModel.GlobalList?.FirstOrDefault()?.StopResetList?.ToList() ?? new List()); + + // 处理方法：无需再检查 null + private void ProcessAction(List items) { - PLCItem pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "计数清零"); + if (items.Count == 0) return; + + foreach (var item in items.OrderBy(x => x.StartIndex)) + { + switch (item.Type) + { + case EnumPLCDataType.单字整型: + WriteUInt16(item.Address, ushort.Parse(item.Value)); + break; + case EnumPLCDataType.双字整型: + WriteUInt32(item.Address, uint.Parse(item.Value)); + break; + case EnumPLCDataType.浮点型: + WriteFloat(item.Address, float.Parse(item.Value)); + break; + case EnumPLCDataType.布尔型: + WriteBool(item.Address, item.Value.Equals("true", StringComparison.OrdinalIgnoreCase)); + break; + } + } + } + /// + /// 状态复位 + /// + public void StatusReset() + { + PLCItem? pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "状态复位"); if (pLCItem == null) return; - string CountToZero = pLCItem.Type + pLCItem.Address; - PLCItem DiskRunItem = PLCItemList.FirstOrDefault(u => u.Name == "转盘启动"); + WriteBool(pLCItem.Address, false); + } + + /// + /// 开启关闭视觉定位 + /// + public void VisionPos(bool b) + { + PLCItem? pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "启用定位"); + if (pLCItem == null) + return; + WriteBool(pLCItem.Address, b); + } + + /// + /// 转盘启停 + /// + public void TurnStart(bool b) + { + PLCItem? DiskRunItem = PLCItemList.FirstOrDefault(u => u.Name == "转盘启动"); if (DiskRunItem == null) return; - string diskadress = DiskRunItem.Type + DiskRunItem.Address; - PLCItem DiskOpenItem = PLCItemList.FirstOrDefault(u => u.Name == "转盘使能"); - if (DiskOpenItem == null) - return; - string diskopenadress = DiskOpenItem.Type + DiskOpenItem.Address; - - WriteBool(CountToZero, true); - Thread.Sleep(50); - WriteBool(diskadress, false); - Thread.Sleep(50); - WriteBool(diskopenadress, false); - Thread.Sleep(50); - WriteBool("M10", false); - - //WriteBool("M122", true); - //Thread.Sleep(50); - //WriteBool("M0", false); - //Thread.Sleep(50); - //WriteBool("M2", false); - //Thread.Sleep(50); - //WriteBool("M50", false); + WriteBool(DiskRunItem.Address, b); + Thread.Sleep(30); piecesCount = 0; } - private void PrepareMotion() + /// + /// 转盘使能 + /// + /// + public void TurnEnable(bool b) { + PLCItem? DiskOpenItem = PLCItemList.FirstOrDefault(u => u.Name == "转盘使能"); + if (DiskOpenItem == null) + return; + WriteBool(DiskOpenItem.Address, b); + Thread.Sleep(30); + } + /// + /// 计数清零 + /// + public void CountToZero() + { + PLCItem? pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "计数清零"); + if (pLCItem == null) + return; + WriteBool(pLCItem.Address, true); + Thread.Sleep(30); + } + public void RedLight(bool b) + { + PLCItem? pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "指示灯红"); + if (pLCItem == null) + return; + WriteBool(pLCItem.Address, b); + Thread.Sleep(30); + } + public void GreenLight(bool b) + { + PLCItem? pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "指示灯绿"); + if (pLCItem == null) + return; + WriteBool(pLCItem.Address, b); + Thread.Sleep(30); - //心跳 - //if (X018PLCConfig.Heartbeat) - //{ + } - Task.Run(async () => await HeartbeatAsync1()); - //} + public void YellowLight(bool b) + { + PLCItem? pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "指示灯黄"); + if (pLCItem == null) + return; + WriteBool(pLCItem.Address, b); + Thread.Sleep(30); + } - ////写入工件最大值、最小值 - ProjectValue(); - - - ////写入工位脉冲 - Workstation1Pulse(); - Workstation2Pulse(); - Workstation3Pulse(); - Workstation4Pulse(); - Workstation5Pulse(); - - ////写入吹气时间 - ChuiQiTime(); - - - ////写入吹气脉冲 - OKPulse(); - NGPulse(); - //if (_GC01Driver == null) - //{ - // _GC01Driver = DeviceCollection.FirstOrDefault(u => u is GC01Driver) as GC01Driver; - //} - //if (_GC01Driver == null) - //{ - // throw new ProcessException($"未能获取激光位移传感器驱动"); - //} - //if (_vibrationDriver == null) - //{ - // _vibrationDriver = DeviceCollection.FirstOrDefault(u => u is JYDAMDriver) as JYDAMDriver; - //} - //if (_vibrationDriver == null) - //{ - // throw new ProcessException($"未能获取振动盘控制器驱动"); - //} - - // ResetTimer = new Timer(FullResetProcessExcute, null, -1, -1); - - //feedingProductTimer = new Timer(FeedingProductTriggerExcute, null, -1, -1); - //feedingProductTimerTimer = new Timer(UpdateFeedingProductTrigger, null, -1, -1); - - //_mainMotion.OnAxisPositionChanged -= MainMotion_OnAxisPositionChanged; - //_mainMotion.OnAxisPositionChanged += MainMotion_OnAxisPositionChanged; - - //_mainMotion.OnCapturePositionChanged -= MainMotion_OnCapturePositionChanged; - //_mainMotion.OnCapturePositionChanged += MainMotion_OnCapturePositionChanged; - - // _mainMotion.OnNewPieces -= MainMotion_NewPieces; - // _mainMotion.OnNewPieces += MainMotion_NewPieces; - - //_mainMotion.OnAlarmVibrationDisk -= MainMotion_AlarmVibrationDisk; - //_mainMotion.OnAlarmVibrationDisk += MainMotion_AlarmVibrationDisk; - // PrepareLightIndexes(); + public void Buzzer(bool b) + { + PLCItem? pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "蜂鸣器"); + if (pLCItem == null) + return; + WriteBool(pLCItem.Address, b); + Thread.Sleep(30); } /// @@ -778,16 +874,16 @@ namespace DH.Devices.PLC string CunClockwise = CunClockwiseItem.Type + CunClockwiseItem.Address; string CunCounterclockwise = CunCounterclockwiseItem.Type + CunCounterclockwiseItem.Address; string CunPos = CunPosItem.Type + CunPosItem.Address; - short zerospeed = (short)Convert.ToInt32(zerospeeditem.Value); - short cunSpeed = (short)Convert.ToInt32(CunSpeed.Value); - short u = (short)Convert.ToInt32(CunPosItem.Value); + UInt16 zerospeed = UInt16.Parse(zerospeeditem.Value); + UInt16 cunSpeed = UInt16.Parse(CunSpeed.Value); + UInt16 u = UInt16.Parse(CunPosItem.Value); // WriteBool(CountToZero, true); // 检查是否不在原点，如果不在，则回原点 if (!ReadBool(CunToZero)) { - WriteShort(CunToZeroSpeed, (short)zerospeed); // 速度 - Thread.Sleep(10); + WriteUInt16(CunToZeroSpeed, zerospeed); // 速度 + Thread.Sleep(30); // 发送回原点指令 WriteBool(CunToZero, true); Thread.Sleep(1000); // 给设备一些时间响应 @@ -809,7 +905,7 @@ namespace DH.Devices.PLC - WriteShort(CunSpeedadress, (short)cunSpeed); + WriteUInt16(CunSpeedadress,cunSpeed); Thread.Sleep(2000); string dir = string.Empty; if (direction) @@ -822,285 +918,52 @@ namespace DH.Devices.PLC WriteBool(CunCounterclockwise, true); // 逆时针转动 dir = "逆时针"; } - Thread.Sleep(10); - WriteShort(CunPos, (short)u); // 目标位置 + Thread.Sleep(30); + WriteUInt16(CunPos, u); // 目标位置 Thread.Sleep(2000); } - - /// - /// 计数清零 + /// 转盘清料 /// - public void CountToZero() - { - PLCItem pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "计数清零"); - if (pLCItem == null) - return; - string CountToZero = pLCItem.Type + pLCItem.Address; - WriteBool(CountToZero, true); - Thread.Sleep(10); - } - - public void RedLight(bool b) - { - PLCItem pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "指示灯红"); - if (pLCItem == null) - return; - string RedLight = pLCItem.Type + pLCItem.Address; - WriteBool(RedLight, b); - Thread.Sleep(10); - } - - public void GreenLight(bool b) - { - PLCItem pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "指示灯绿"); - if (pLCItem == null) - return; - string Light = pLCItem.Type + pLCItem.Address; - WriteBool(Light, b); - // WriteBool(IIConfig.GreenLight, b); - Thread.Sleep(10); - - } - - public void YellowLight(bool b) - { - PLCItem pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "指示灯黄"); - if (pLCItem == null) - return; - string Light = pLCItem.Type + pLCItem.Address; - WriteBool(Light, b); - Thread.Sleep(10); - } - - public void Buzzer(bool b) - { - PLCItem pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "蜂鸣器"); - if (pLCItem == null) - return; - string Light = pLCItem.Type + pLCItem.Address; - WriteBool(Light, b); - Thread.Sleep(10); - } - - public void Belt(bool b) - { - PLCItem pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "皮带"); - if (pLCItem == null) - return; - string Light = pLCItem.Type + pLCItem.Address; - WriteBool(Light, b); - Thread.Sleep(10); - } - - - public void Workstation1Pulse() - { - PLCItem pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "工位1"); - if (pLCItem == null) - return; - string Workstation1Pulse = pLCItem.Type + pLCItem.Address; - int Pulse=Convert.ToInt32(pLCItem.Value); - - string result = Regex.Replace(Workstation1Pulse, @"\D", ""); - int r = Convert.ToInt32(result) + 1; - result = "HD" + r.ToString(); - short high = (short)(Pulse >> 16); // 高 16 位 - short low = (short)(Pulse & 0xFFFF); // 低 16 位 - WriteShort(result, high); - Thread.Sleep(10); - WriteShort(Workstation1Pulse, low); - Thread.Sleep(10); - } - - public void Workstation2Pulse() - { - PLCItem pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "工位2"); - if (pLCItem == null) - return; - string Workstation1Pulse = pLCItem.Type + pLCItem.Address; - int Pulse=Convert.ToInt32(pLCItem.Value); - string result = Regex.Replace(Workstation1Pulse, @"\D", ""); - int r = Convert.ToInt32(result) + 1; - result = "HD" + r.ToString(); - short high = (short)(Pulse >> 16); // 高 16 位 - short low = (short)(Pulse & 0xFFFF); // 低 16 位 - WriteShort(result, high); - Thread.Sleep(10); - WriteShort(Workstation1Pulse, low); - Thread.Sleep(10); - } - public void Workstation3Pulse() - { - PLCItem pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "工位3"); - if (pLCItem == null) - return; - string Workstation1Pulse = pLCItem.Type + pLCItem.Address; - int Pulse = Convert.ToInt32(pLCItem.Value); - - string result = Regex.Replace(Workstation1Pulse, @"\D", ""); - int r = Convert.ToInt32(result) + 1; - result = "HD" + r.ToString(); - short high = (short)(Pulse >> 16); // 高 16 位 - short low = (short)(Pulse & 0xFFFF); // 低 16 位 - WriteShort(result, high); - Thread.Sleep(10); - WriteShort(Workstation1Pulse, low); - Thread.Sleep(10); - } - public void Workstation4Pulse() - { - PLCItem pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "工位4"); - if (pLCItem == null) - return; - string Workstation1Pulse = pLCItem.Type + pLCItem.Address; - int Pulse = Convert.ToInt32(pLCItem.Value); - string result = Regex.Replace(Workstation1Pulse, @"\D", ""); - int r = Convert.ToInt32(result) + 1; - result = "HD" + r.ToString(); - short high = (short)(Pulse >> 16); // 高 16 位 - short low = (short)(Pulse & 0xFFFF); // 低 16 位 - WriteShort(result, high); - Thread.Sleep(10); - WriteShort(Workstation1Pulse, low); - Thread.Sleep(10); - } - - public void Workstation5Pulse() - { - PLCItem pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "工位5"); - if (pLCItem == null) - return; - - string Workstation1Pulse = pLCItem.Type + pLCItem.Address; - int Pulse = Convert.ToInt32(pLCItem.Value); - string result = Regex.Replace(Workstation1Pulse, @"\D", ""); - int r = Convert.ToInt32(result) + 1; - result = "HD" + r.ToString(); - short high = (short)(Pulse >> 16); // 高 16 位 - short low = (short)(Pulse & 0xFFFF); // 低 16 位 - WriteShort(result, high); - Thread.Sleep(10); - WriteShort(Workstation1Pulse, low); - Thread.Sleep(10); - } - - - - public void ProjectValue() - { - PLCItem pLCItemmax = PLCItemList.FirstOrDefault(u => u.Name == "工件最大值"); - if (pLCItemmax == null) - return; - PLCItem pLCItemmin = PLCItemList.FirstOrDefault(u => u.Name == "工件最小值"); - if (pLCItemmin == null) - return; - int productMax =Convert.ToInt32( pLCItemmax.Value); - int productMin = Convert.ToInt32( pLCItemmin.Value); - - string ProductMax = pLCItemmax.Type + pLCItemmax.Address; - string ProductMin = pLCItemmin.Type + pLCItemmin.Address; - WriteShort(ProductMax, (short)productMax); - Thread.Sleep(10); - WriteShort(ProductMin, (short)productMin); - Thread.Sleep(10); - } - - public void OKPulse() - { - - PLCItem pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "OK脉冲"); - if (pLCItem == null) - return; - - string OKPulse = pLCItem.Type + pLCItem.Address; - int Pulse =Convert.ToInt32( pLCItem.Value); - string result = Regex.Replace(OKPulse, @"\D", ""); - int r = Convert.ToInt32(result) + 1; - result = "HD" + r.ToString(); - short high = (short)(Pulse >> 16); // 高 16 位 - short low = (short)(Pulse & 0xFFFF); // 低 16 位 - WriteShort(result, high); - Thread.Sleep(10); - WriteShort(OKPulse, low); - Thread.Sleep(10); - } - - public void NGPulse() - { - PLCItem pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "NG脉冲"); - if (pLCItem == null) - return; - - string NGPulse = pLCItem.Type + pLCItem.Address; - int Pulse=Convert.ToInt32(pLCItem.Value); - string result = Regex.Replace(NGPulse, @"\D", ""); - int r = Convert.ToInt32(result) + 1; - result = "HD" + r.ToString(); - short high = (short)(Pulse >> 16); // 高 16 位 - short low = (short)(Pulse & 0xFFFF); // 低 16 位 - WriteShort(result, high); - Thread.Sleep(10); - WriteShort(NGPulse, low); - Thread.Sleep(10); - } - - + /// public void TurnClear(bool b) { - PLCItem pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "转盘清料"); + PLCItem? pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "转盘清料"); if (pLCItem == null) return; - - string TurnClear = pLCItem.Type + pLCItem.Address; - - WriteBool(TurnClear, b); - Thread.Sleep(10); + WriteBool(pLCItem.Address, b); + Thread.Sleep(30); } - public void OpenHeartbeat(bool v) + /// + /// 开启心跳 + /// + /// + public void OpenHeartbeat(bool b) { - PLCItem pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "心跳功能"); + PLCItem? pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "启用心跳"); if (pLCItem == null) return; - - string Heartbeat = pLCItem.Type + pLCItem.Address; - - WriteBool(Heartbeat, v); - Thread.Sleep(10); - - + WriteBool(pLCItem.Address, b); + Thread.Sleep(30); + if (b) + { + //开启心跳 + Task.Run(async () => await HeartbeatAsync1()); + } } - public void Vibratory(bool v) + int currentRegister = 0; + public void Blowing(uint productNumber, UInt16 value) { - PLCItem pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "振动盘"); - if (pLCItem == null) - return; - - - string Vibratory = pLCItem.Type + pLCItem.Address; - WriteBool(Vibratory, v); - Thread.Sleep(10); + int Register = (int)((productNumber - 1) % 30); + currentRegister = 411 + Register; + WriteUInt16($"D{currentRegister}", value); + } - - - public void ChuiQiTime() - { - PLCItem pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "吹气时间"); - if (pLCItem == null) - return; - - - string ChuiQiTime = pLCItem.Type + pLCItem.Address; - short time = (short)Convert.ToInt32(pLCItem.Value); - WriteShort(ChuiQiTime, time); - Thread.Sleep(10); - } - } } diff --git a/DHSoftware/DHSoftware.csproj b/DHSoftware/DHSoftware.csproj index a1bfdf8..25a7edd 100644 --- a/DHSoftware/DHSoftware.csproj +++ b/DHSoftware/DHSoftware.csproj @@ -15,6 +15,10 @@ + + + + diff --git a/DHSoftware/LoginWindow.cs b/DHSoftware/LoginWindow.cs index e9ace4f..e9dadec 100644 --- a/DHSoftware/LoginWindow.cs +++ b/DHSoftware/LoginWindow.cs @@ -9,10 +9,32 @@ namespace DHSoftware public LoginWindow() { InitializeComponent(); + // 关键设置：允许窗体优先接收按键事件 + this.KeyPreview = true; + + // 绑定按键事件 + this.KeyDown += Login_KeyDown; button_ok.Click += Button_ok_Click; button_cancel.Click += Button_cancel_Click; } + private void Login_KeyDown(object? sender, KeyEventArgs e) + { + // 监听回车键 + if (e.KeyCode == Keys.Enter) + { + button_ok.PerformClick(); // 触发确定按钮的点击事件 + e.Handled = true; // 阻止其他控件处理该按键 + } + + // 监听 ESC 键 + if (e.KeyCode == Keys.Escape) + { + button_cancel.PerformClick(); // 触发取消按钮的点击事件 + e.Handled = true; + } + } + /// /// 窗体对象实例 /// diff --git a/DHSoftware/MainWindow.cs b/DHSoftware/MainWindow.cs index cc02632..d6a79a0 100644 --- a/DHSoftware/MainWindow.cs +++ b/DHSoftware/MainWindow.cs @@ -291,7 +291,7 @@ namespace DHSoftware for (int i = 0; i < ConfigModel.PLCBaseList.Count; i++) { var plcBase = ConfigModel.PLCBaseList[i]; - if (plcBase.PLCType == EnumPLCType.信捷XC网口) + if (plcBase.PLCType == EnumPLCType.信捷XC网口 || plcBase.PLCType == EnumPLCType.信捷XD网口) { PLC.IP = plcBase.IP; PLC.PLCType = plcBase.PLCType; @@ -577,19 +577,17 @@ namespace DHSoftware StartProcess(); } - private static int currentRegister = 411; // 初始为 D411 + private void StartProcess() { startTime= DateTime.Now; //计数清零 PieceCount = 0; - //吹气点位归置 - currentRegister = 411; + if (PLC?.Enable == true) { - PLC.CountToZero(); PLC.OnNewPieces -= MainMotion_NewPieces; PLC.OnNewPieces += MainMotion_NewPieces; } @@ -692,414 +690,14 @@ namespace DHSoftware } //流程执行时PLC - StartPLCAction(); + PLC.StartProcess(); - // 转盘操作 - // if (_PLC?.IIConfig?.IsEnabled == true) - - // _PLC.TurntableOpen(XKRSPLCConfig.TurnSpeed, XKRSPLCConfig.TurnDirection); - PLCItem itemSpeed = PLC.PLCItemList.FirstOrDefault(u => u.Name == "转盘速度"); - if (itemSpeed != null) - { - PLC.TurntableOpen(); - } - - Thread.Sleep(500); - - //振动盘 - //if (XKRSPLCConfig.IsEnableVibratory) - //{ - // if (_PLC.IIConfig.IsEnabled) - // _PLC.Vibratory(true); - //} - - //InitialOEEStatistic(); - - // MachineState = MachineState.Running; + } - /// - /// 流程开始执行PLC - /// - private void StartPLCAction() - { - if (PLC.PLCItemList?.Count > 0) - { - List startPLCList= PLC.PLCItemList.Where(it=>it.StartExecute).ToList(); - if (startPLCList?.Count > 0) - { - - } - } - } - - private void PrepareMLEngine() - { - //if (_visionEngine == null) - //{ - // _visionEngine = DeviceCollection.FirstOrDefault(u => u is VisionEngineBase) as VisionEngineBase; - //} - - //if (_visionEngine == null) - //{ - // throw new ProcessException($"未能获取检测设备"); - //} - - //相机模组 - //_cameraRelatedDetectionDict = new(); - - //detectionList.ForEach(detection => - //{ - // detection.CameraCollects.ForEach(cam => - // { - // List Dets = new List - // { - // detection.Id - // }; - // if (!_cameraRelatedDetectionDict.ContainsKey(cam.CameraSourceId)) - // { - // _cameraRelatedDetectionDict.Add(cam.CameraSourceId, Dets); - // } - // else - // { - // _cameraRelatedDetectionDict[cam.CameraSourceId].Add(detection.Id); - // } - - // }); - //}); - - //_visionEngine.OnDetectionWarningStop += VisionEngine_OnDetectionWarningStopAsync; - } - -#if false - private void HandleStartButton2() - { - CurrentMachine = true; - - //_visionEngine.Start(); - //[Category("深度学习检测配置")] - //[DisplayName("检测标签定义集合")] - //[Description("定义检测标签的集合，例如：Seg/Detection模式：断裂、油污、划伤...；Class模式：ok、ng、上面、下面、套环、正常...")] - //[TypeConverter(typeof(CollectionCountConvert))] - //[Editor(typeof(ComplexCollectionEditor), typeof(UITypeEditor))] - RecongnitionLabel recongnition = new RecongnitionLabel - { - LabelName = "youwu", - LabelDescription = "油污", - LabelCategory = "A_NG" - }; - RecongnitionLabel recongnition2 = new RecongnitionLabel - { - LabelName = "youwu", - LabelDescription = "油污", - LabelCategory = "A_NG" - }; - RecongnitionLabel recongnition3 = new RecongnitionLabel - { - LabelName = "youwu", - LabelDescription = "油污", - LabelCategory = "A_NG" - }; - RecongnitionLabelList.Add(recongnition); - RecongnitionLabelList.Add(recongnition2); - RecongnitionLabelList.Add(recongnition3); - - var det1 = new DetectionConfig("相机1", ModelType.目标检测, @"D:\PROJECTS\X015\Vision\Cam1.onnx", false, "Cam1"); - var det2 = new DetectionConfig("相机2", ModelType.目标检测, @"D:\PROJECTS\X015\Vision\Cam2.onnx", false, "Cam2"); - var det3 = new DetectionConfig("相机3", ModelType.目标检测, @"D:\PROJECTS\X015\Vision\Cam3.onnx", false, "Cam3"); - var det4 = new DetectionConfig("相机4", ModelType.目标检测, @"D:\PROJECTS\X015\Vision\Cam4.onnx", false, "Cam4"); - var det5 = new DetectionConfig("相机5", ModelType.目标检测, @"D:\PROJECTS\X015\Vision\Cam5.onnx", false, "Cam5"); - var det6 = new DetectionConfig("相机6", ModelType.目标检测, @"D:\PROJECTS\X015\Vision\Cam6.onnx", false, "Cam6"); - var det7 = new DetectionConfig("相机7", ModelType.目标检测, @"D:\PROJECTS\X015\Vision\Cam7.onnx", false, "Cam7"); - var det8 = new DetectionConfig("相机8", ModelType.目标检测, @"D:\PROJECTS\X015\Vision\Cam8.onnx", false, "Cam8"); - List CameraCollects = new List(); - CameraCollects.Add(new RelatedCamera("Cam1")); - List CameraCollects2 = new List(); - CameraCollects2.Add(new RelatedCamera("Cam2")); - List CameraCollects3 = new List(); - CameraCollects3.Add(new RelatedCamera("Cam3")); - List CameraCollects4 = new List(); - CameraCollects4.Add(new RelatedCamera("Cam4")); - List CameraCollects5 = new List(); - CameraCollects5.Add(new RelatedCamera("Cam5")); - List CameraCollects6 = new List(); - CameraCollects6.Add(new RelatedCamera("Cam6")); - List CameraCollects7 = new List(); - CameraCollects7.Add(new RelatedCamera("Cam7")); - List CameraCollects8 = new List(); - CameraCollects8.Add(new RelatedCamera("Cam8")); - - float Conf = 0.5f; - - det1.CameraCollects = CameraCollects; - det1.ModelconfThreshold = Conf; - det1.ModelWidth = 640; - det1.ModelHeight = 640; - det1.In_lable_path = "D:\\PROJECTS\\X015\\Vision\\Cam1.txt"; - det1.IsEnabled = true; - det1.ShowLocation.X = 1; - det1.ShowLocation.Y = 1; - - det2.CameraCollects = CameraCollects2; - det2.ModelconfThreshold = Conf; - det2.ModelWidth = 640; - det2.ModelHeight = 640; - det2.In_lable_path = "D:\\PROJECTS\\X015\\Vision\\Cam2.txt"; - det2.IsEnabled = true; - det2.ShowLocation.X = 2; - det2.ShowLocation.Y = 1; - - det3.CameraCollects = CameraCollects3; - det3.ModelconfThreshold = Conf; - det3.ModelWidth = 640; - det3.ModelHeight = 640; - det3.In_lable_path = "D:\\PROJECTS\\X015\\Vision\\Cam3.txt"; - det3.IsEnabled = true; - det3.ShowLocation.X = 3; - det3.ShowLocation.Y = 1; - - det4.CameraCollects = CameraCollects4; - det4.ModelconfThreshold = Conf; - det4.ModelWidth = 640; - det4.ModelHeight = 640; - det4.In_lable_path = "D:\\PROJECTS\\X015\\Vision\\Cam4.txt"; - det4.IsEnabled = true; - det4.ShowLocation.X = 4; - det4.ShowLocation.Y = 1; - - det5.CameraCollects = CameraCollects5; - det5.ModelconfThreshold = Conf; - det5.ModelWidth = 640; - det5.ModelHeight = 640; - det5.In_lable_path = "D:\\PROJECTS\\X015\\Vision\\Cam5.txt"; - det5.IsEnabled = true; - det5.ShowLocation.X = 1; - det5.ShowLocation.Y = 2; - - det6.CameraCollects = CameraCollects6; - det6.ModelconfThreshold = Conf; - det6.ModelWidth = 640; - det6.ModelHeight = 640; - det6.In_lable_path = "D:\\PROJECTS\\X015\\Vision\\Cam6.txt"; - det6.IsEnabled = true; - det6.ShowLocation.X = 2; - det6.ShowLocation.Y = 2; - - det7.CameraCollects = CameraCollects7; - det7.ModelconfThreshold = Conf; - det7.ModelWidth = 640; - det7.ModelHeight = 640; - det7.In_lable_path = "D:\\PROJECTS\\X015\\Vision\\Cam7.txt"; - det7.IsEnabled = true; - det7.ShowLocation.X = 3; - det7.ShowLocation.Y = 2; - - det8.CameraCollects = CameraCollects8; - det8.ModelconfThreshold = Conf; - det8.ModelWidth = 640; - det8.ModelHeight = 640; - det8.In_lable_path = "D:\\PROJECTS\\X015\\Vision\\Cam8.txt"; - det8.IsEnabled = true; - det8.ShowLocation.X = 4; - det8.ShowLocation.Y = 2; - - DetectionConfigs.Add(det1); - DetectionConfigs.Add(det2); - DetectionConfigs.Add(det3); - DetectionConfigs.Add(det4); - DetectionConfigs.Add(det5); - DetectionConfigs.Add(det6); - DetectionConfigs.Add(det7); - DetectionConfigs.Add(det8); - - Cameras.Clear(); - HKCameras.Clear(); - Dectection.Clear(); - _cameraRelatedDetectionDict = new(); - -#if false - for (int i = 1; i <= 8; i++) - { - HikVisionCamera camera = new HikVisionCamera(); - camera.CameraName = $"Cam{i}"; - camera.CameraIP = $"192.168.{i}.1"; - camera.ComputerIP = $"192.168.{i}.1"; - camera.CameraConnect(); - camera.OnHImageOutput += OnCameraHImageOutput; - HKCameras.Add(camera); - } -#else - //Do3ThinkCamera do3ThinkCamera1 = new Do3ThinkCamera(); - - //do3ThinkCamera1.dvpStreamFormat = dvpStreamFormat.S_RAW8; - //do3ThinkCamera1.CameraName = "Cam1"; - //do3ThinkCamera1.CameraConnect(); - //do3ThinkCamera1.OnHImageOutput += OnCameraHImageOutput; - // Cameras.Add(do3ThinkCamera1); - for (int i = 1; i <= 8; i++) - { - Do3ThinkCamera cam = new Do3ThinkCamera(); - if (i == 1) - { - cam.dvpStreamFormat = dvpStreamFormat.S_RAW8; - } - else - { - cam.dvpStreamFormat = dvpStreamFormat.S_RGB24; - } - - cam.CameraName = $"Cam{i}"; - Cameras.Add(cam); - cam.CameraConnect(); - cam.OnHImageOutput += OnCameraHImageOutput; - } - -#endif - - DetectionConfigs.ForEach(detection => - { - detection.CameraCollects.ForEach(cam => - { - List Dets = new List - { - detection.Id - }; - if (!_cameraRelatedDetectionDict.ContainsKey(cam.CameraSourceId)) - { - _cameraRelatedDetectionDict.Add(cam.CameraSourceId, Dets); - } - else - { - _cameraRelatedDetectionDict[cam.CameraSourceId].Add(detection.Id); - } - } - ); - }); - string inferenceDevice = "CPU"; - - _visionEngine = new SimboVisionDriver(); - _visionEngine.DetectionConfigs = DetectionConfigs; - - _visionEngine.Init(); - CtrlVisionRunBase ctrlVisionRun = new CtrlVisionRunBase(_visionEngine); - tabImgDisplay.Controls.Add(ctrlVisionRun); - - //Add the code for the "启动" button click here - - ////初始化Halcon工具 - //InitialHalconTools(); - - ////深度学习模型加载 - //bool resultOK = InitialSimboMLEnginesAsync(); - //if (resultOK) - //{ - // //初始化失败 - // // return; - //} - //位置比较卡 - - sLDMotion.AxisSettings = new List(); - AxisSetting axis1 = new AxisSetting(); - axis1.AxisIndex = 0; - axis1.AxisName = "转盘1"; - axis1.IsAxisEnabled = true; - //axis1.AlarmLogic = AxisDirection.Positive; - sLDMotion.IODefinitionCollection = new List(); - Motion(sLDMotion.IODefinitionCollection); - - sLDMotion.SnapshotSettings = new List(); - int[] cameraPositions = { 24161, 33608, 39702, 45701 }; - - sLDMotion.SnapshotSettings.Add(new SnapshotSetting - { - IsEnabled = true, - CameraIO = sLDMotion.IODefinitionCollection.FirstOrDefault(t => t.IOType == IOType.OUTPUT && t.IOIndex == 13), - CameraPosition = 7613, - StationNumber = 0 - }); - for (int i = 0; i < 4; i++) - { - sLDMotion.SnapshotSettings.Add(new SnapshotSetting - { - IsEnabled = true, - CameraIO = sLDMotion.IODefinitionCollection.FirstOrDefault(t => t.IOType == IOType.OUTPUT && t.IOIndex == i), - CameraPosition = cameraPositions[i], - StationNumber = 0 - }); - } - - sLDMotion.BlowSettings = new List(); - int[] BlowPositions = { 61353, 68566 }; - sLDMotion.BlowSettings.Add(new BlowSetting - { - IsEnabled = true, - BlowIO = sLDMotion.IODefinitionCollection.FirstOrDefault(t => t.IOType == IOType.OUTPUT && t.IOIndex == 5), - BlowPosition = BlowPositions[0], - StationNumber = 0 - }); - sLDMotion.BlowSettings.Add(new BlowSetting - { - IsEnabled = true, - BlowIO = sLDMotion.IODefinitionCollection.FirstOrDefault(t => t.IOType == IOType.OUTPUT && t.IOIndex == 6), - BlowPosition = BlowPositions[1], - StationNumber = 0 - }); - - //SnapshotSetting sna1 = new SnapshotSetting(); - //sna1.IsEnabled = true; - //sna1.CameraIO= sLDMotion.IODefinitionCollection.FirstOrDefault(t => t.IOType == IOType.OUTPUT && t.IOIndex == 0); - //sna1.CameraPosition = 17000; - //sna1.StationNumber = 0; - - // sLDMotion.SnapshotSettings.Add(sna1); - sLDMotion.AxisSettings.Add(axis1); - sLDMotion.Init(); - sLDMotion.OnNewPieces -= MainMotion_NewPieces; - sLDMotion.OnNewPieces += MainMotion_NewPieces; - // sLDMotion.Start(); - - //PLC.IP = "192.168.6.6"; - //PLC.Port = 502; - //PLC.PLCConnect(); - //PLC.OnNewPieces -= MainMotion_NewPieces; - //PLC.OnNewPieces += MainMotion_NewPieces; - ProductBaseCount = 8; - for (int i = 0; i < ProductBaseCount * ProductListMulti; i++) - { - ConcurrentDictionary products = new ConcurrentDictionary(); - _productLists.Add(products); - } - sLDMotion.AxisStop(); - bool e = sLDMotion.CArdReset(); - //转盘速度 - sLDMotion.JOGRun(14000, 100000); - startTime = DateTime.Now; - } - public void Motion(List iODefinitions) - { - for (int i = 0; i < 16; i++) - { - iODefinitions.Add(new IODefinition - { - IOType = IOType.INPUT, - IOIndex = i, - IODesc = $"入料传感器{i + 1}" - }); - } - for (int i = 0; i < 16; i++) - { - iODefinitions.Add(new IODefinition - { - IOType = IOType.OUTPUT, - IOIndex = i, - IODesc = $"入料传感器{i + 1}" - }); - } - } -#endif - + private uint PieceCount = 0; private List> _productLists = new List>(); private int ProductListMulti = 2; @@ -1302,6 +900,14 @@ namespace DHSoftware product.ProductResult = product.ResultCollection.Any(u => u.ResultState != ResultState.OK) ? ResultState.B_NG : ResultState.OK; + if (product.ProductResult == ResultState.OK) + { + PLC.Blowing(productNumber, 1); + } + else + { + PLC.Blowing(productNumber, 2); + } product.ProductLabelCategory = product.ProductResult.GetEnumDescription(); product.ProductLabel = product.ProductResult.GetEnumDescription(); @@ -1402,9 +1008,9 @@ namespace DHSoftware Cameras.Clear(); Dectection.Clear(); // Add the code for the "停止" button click here - PLC.TurntableStop(); + PLC.TurnStart(false); CurrentMachine = true; - sLDMotion.Stop(); + //sLDMotion.Stop(); } public int UPH = 0; diff --git a/DHSoftware/Views/AddGlobalControl.Designer.cs b/DHSoftware/Views/AddGlobalControl.Designer.cs new file mode 100644 index 0000000..83b7108 --- /dev/null +++ b/DHSoftware/Views/AddGlobalControl.Designer.cs @@ -0,0 +1,162 @@ +namespace DHSoftware.Views +{ + partial class AddGlobalControl + { + /// + /// 必需的设计器变量。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 清理所有正在使用的资源。 + /// + /// 如果应释放托管资源，为 true；否则为 false。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region 组件设计器生成的代码 + + /// + /// 设计器支持所需的方法 - 不要修改 + /// 使用代码编辑器修改此方法的内容。 + /// + private void InitializeComponent() + { + panel1 = new AntdUI.Panel(); + input_name = new AntdUI.Input(); + label3 = new AntdUI.Label(); + divider1 = new AntdUI.Divider(); + stackPanel1 = new AntdUI.StackPanel(); + button_cancel = new AntdUI.Button(); + button_ok = new AntdUI.Button(); + divider2 = new AntdUI.Divider(); + lbTitleName = new AntdUI.Label(); + panel1.SuspendLayout(); + stackPanel1.SuspendLayout(); + SuspendLayout(); + // + // panel1 + // + panel1.Controls.Add(input_name); + panel1.Controls.Add(label3); + panel1.Controls.Add(divider1); + panel1.Controls.Add(stackPanel1); + panel1.Controls.Add(divider2); + panel1.Controls.Add(lbTitleName); + panel1.Dock = DockStyle.Fill; + panel1.Location = new Point(0, 0); + panel1.Name = "panel1"; + panel1.Padding = new Padding(12); + panel1.Shadow = 6; + panel1.Size = new Size(500, 192); + panel1.TabIndex = 0; + panel1.Text = "panel1"; + // + // input_name + // + input_name.Dock = DockStyle.Top; + input_name.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + input_name.Location = new Point(18, 134); + input_name.Name = "input_name"; + input_name.Radius = 3; + input_name.Size = new Size(464, 38); + input_name.TabIndex = 22; + // + // label3 + // + label3.Dock = DockStyle.Top; + label3.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); + label3.Location = new Point(18, 110); + label3.Name = "label3"; + label3.Size = new Size(464, 24); + label3.TabIndex = 21; + label3.Text = "全局配置名称"; + // + // divider1 + // + divider1.Dock = DockStyle.Top; + divider1.Location = new Point(18, 98); + divider1.Name = "divider1"; + divider1.Size = new Size(464, 12); + divider1.TabIndex = 20; + // + // stackPanel1 + // + stackPanel1.Controls.Add(button_cancel); + stackPanel1.Controls.Add(button_ok); + stackPanel1.Dock = DockStyle.Top; + stackPanel1.Location = new Point(18, 54); + stackPanel1.Name = "stackPanel1"; + stackPanel1.RightToLeft = RightToLeft.No; + stackPanel1.Size = new Size(464, 44); + stackPanel1.TabIndex = 19; + stackPanel1.Text = "stackPanel1"; + // + // button_cancel + // + button_cancel.BorderWidth = 1F; + button_cancel.Font = new Font("Microsoft YaHei UI", 9F); + button_cancel.Ghost = true; + button_cancel.Location = new Point(84, 3); + button_cancel.Name = "button_cancel"; + button_cancel.Size = new Size(75, 38); + button_cancel.TabIndex = 1; + button_cancel.Text = "取消"; + // + // button_ok + // + button_ok.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + button_ok.Location = new Point(3, 3); + button_ok.Name = "button_ok"; + button_ok.Size = new Size(75, 38); + button_ok.TabIndex = 0; + button_ok.Text = "确定"; + button_ok.Type = AntdUI.TTypeMini.Primary; + // + // divider2 + // + divider2.Dock = DockStyle.Top; + divider2.Location = new Point(18, 42); + divider2.Name = "divider2"; + divider2.Size = new Size(464, 12); + divider2.TabIndex = 18; + // + // lbTitleName + // + lbTitleName.Dock = DockStyle.Top; + lbTitleName.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); + lbTitleName.Location = new Point(18, 18); + lbTitleName.Name = "lbTitleName"; + lbTitleName.Size = new Size(464, 24); + lbTitleName.TabIndex = 17; + lbTitleName.Text = "新增全局配置操作"; + // + // AddGlobalControl + // + Controls.Add(panel1); + Name = "AddGlobalControl"; + Size = new Size(500, 192); + panel1.ResumeLayout(false); + stackPanel1.ResumeLayout(false); + ResumeLayout(false); + } + + #endregion + + private AntdUI.Panel panel1; + private AntdUI.Label lbTitleName; + private AntdUI.Input input_name; + private AntdUI.Label label3; + private AntdUI.Divider divider1; + private AntdUI.StackPanel stackPanel1; + private AntdUI.Button button_cancel; + private AntdUI.Button button_ok; + private AntdUI.Divider divider2; + } +} diff --git a/DHSoftware/Views/AddGlobalControl.cs b/DHSoftware/Views/AddGlobalControl.cs new file mode 100644 index 0000000..9d34c7b --- /dev/null +++ b/DHSoftware/Views/AddGlobalControl.cs @@ -0,0 +1,48 @@ + + +namespace DHSoftware.Views +{ + public partial class AddGlobalControl : UserControl + { + private AntdUI.Window window; + public bool submit; + public string GlobalName; + public AddGlobalControl(AntdUI.Window _window,string TitleName) + { + this.window = _window; + InitializeComponent(); + lbTitleName.Text = TitleName; + // 绑定事件 + BindEventHandler(); + } + + private void BindEventHandler() + { + button_ok.Click += Button_ok_Click; + button_cancel.Click += Button_cancel_Click; + } + + private void Button_cancel_Click(object sender, EventArgs e) + { + submit = false; + this.Dispose(); + } + + private void Button_ok_Click(object sender, EventArgs e) + { + input_name.Status = AntdUI.TType.None; + //检查输入内容 + if (String.IsNullOrEmpty(input_name.Text)) + { + input_name.Status = AntdUI.TType.Error; + AntdUI.Message.warn(window, "全局配置名称名称不能为空！", autoClose: 3); + return; + } + GlobalName = input_name.Text; + submit = true; + this.Dispose(); + } + + + } +} diff --git a/DHSoftware/Views/AddGlobalControl.resx b/DHSoftware/Views/AddGlobalControl.resx new file mode 100644 index 0000000..8b2ff64 --- /dev/null +++ b/DHSoftware/Views/AddGlobalControl.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/DHSoftware/Views/GlobalControl.Designer.cs b/DHSoftware/Views/GlobalControl.Designer.cs new file mode 100644 index 0000000..dff5110 --- /dev/null +++ b/DHSoftware/Views/GlobalControl.Designer.cs @@ -0,0 +1,425 @@ +namespace DHSoftware.Views +{ + partial class GlobalControl + { + /// + /// 必需的设计器变量。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 清理所有正在使用的资源。 + /// + /// 如果应释放托管资源，为 true；否则为 false。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region 组件设计器生成的代码 + + /// + /// 设计器支持所需的方法 - 不要修改 + /// 使用代码编辑器修改此方法的内容。 + /// + private void InitializeComponent() + { + AntdUI.Tabs.StyleLine styleLine1 = new AntdUI.Tabs.StyleLine(); + tabs1 = new AntdUI.Tabs(); + tabPage6 = new AntdUI.TabPage(); + tabPage1 = new AntdUI.TabPage(); + TableInitProcess = new AntdUI.Table(); + panel1 = new AntdUI.Panel(); + btnAdd = new AntdUI.Button(); + btnDelete = new AntdUI.Button(); + tabPage2 = new AntdUI.TabPage(); + TableSartProcess = new AntdUI.Table(); + panel2 = new AntdUI.Panel(); + btnSartProcessDelete = new AntdUI.Button(); + btnSartProcessAdd = new AntdUI.Button(); + tabPage3 = new AntdUI.TabPage(); + TableStopProcess = new AntdUI.Table(); + panel3 = new AntdUI.Panel(); + btnStopProcessDelete = new AntdUI.Button(); + btnStopProcessAdd = new AntdUI.Button(); + tabPage4 = new AntdUI.TabPage(); + TableStartReset = new AntdUI.Table(); + panel4 = new AntdUI.Panel(); + btnStartResetDelete = new AntdUI.Button(); + btnStartResetAdd = new AntdUI.Button(); + tabPage5 = new AntdUI.TabPage(); + TableStopReset = new AntdUI.Table(); + panel5 = new AntdUI.Panel(); + btnStopResetDelete = new AntdUI.Button(); + btnStopResetAdd = new AntdUI.Button(); + tabs1.SuspendLayout(); + tabPage1.SuspendLayout(); + panel1.SuspendLayout(); + tabPage2.SuspendLayout(); + panel2.SuspendLayout(); + tabPage3.SuspendLayout(); + panel3.SuspendLayout(); + tabPage4.SuspendLayout(); + panel4.SuspendLayout(); + tabPage5.SuspendLayout(); + panel5.SuspendLayout(); + SuspendLayout(); + // + // tabs1 + // + tabs1.Dock = DockStyle.Fill; + tabs1.Location = new Point(0, 0); + tabs1.Name = "tabs1"; + tabs1.Pages.Add(tabPage6); + tabs1.Pages.Add(tabPage1); + tabs1.Pages.Add(tabPage2); + tabs1.Pages.Add(tabPage3); + tabs1.Pages.Add(tabPage4); + tabs1.Pages.Add(tabPage5); + tabs1.Size = new Size(898, 530); + tabs1.Style = styleLine1; + tabs1.TabIndex = 26; + tabs1.Text = "tabs1"; + tabs1.SelectedIndex = 1; + // + // tabPage6 + // + tabPage6.Location = new Point(3, 28); + tabPage6.Name = "tabPage6"; + tabPage6.Size = new Size(892, 499); + tabPage6.TabIndex = 5; + tabPage6.Text = "全局配置"; + // + // tabPage1 + // + tabPage1.Controls.Add(TableInitProcess); + tabPage1.Controls.Add(panel1); + tabPage1.Location = new Point(-892, -499); + tabPage1.Name = "tabPage1"; + tabPage1.Size = new Size(892, 499); + tabPage1.TabIndex = 0; + tabPage1.Text = "流程加载操作"; + // + // TableInitProcess + // + TableInitProcess.Dock = DockStyle.Fill; + TableInitProcess.EmptyHeader = true; + TableInitProcess.Location = new Point(0, 45); + TableInitProcess.Name = "TableInitProcess"; + TableInitProcess.Padding = new Padding(5); + TableInitProcess.Size = new Size(892, 454); + TableInitProcess.TabIndex = 36; + // + // panel1 + // + panel1.Back = Color.Transparent; + panel1.BackColor = SystemColors.Window; + panel1.Controls.Add(btnAdd); + panel1.Controls.Add(btnDelete); + panel1.Dock = DockStyle.Top; + panel1.Location = new Point(0, 0); + panel1.Name = "panel1"; + panel1.Size = new Size(892, 45); + panel1.TabIndex = 35; + // + // btnAdd + // + btnAdd.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + btnAdd.Location = new Point(13, 10); + btnAdd.Name = "btnAdd"; + btnAdd.Size = new Size(82, 32); + btnAdd.TabIndex = 35; + btnAdd.Text = "新增"; + btnAdd.Type = AntdUI.TTypeMini.Primary; + btnAdd.WaveSize = 0; + // + // btnDelete + // + btnDelete.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + btnDelete.Location = new Point(110, 10); + btnDelete.Name = "btnDelete"; + btnDelete.Size = new Size(74, 32); + btnDelete.TabIndex = 36; + btnDelete.Text = "删除"; + btnDelete.Type = AntdUI.TTypeMini.Error; + btnDelete.WaveSize = 0; + // + // tabPage2 + // + tabPage2.Controls.Add(TableSartProcess); + tabPage2.Controls.Add(panel2); + tabPage2.Location = new Point(-669, -499); + tabPage2.Name = "tabPage2"; + tabPage2.Size = new Size(669, 499); + tabPage2.TabIndex = 1; + tabPage2.Text = "流程启动操作"; + // + // TableSartProcess + // + TableSartProcess.Dock = DockStyle.Fill; + TableSartProcess.EmptyHeader = true; + TableSartProcess.Location = new Point(0, 45); + TableSartProcess.Name = "TableSartProcess"; + TableSartProcess.Padding = new Padding(5); + TableSartProcess.Size = new Size(669, 454); + TableSartProcess.TabIndex = 38; + TableSartProcess.Text = "table1"; + // + // panel2 + // + panel2.Back = Color.Transparent; + panel2.BackColor = SystemColors.Window; + panel2.Controls.Add(btnSartProcessDelete); + panel2.Controls.Add(btnSartProcessAdd); + panel2.Dock = DockStyle.Top; + panel2.Location = new Point(0, 0); + panel2.Name = "panel2"; + panel2.Size = new Size(669, 45); + panel2.TabIndex = 37; + panel2.Text = "panel2"; + // + // btnSartProcessDelete + // + btnSartProcessDelete.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + btnSartProcessDelete.Location = new Point(110, 10); + btnSartProcessDelete.Name = "btnSartProcessDelete"; + btnSartProcessDelete.Size = new Size(74, 32); + btnSartProcessDelete.TabIndex = 36; + btnSartProcessDelete.Text = "删除"; + btnSartProcessDelete.Type = AntdUI.TTypeMini.Error; + btnSartProcessDelete.WaveSize = 0; + // + // btnSartProcessAdd + // + btnSartProcessAdd.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + btnSartProcessAdd.Location = new Point(13, 10); + btnSartProcessAdd.Name = "btnSartProcessAdd"; + btnSartProcessAdd.Size = new Size(82, 32); + btnSartProcessAdd.TabIndex = 35; + btnSartProcessAdd.Text = "新增"; + btnSartProcessAdd.Type = AntdUI.TTypeMini.Primary; + btnSartProcessAdd.WaveSize = 0; + // + // tabPage3 + // + tabPage3.Controls.Add(TableStopProcess); + tabPage3.Controls.Add(panel3); + tabPage3.Location = new Point(-669, -499); + tabPage3.Name = "tabPage3"; + tabPage3.Size = new Size(669, 499); + tabPage3.TabIndex = 2; + tabPage3.Text = "流程结束操作"; + // + // TableStopProcess + // + TableStopProcess.Dock = DockStyle.Fill; + TableStopProcess.EmptyHeader = true; + TableStopProcess.Location = new Point(0, 45); + TableStopProcess.Name = "TableStopProcess"; + TableStopProcess.Padding = new Padding(5); + TableStopProcess.Size = new Size(669, 454); + TableStopProcess.TabIndex = 38; + TableStopProcess.Text = "table1"; + // + // panel3 + // + panel3.Back = Color.Transparent; + panel3.BackColor = SystemColors.Window; + panel3.Controls.Add(btnStopProcessDelete); + panel3.Controls.Add(btnStopProcessAdd); + panel3.Dock = DockStyle.Top; + panel3.Location = new Point(0, 0); + panel3.Name = "panel3"; + panel3.Size = new Size(669, 45); + panel3.TabIndex = 37; + panel3.Text = "panel3"; + // + // btnStopProcessDelete + // + btnStopProcessDelete.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + btnStopProcessDelete.Location = new Point(110, 10); + btnStopProcessDelete.Name = "btnStopProcessDelete"; + btnStopProcessDelete.Size = new Size(74, 32); + btnStopProcessDelete.TabIndex = 36; + btnStopProcessDelete.Text = "删除"; + btnStopProcessDelete.Type = AntdUI.TTypeMini.Error; + btnStopProcessDelete.WaveSize = 0; + // + // btnStopProcessAdd + // + btnStopProcessAdd.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + btnStopProcessAdd.Location = new Point(13, 10); + btnStopProcessAdd.Name = "btnStopProcessAdd"; + btnStopProcessAdd.Size = new Size(82, 32); + btnStopProcessAdd.TabIndex = 35; + btnStopProcessAdd.Text = "新增"; + btnStopProcessAdd.Type = AntdUI.TTypeMini.Primary; + btnStopProcessAdd.WaveSize = 0; + // + // tabPage4 + // + tabPage4.Controls.Add(TableStartReset); + tabPage4.Controls.Add(panel4); + tabPage4.Location = new Point(-669, -499); + tabPage4.Name = "tabPage4"; + tabPage4.Size = new Size(669, 499); + tabPage4.TabIndex = 3; + tabPage4.Text = "复位开始操作"; + // + // TableStartReset + // + TableStartReset.Dock = DockStyle.Fill; + TableStartReset.EmptyHeader = true; + TableStartReset.Location = new Point(0, 45); + TableStartReset.Name = "TableStartReset"; + TableStartReset.Padding = new Padding(5); + TableStartReset.Size = new Size(669, 454); + TableStartReset.TabIndex = 38; + TableStartReset.Text = "table1"; + // + // panel4 + // + panel4.Back = Color.Transparent; + panel4.BackColor = SystemColors.Window; + panel4.Controls.Add(btnStartResetDelete); + panel4.Controls.Add(btnStartResetAdd); + panel4.Dock = DockStyle.Top; + panel4.Location = new Point(0, 0); + panel4.Name = "panel4"; + panel4.Size = new Size(669, 45); + panel4.TabIndex = 37; + panel4.Text = "panel4"; + // + // btnStartResetDelete + // + btnStartResetDelete.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + btnStartResetDelete.Location = new Point(110, 10); + btnStartResetDelete.Name = "btnStartResetDelete"; + btnStartResetDelete.Size = new Size(74, 32); + btnStartResetDelete.TabIndex = 36; + btnStartResetDelete.Text = "删除"; + btnStartResetDelete.Type = AntdUI.TTypeMini.Error; + btnStartResetDelete.WaveSize = 0; + // + // btnStartResetAdd + // + btnStartResetAdd.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + btnStartResetAdd.Location = new Point(13, 10); + btnStartResetAdd.Name = "btnStartResetAdd"; + btnStartResetAdd.Size = new Size(82, 32); + btnStartResetAdd.TabIndex = 35; + btnStartResetAdd.Text = "新增"; + btnStartResetAdd.Type = AntdUI.TTypeMini.Primary; + btnStartResetAdd.WaveSize = 0; + // + // tabPage5 + // + tabPage5.Controls.Add(TableStopReset); + tabPage5.Controls.Add(panel5); + tabPage5.Location = new Point(-669, -499); + tabPage5.Name = "tabPage5"; + tabPage5.Size = new Size(669, 499); + tabPage5.TabIndex = 4; + tabPage5.Text = "复位结束操作"; + // + // TableStopReset + // + TableStopReset.Dock = DockStyle.Fill; + TableStopReset.EmptyHeader = true; + TableStopReset.Location = new Point(0, 45); + TableStopReset.Name = "TableStopReset"; + TableStopReset.Padding = new Padding(5); + TableStopReset.Size = new Size(669, 454); + TableStopReset.TabIndex = 38; + TableStopReset.Text = "table1"; + // + // panel5 + // + panel5.Back = Color.Transparent; + panel5.BackColor = SystemColors.Window; + panel5.Controls.Add(btnStopResetDelete); + panel5.Controls.Add(btnStopResetAdd); + panel5.Dock = DockStyle.Top; + panel5.Location = new Point(0, 0); + panel5.Name = "panel5"; + panel5.Size = new Size(669, 45); + panel5.TabIndex = 37; + panel5.Text = "panel5"; + // + // btnStopResetDelete + // + btnStopResetDelete.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + btnStopResetDelete.Location = new Point(110, 10); + btnStopResetDelete.Name = "btnStopResetDelete"; + btnStopResetDelete.Size = new Size(74, 32); + btnStopResetDelete.TabIndex = 36; + btnStopResetDelete.Text = "删除"; + btnStopResetDelete.Type = AntdUI.TTypeMini.Error; + btnStopResetDelete.WaveSize = 0; + // + // btnStopResetAdd + // + btnStopResetAdd.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + btnStopResetAdd.Location = new Point(13, 10); + btnStopResetAdd.Name = "btnStopResetAdd"; + btnStopResetAdd.Size = new Size(82, 32); + btnStopResetAdd.TabIndex = 35; + btnStopResetAdd.Text = "新增"; + btnStopResetAdd.Type = AntdUI.TTypeMini.Primary; + btnStopResetAdd.WaveSize = 0; + // + // GlobalControl + // + AutoScaleDimensions = new SizeF(7F, 17F); + AutoScaleMode = AutoScaleMode.Font; + Controls.Add(tabs1); + Name = "GlobalControl"; + Size = new Size(898, 530); + tabs1.ResumeLayout(false); + tabPage1.ResumeLayout(false); + panel1.ResumeLayout(false); + tabPage2.ResumeLayout(false); + panel2.ResumeLayout(false); + tabPage3.ResumeLayout(false); + panel3.ResumeLayout(false); + tabPage4.ResumeLayout(false); + panel4.ResumeLayout(false); + tabPage5.ResumeLayout(false); + panel5.ResumeLayout(false); + ResumeLayout(false); + } + + #endregion + private AntdUI.Tabs tabs1; + private AntdUI.TabPage tabPage2; + private AntdUI.TabPage tabPage3; + private AntdUI.TabPage tabPage4; + private AntdUI.TabPage tabPage5; + private AntdUI.Table TableSartProcess; + private AntdUI.Panel panel2; + private AntdUI.Button btnSartProcessDelete; + private AntdUI.Button btnSartProcessAdd; + private AntdUI.Table TableStopProcess; + private AntdUI.Panel panel3; + private AntdUI.Button btnStopProcessDelete; + private AntdUI.Button btnStopProcessAdd; + private AntdUI.Table TableStartReset; + private AntdUI.Panel panel4; + private AntdUI.Button btnStartResetDelete; + private AntdUI.Button btnStartResetAdd; + private AntdUI.Table TableStopReset; + private AntdUI.Panel panel5; + private AntdUI.Button btnStopResetDelete; + private AntdUI.Button btnStopResetAdd; + private AntdUI.TabPage tabPage1; + private AntdUI.Table TableInitProcess; + private AntdUI.Panel panel1; + private AntdUI.Button btnAdd; + private AntdUI.Button btnDelete; + private AntdUI.TabPage tabPage6; + } +} diff --git a/DHSoftware/Views/GlobalControl.cs b/DHSoftware/Views/GlobalControl.cs new file mode 100644 index 0000000..aac402f --- /dev/null +++ b/DHSoftware/Views/GlobalControl.cs @@ -0,0 +1,819 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Diagnostics; +using System.Drawing; +using System.IO.Ports; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using AntdUI; +using DH.Commons.Base; +using DH.Commons.Enums; +using DH.Commons.Models; +using XKRS.CanFly; + +namespace DHSoftware.Views +{ + public partial class GlobalControl : UserControl + { + private Window window; + private GlobalConfig global; + public GlobalControl(Window _window, GlobalConfig _global) + { + window = _window; + global = _global; + InitializeComponent(); + BindEventHandler(); + InitData(); + + } + + private void BindEventHandler() + { + + btnAdd.Click += BtnAdd_Click; + btnDelete.Click += BtnDelete_Click; + TableInitProcess.CellButtonClick += ItemsTable_CellButtonClick; + + btnSartProcessAdd.Click += BtnSartProcessAdd_Click; + btnSartProcessDelete.Click += BtnSartProcessDelete_Click; + TableSartProcess.CellButtonClick += TableSartProcess_CellButtonClick; + + btnStopProcessAdd.Click += BtnStopProcessAdd_Click; + btnStopProcessDelete.Click += BtnStopProcessDelete_Click; + TableStopProcess.CellButtonClick += TableStopProcess_CellButtonClick; + + btnStartResetAdd.Click += BtnStartResetAdd_Click; + btnStartResetDelete.Click += BtnStartResetDelete_Click; + TableStartReset.CellButtonClick += TableStartReset_CellButtonClick; + + btnStopResetAdd.Click += BtnStopResetAdd_Click; + btnStopResetDelete.Click += BtnStopResetDelete_Click; + TableStopReset.CellButtonClick += TableStopReset_CellButtonClick; + } + + private void TableStopReset_CellButtonClick(object sender, TableButtonEventArgs e) + { + var buttontext = e.Btn.Text; + + if (e.Record is PLCItem Item) + { + switch (buttontext) + { + //暂不支持进入整行编辑，只支持指定单元格编辑，推荐使用弹窗或抽屉编辑整行数据 + case "编辑": + var form = new MotionProcessEdit(window, "复位结束表操作-编辑", Item, ConfigModel.PLCBaseList?.FirstOrDefault()?.PLCItemList) { Size = new Size(500, 300) }; + AntdUI.Drawer.open(new AntdUI.Drawer.Config(window, form) + { + OnLoad = () => + { + AntdUI.Message.info(window, "进入复位结束表编辑", autoClose: 1); + }, + OnClose = () => + { + AntdUI.Message.info(window, "退出复位结束表编辑", autoClose: 1); + } + }); + break; + + case "删除": + var result = Modal.open(window, "删除警告！", "确认要删除选择的数据吗？", TType.Warn); + if (result == DialogResult.OK) + { + global.StopResetList.Remove(Item); + } + break; + + case "上移": + if (e.RowIndex <= 1) + { + AntdUI.Message.warn(window, "已是第一条，无法上移！", autoClose: 3); + return; + } + MoveItemUp(global.StopResetList, Item); + break; + + case "下移": + if (e.RowIndex > global.StopResetList.Count - 1) + { + AntdUI.Message.warn(window, "已是最后一条，无法下移！", autoClose: 3); + return; + } + MoveItemDown(global.StopResetList, Item); + break; + } + } + } + + private void BtnStopResetDelete_Click(object? sender, EventArgs e) + { + if (global.StopResetList.Count == 0 || !global.StopResetList.Any(x => x.Selected)) + { + AntdUI.Message.warn(window, "请选择要删除的行！", autoClose: 3); + return; + } + + var result = Modal.open(window, "删除警告！", "确认要删除选择的数据吗？", TType.Warn); + if (result == DialogResult.OK) + { + // 使用反转for循环删除主列表中选中的项 + for (int i = global.StopResetList.Count - 1; i >= 0; i--) + { + // 删除选中的主列表项 + if (global.StopResetList[i].Selected) + { + global.StopResetList.RemoveAt(i); + } + } + // 提示删除完成 + AntdUI.Message.success(window, "删除成功！", autoClose: 3); + } + } + + private void BtnStopResetAdd_Click(object? sender, EventArgs e) + { + if (ConfigModel.PLCBaseList?.FirstOrDefault()?.PLCItemList.Count == 0) + { + AntdUI.Message.warn(window, "点位表无数据，不允许新增！", autoClose: 3); + return; + } + + PLCItem Item = new PLCItem() + { + StartIndex = global.StopResetList.Count + 1, + CellLinks = new CellLink[] + { + new CellButton(Guid.NewGuid().ToString(), "上移", TTypeMini.Default), + new CellButton(Guid.NewGuid().ToString(), "下移", TTypeMini.Default), + new CellButton(Guid.NewGuid().ToString(), "编辑", TTypeMini.Primary), + new CellButton(Guid.NewGuid().ToString(), "删除", TTypeMini.Error) + } + }; + + var form = new MotionProcessEdit(window, "复位结束表操作-新增", Item, ConfigModel.PLCBaseList?.FirstOrDefault()?.PLCItemList) { Size = new Size(450, 550) }; + + AntdUI.Drawer.open(new AntdUI.Drawer.Config(window, form) + { + OnLoad = () => + { + AntdUI.Message.info(window, "进入复位结束表新增", autoClose: 1); + }, + OnClose = () => + { + if (form.submit) + { + global.StopResetList.Add(Item); + } + + AntdUI.Message.info(window, "退出复位结束表新增", autoClose: 1); + } + }); + } + + private void TableStartReset_CellButtonClick(object sender, TableButtonEventArgs e) + { + var buttontext = e.Btn.Text; + + if (e.Record is PLCItem Item) + { + switch (buttontext) + { + //暂不支持进入整行编辑，只支持指定单元格编辑，推荐使用弹窗或抽屉编辑整行数据 + case "编辑": + var form = new MotionProcessEdit(window, "复位开始表操作-编辑", Item, ConfigModel.PLCBaseList?.FirstOrDefault()?.PLCItemList) { Size = new Size(500, 300) }; + AntdUI.Drawer.open(new AntdUI.Drawer.Config(window, form) + { + OnLoad = () => + { + AntdUI.Message.info(window, "进入复位开始表编辑", autoClose: 1); + }, + OnClose = () => + { + AntdUI.Message.info(window, "退出复位开始表编辑", autoClose: 1); + } + }); + break; + + case "删除": + var result = Modal.open(window, "删除警告！", "确认要删除选择的数据吗？", TType.Warn); + if (result == DialogResult.OK) + { + global.StartResetList.Remove(Item); + } + break; + + case "上移": + if (e.RowIndex <= 1) + { + AntdUI.Message.warn(window, "已是第一条，无法上移！", autoClose: 3); + return; + } + MoveItemUp(global.StartResetList, Item); + break; + + case "下移": + if (e.RowIndex > global.StartResetList.Count - 1) + { + AntdUI.Message.warn(window, "已是最后一条，无法下移！", autoClose: 3); + return; + } + MoveItemDown(global.StartResetList, Item); + break; + } + } + } + + private void BtnStartResetDelete_Click(object? sender, EventArgs e) + { + if (global.StartResetList.Count == 0 || !global.StartResetList.Any(x => x.Selected)) + { + AntdUI.Message.warn(window, "请选择要删除的行！", autoClose: 3); + return; + } + + var result = Modal.open(window, "删除警告！", "确认要删除选择的数据吗？", TType.Warn); + if (result == DialogResult.OK) + { + // 使用反转for循环删除主列表中选中的项 + for (int i = global.StartResetList.Count - 1; i >= 0; i--) + { + // 删除选中的主列表项 + if (global.StartResetList[i].Selected) + { + global.StartResetList.RemoveAt(i); + } + } + // 提示删除完成 + AntdUI.Message.success(window, "删除成功！", autoClose: 3); + } + } + + private void BtnStartResetAdd_Click(object? sender, EventArgs e) + { + if (ConfigModel.PLCBaseList?.FirstOrDefault()?.PLCItemList.Count == 0) + { + AntdUI.Message.warn(window, "点位表无数据，不允许新增！", autoClose: 3); + return; + } + + + PLCItem Item = new PLCItem() + { + StartIndex = global.StartResetList.Count + 1, + CellLinks = new CellLink[] + { + new CellButton(Guid.NewGuid().ToString(), "上移", TTypeMini.Default), + new CellButton(Guid.NewGuid().ToString(), "下移", TTypeMini.Default), + new CellButton(Guid.NewGuid().ToString(), "编辑", TTypeMini.Primary), + new CellButton(Guid.NewGuid().ToString(), "删除", TTypeMini.Error) + } + }; + + var form = new MotionProcessEdit(window, "复位开始表操作-新增", Item, ConfigModel.PLCBaseList?.FirstOrDefault()?.PLCItemList) { Size = new Size(450, 550) }; + + AntdUI.Drawer.open(new AntdUI.Drawer.Config(window, form) + { + OnLoad = () => + { + AntdUI.Message.info(window, "进入复位开始表新增", autoClose: 1); + }, + OnClose = () => + { + if (form.submit) + { + global.StartResetList.Add(Item); + } + + AntdUI.Message.info(window, "退出复位开始表新增", autoClose: 1); + } + }); + } + + private void TableStopProcess_CellButtonClick(object sender, TableButtonEventArgs e) + { + var buttontext = e.Btn.Text; + + if (e.Record is PLCItem Item) + { + switch (buttontext) + { + //暂不支持进入整行编辑，只支持指定单元格编辑，推荐使用弹窗或抽屉编辑整行数据 + case "编辑": + var form = new MotionProcessEdit(window, "流程结束表操作-编辑", Item, ConfigModel.PLCBaseList?.FirstOrDefault()?.PLCItemList) { Size = new Size(500, 300) }; + AntdUI.Drawer.open(new AntdUI.Drawer.Config(window, form) + { + OnLoad = () => + { + AntdUI.Message.info(window, "进入流程结束表编辑", autoClose: 1); + }, + OnClose = () => + { + AntdUI.Message.info(window, "退出流程结束表编辑", autoClose: 1); + } + }); + break; + + case "删除": + var result = Modal.open(window, "删除警告！", "确认要删除选择的数据吗？", TType.Warn); + if (result == DialogResult.OK) + { + global.StopProcessList.Remove(Item); + } + break; + + case "上移": + if (e.RowIndex <= 1) + { + AntdUI.Message.warn(window, "已是第一条，无法上移！", autoClose: 3); + return; + } + MoveItemUp(global.StopProcessList, Item); + break; + + case "下移": + if (e.RowIndex > global.StopProcessList.Count - 1) + { + AntdUI.Message.warn(window, "已是最后一条，无法下移！", autoClose: 3); + return; + } + MoveItemDown(global.StopProcessList, Item); + break; + } + } + } + + private void BtnStopProcessDelete_Click(object? sender, EventArgs e) + { + if (global.StopProcessList.Count == 0 || !global.StopProcessList.Any(x => x.Selected)) + { + AntdUI.Message.warn(window, "请选择要删除的行！", autoClose: 3); + return; + } + + var result = Modal.open(window, "删除警告！", "确认要删除选择的数据吗？", TType.Warn); + if (result == DialogResult.OK) + { + // 使用反转for循环删除主列表中选中的项 + for (int i = global.StopProcessList.Count - 1; i >= 0; i--) + { + // 删除选中的主列表项 + if (global.StopProcessList[i].Selected) + { + global.StopProcessList.RemoveAt(i); + } + } + // 提示删除完成 + AntdUI.Message.success(window, "删除成功！", autoClose: 3); + } + } + + private void BtnStopProcessAdd_Click(object? sender, EventArgs e) + { + if (ConfigModel.PLCBaseList?.FirstOrDefault()?.PLCItemList.Count == 0) + { + AntdUI.Message.warn(window, "点位表无数据，不允许新增！", autoClose: 3); + return; + } + + + PLCItem Item = new PLCItem() + { + StartIndex = global.StopProcessList.Count + 1, + CellLinks = new CellLink[] + { + new CellButton(Guid.NewGuid().ToString(), "上移", TTypeMini.Default), + new CellButton(Guid.NewGuid().ToString(), "下移", TTypeMini.Default), + new CellButton(Guid.NewGuid().ToString(), "编辑", TTypeMini.Primary), + new CellButton(Guid.NewGuid().ToString(), "删除", TTypeMini.Error) + } + }; + + var form = new MotionProcessEdit(window, "流程结束表操作-新增", Item, ConfigModel.PLCBaseList?.FirstOrDefault()?.PLCItemList) { Size = new Size(450, 550) }; + + AntdUI.Drawer.open(new AntdUI.Drawer.Config(window, form) + { + OnLoad = () => + { + AntdUI.Message.info(window, "进入流程结束表新增", autoClose: 1); + }, + OnClose = () => + { + if (form.submit) + { + global.StopProcessList.Add(Item); + } + + AntdUI.Message.info(window, "退出流程结束表新增", autoClose: 1); + } + }); + } + + private void TableSartProcess_CellButtonClick(object sender, TableButtonEventArgs e) + { + var buttontext = e.Btn.Text; + + if (e.Record is PLCItem Item) + { + switch (buttontext) + { + //暂不支持进入整行编辑，只支持指定单元格编辑，推荐使用弹窗或抽屉编辑整行数据 + case "编辑": + var form = new MotionProcessEdit(window, "流程开始表操作-编辑", Item, ConfigModel.PLCBaseList?.FirstOrDefault()?.PLCItemList) { Size = new Size(500, 300) }; + AntdUI.Drawer.open(new AntdUI.Drawer.Config(window, form) + { + OnLoad = () => + { + AntdUI.Message.info(window, "进入流程开始表编辑", autoClose: 1); + }, + OnClose = () => + { + AntdUI.Message.info(window, "退出流程开始表编辑", autoClose: 1); + } + }); + break; + + case "删除": + var result = Modal.open(window, "删除警告！", "确认要删除选择的数据吗？", TType.Warn); + if (result == DialogResult.OK) + { + global.StartProcessList.Remove(Item); + } + break; + + case "上移": + if (e.RowIndex <= 1) + { + AntdUI.Message.warn(window, "已是第一条，无法上移！", autoClose: 3); + return; + } + MoveItemUp(global.StartProcessList, Item); + break; + + case "下移": + if (e.RowIndex > global.StartProcessList.Count - 1) + { + AntdUI.Message.warn(window, "已是最后一条，无法下移！", autoClose: 3); + return; + } + MoveItemDown(global.StartProcessList, Item); + break; + } + } + } + + private void BtnSartProcessDelete_Click(object? sender, EventArgs e) + { + if (global.StartProcessList.Count == 0 || !global.StartProcessList.Any(x => x.Selected)) + { + AntdUI.Message.warn(window, "请选择要删除的行！", autoClose: 3); + return; + } + + var result = Modal.open(window, "删除警告！", "确认要删除选择的数据吗？", TType.Warn); + if (result == DialogResult.OK) + { + // 使用反转for循环删除主列表中选中的项 + for (int i = global.StartProcessList.Count - 1; i >= 0; i--) + { + // 删除选中的主列表项 + if (global.StartProcessList[i].Selected) + { + global.StartProcessList.RemoveAt(i); + } + } + // 提示删除完成 + AntdUI.Message.success(window, "删除成功！", autoClose: 3); + } + } + + private void BtnSartProcessAdd_Click(object? sender, EventArgs e) + { + if (ConfigModel.PLCBaseList?.FirstOrDefault()?.PLCItemList.Count == 0) + { + AntdUI.Message.warn(window, "点位表无数据，不允许新增！", autoClose: 3); + return; + } + + + PLCItem Item = new PLCItem() + { + StartIndex = global.StartProcessList.Count + 1, + CellLinks = new CellLink[] + { + new CellButton(Guid.NewGuid().ToString(), "上移", TTypeMini.Default), + new CellButton(Guid.NewGuid().ToString(), "下移", TTypeMini.Default), + new CellButton(Guid.NewGuid().ToString(), "编辑", TTypeMini.Primary), + new CellButton(Guid.NewGuid().ToString(), "删除", TTypeMini.Error) + } + }; + + var form = new MotionProcessEdit(window, "流程开始表操作-新增", Item, ConfigModel.PLCBaseList?.FirstOrDefault()?.PLCItemList) { Size = new Size(450, 550) }; + + AntdUI.Drawer.open(new AntdUI.Drawer.Config(window, form) + { + OnLoad = () => + { + AntdUI.Message.info(window, "进入流程开始表新增", autoClose: 1); + }, + OnClose = () => + { + if (form.submit) + { + global.StartProcessList.Add(Item); + } + + AntdUI.Message.info(window, "退出流程开始表新增", autoClose: 1); + } + }); + } + + private void ItemsTable_CellButtonClick(object sender, TableButtonEventArgs e) + { + var buttontext = e.Btn.Text; + + if (e.Record is PLCItem Item) + { + switch (buttontext) + { + //暂不支持进入整行编辑，只支持指定单元格编辑，推荐使用弹窗或抽屉编辑整行数据 + case "编辑": + var form = new MotionProcessEdit(window, "流程加载表操作-编辑", Item, ConfigModel.PLCBaseList?.FirstOrDefault()?.PLCItemList) { Size = new Size(500, 300) }; + AntdUI.Drawer.open(new AntdUI.Drawer.Config(window, form) + { + OnLoad = () => + { + AntdUI.Message.info(window, "进入流程加载表编辑", autoClose: 1); + }, + OnClose = () => + { + AntdUI.Message.info(window, "退出流程加载表编辑", autoClose: 1); + } + }); + break; + + case "删除": + var result = Modal.open(window, "删除警告！", "确认要删除选择的数据吗？", TType.Warn); + if (result == DialogResult.OK) + { + global.InitProcessList.Remove(Item); + } + break; + + case "上移": + if (e.RowIndex <= 1) + { + AntdUI.Message.warn(window, "已是第一条，无法上移！", autoClose: 3); + return; + } + MoveItemUp(global.InitProcessList, Item); + break; + + case "下移": + if (e.RowIndex > global.InitProcessList.Count - 1) + { + AntdUI.Message.warn(window, "已是最后一条，无法下移！", autoClose: 3); + return; + } + MoveItemDown(global.InitProcessList, Item); + break; + } + } + } + + // 上移项 + public static void MoveItemUp(BindingList list, PLCItem item) + { + int index = list.IndexOf(item); + if (index > 0) + { + // 移除并插入到前一位 + list.RemoveAt(index); + list.Insert(index - 1, item); + UpdateStartIndexes(list); // 更新序号 + } + } + + // 下移项 + public static void MoveItemDown(BindingList list, PLCItem item) + { + int index = list.IndexOf(item); + if (index < list.Count - 1) + { + // 移除并插入到后一位 + list.RemoveAt(index); + list.Insert(index + 1, item); + UpdateStartIndexes(list); // 更新序号 + } + } + + // 更新所有项的序号 + public static void UpdateStartIndexes(BindingList list) + { + for (int i = 0; i < list.Count; i++) + { + PLCItem item = list[i]; + if (item.StartIndex != i + 1) + { + item.StartIndex = i + 1; // 触发 PropertyChanged 事件 + } + } + } + + private void BtnDelete_Click(object? sender, EventArgs e) + { + if (global.InitProcessList.Count == 0 || !global.InitProcessList.Any(x => x.Selected)) + { + AntdUI.Message.warn(window, "请选择要删除的行！", autoClose: 3); + return; + } + + var result = Modal.open(window, "删除警告！", "确认要删除选择的数据吗？", TType.Warn); + if (result == DialogResult.OK) + { + // 使用反转for循环删除主列表中选中的项 + for (int i = global.InitProcessList.Count - 1; i >= 0; i--) + { + // 删除选中的主列表项 + if (global.InitProcessList[i].Selected) + { + global.InitProcessList.RemoveAt(i); + } + } + // 提示删除完成 + AntdUI.Message.success(window, "删除成功！", autoClose: 3); + } + } + + private void BtnAdd_Click(object? sender, EventArgs e) + { + if (ConfigModel.PLCBaseList?.FirstOrDefault()?.PLCItemList.Count == 0) + { + AntdUI.Message.warn(window, "点位表无数据，不允许新增！", autoClose: 3); + return; + } + + + PLCItem Item = new PLCItem() + { + StartIndex = global.InitProcessList.Count + 1, + CellLinks = new CellLink[] + { new CellButton(Guid.NewGuid().ToString(), "上移", TTypeMini.Default), + new CellButton(Guid.NewGuid().ToString(), "下移", TTypeMini.Default), + new CellButton(Guid.NewGuid().ToString(), "编辑", TTypeMini.Primary), + new CellButton(Guid.NewGuid().ToString(), "删除", TTypeMini.Error) + } + }; + + var form = new MotionProcessEdit(window, "流程加载表操作-新增", Item, ConfigModel.PLCBaseList?.FirstOrDefault()?.PLCItemList) { Size = new Size(450, 550) }; + + AntdUI.Drawer.open(new AntdUI.Drawer.Config(window, form) + { + OnLoad = () => + { + AntdUI.Message.info(window, "进入流程加载表新增", autoClose: 1); + }, + OnClose = () => + { + if (form.submit) + { + global.InitProcessList.Add(Item); + } + + AntdUI.Message.info(window, "退出流程加载表新增", autoClose: 1); + } + }); + } + + + private void InitData() + { + + + + TableInitProcess.Columns = new ColumnCollection() { + new ColumnCheck("Selected"){Fixed = true}, + new Column("StartIndex", "序号", ColumnAlign.Center), + new ColumnSwitch("StartExecute", "启用", ColumnAlign.Center), + new Column("Name", "名称", ColumnAlign.Center), + new Column("Type", "类型",ColumnAlign.Center){Visible=false}, + new Column("Address", "地址",ColumnAlign.Center){Visible=false}, + new Column("Value", "值",ColumnAlign.Center), + new Column("CellLinks", "操作", ColumnAlign.Center) + }; + if (global.InitProcessList.Count > 0) + { + foreach (var item in global.InitProcessList) + { + item.CellLinks = new CellLink[] { + new CellButton(Guid.NewGuid().ToString(), "上移", TTypeMini.Default), + new CellButton(Guid.NewGuid().ToString(), "下移", TTypeMini.Default), + new CellButton(Guid.NewGuid().ToString(), "编辑", TTypeMini.Primary) , + new CellButton(Guid.NewGuid().ToString(), "删除", TTypeMini.Error) + }; + } + } + TableInitProcess.Binding(global.InitProcessList); + + TableSartProcess.Columns = new ColumnCollection() { + new ColumnCheck("Selected"){Fixed = true}, + new Column("StartIndex", "序号", ColumnAlign.Center), + new ColumnSwitch("StartExecute", "启用", ColumnAlign.Center), + new Column("Name", "名称", ColumnAlign.Center), + new Column("Type", "类型",ColumnAlign.Center){Visible=false}, + new Column("Address", "地址",ColumnAlign.Center){Visible=false}, + new Column("Value", "值",ColumnAlign.Center), + new Column("CellLinks", "操作", ColumnAlign.Center) + }; + if (global.StartProcessList.Count > 0) + { + foreach (var item in global.StartProcessList) + { + item.CellLinks = new CellLink[] { + new CellButton(Guid.NewGuid().ToString(), "上移", TTypeMini.Default), + new CellButton(Guid.NewGuid().ToString(), "下移", TTypeMini.Default), + new CellButton(Guid.NewGuid().ToString(), "编辑", TTypeMini.Primary) , + new CellButton(Guid.NewGuid().ToString(), "删除", TTypeMini.Error) + }; + } + } + //TableSartProcess.Binding(global.StartProcessList); + TableSartProcess.Binding(global.StartProcessList); + TableStopProcess.Columns = new ColumnCollection() { + new ColumnCheck("Selected"){Fixed = true}, + new Column("StartIndex", "序号", ColumnAlign.Center), + new ColumnSwitch("StartExecute", "启用", ColumnAlign.Center), + new Column("Name", "名称", ColumnAlign.Center), + new Column("Type", "类型",ColumnAlign.Center){Visible=false}, + new Column("Address", "地址",ColumnAlign.Center){Visible=false}, + new Column("Value", "值",ColumnAlign.Center), + new Column("CellLinks", "操作", ColumnAlign.Center) + }; + if (global.StopProcessList.Count > 0) + { + foreach (var item in global.StopProcessList) + { + item.CellLinks = new CellLink[] { + new CellButton(Guid.NewGuid().ToString(), "上移", TTypeMini.Default), + new CellButton(Guid.NewGuid().ToString(), "下移", TTypeMini.Default), + new CellButton(Guid.NewGuid().ToString(), "编辑", TTypeMini.Primary) , + new CellButton(Guid.NewGuid().ToString(), "删除", TTypeMini.Error) + }; + } + } + TableStopProcess.Binding(global.StopProcessList); + + TableStartReset.Columns = new ColumnCollection() { + new ColumnCheck("Selected"){Fixed = true}, + new Column("StartIndex", "序号", ColumnAlign.Center), + new ColumnSwitch("StartExecute", "启用", ColumnAlign.Center), + new Column("Name", "名称", ColumnAlign.Center), + new Column("Type", "类型",ColumnAlign.Center){Visible=false}, + new Column("Address", "地址",ColumnAlign.Center){Visible=false}, + new Column("Value", "值",ColumnAlign.Center), + new Column("CellLinks", "操作", ColumnAlign.Center) + }; + if (global.StartResetList.Count > 0) + { + foreach (var item in global.StartResetList) + { + item.CellLinks = new CellLink[] { + new CellButton(Guid.NewGuid().ToString(), "上移", TTypeMini.Default), + new CellButton(Guid.NewGuid().ToString(), "下移", TTypeMini.Default), + new CellButton(Guid.NewGuid().ToString(), "编辑", TTypeMini.Primary) , + new CellButton(Guid.NewGuid().ToString(), "删除", TTypeMini.Error) + }; + } + } + TableStartReset.Binding(global.StartResetList); + + TableStopReset.Columns = new ColumnCollection() { + new ColumnCheck("Selected"){Fixed = true}, + new Column("StartIndex", "序号", ColumnAlign.Center), + new ColumnSwitch("StartExecute", "启用", ColumnAlign.Center), + new Column("Name", "名称", ColumnAlign.Center), + new Column("Type", "类型",ColumnAlign.Center){Visible=false}, + new Column("Address", "地址",ColumnAlign.Center){Visible=false}, + new Column("Value", "值",ColumnAlign.Center), + new Column("CellLinks", "操作", ColumnAlign.Center) + }; + if (global.StopResetList.Count > 0) + { + foreach (var item in global.StopResetList) + { + item.CellLinks = new CellLink[] { + new CellButton(Guid.NewGuid().ToString(), "上移", TTypeMini.Default), + new CellButton(Guid.NewGuid().ToString(), "下移", TTypeMini.Default), + new CellButton(Guid.NewGuid().ToString(), "编辑", TTypeMini.Primary) , + new CellButton(Guid.NewGuid().ToString(), "删除", TTypeMini.Error) + }; + } + } + TableStopReset.Binding(global.StopResetList); + } + + + } +} \ No newline at end of file diff --git a/DHSoftware/Views/GlobalControl.resx b/DHSoftware/Views/GlobalControl.resx new file mode 100644 index 0000000..8b2ff64 --- /dev/null +++ b/DHSoftware/Views/GlobalControl.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/DHSoftware/Views/MotionControl.Designer.cs b/DHSoftware/Views/MotionControl.Designer.cs index e0285f0..dbde12b 100644 --- a/DHSoftware/Views/MotionControl.Designer.cs +++ b/DHSoftware/Views/MotionControl.Designer.cs @@ -63,26 +63,6 @@ panel1 = new AntdUI.Panel(); btnDelete = new AntdUI.Button(); btnAdd = new AntdUI.Button(); - tabPage2 = new AntdUI.TabPage(); - TableSartProcess = new AntdUI.Table(); - panel2 = new AntdUI.Panel(); - btnSartProcessDelete = new AntdUI.Button(); - btnSartProcessAdd = new AntdUI.Button(); - tabPage3 = new AntdUI.TabPage(); - TableStopProcess = new AntdUI.Table(); - panel3 = new AntdUI.Panel(); - btnStopProcessDelete = new AntdUI.Button(); - btnStopProcessAdd = new AntdUI.Button(); - tabPage4 = new AntdUI.TabPage(); - TableStartReset = new AntdUI.Table(); - panel4 = new AntdUI.Panel(); - btnStartResetDelete = new AntdUI.Button(); - btnStartResetAdd = new AntdUI.Button(); - tabPage5 = new AntdUI.TabPage(); - TableStopReset = new AntdUI.Table(); - panel5 = new AntdUI.Panel(); - btnStopResetDelete = new AntdUI.Button(); - btnStopResetAdd = new AntdUI.Button(); stackPanel2.SuspendLayout(); stackPanel3.SuspendLayout(); stpCom.SuspendLayout(); @@ -96,14 +76,6 @@ tabs1.SuspendLayout(); tabPage1.SuspendLayout(); panel1.SuspendLayout(); - tabPage2.SuspendLayout(); - panel2.SuspendLayout(); - tabPage3.SuspendLayout(); - panel3.SuspendLayout(); - tabPage4.SuspendLayout(); - panel4.SuspendLayout(); - tabPage5.SuspendLayout(); - panel5.SuspendLayout(); SuspendLayout(); // // stackPanel2 @@ -373,15 +345,10 @@ tabs1.Location = new Point(223, 0); tabs1.Name = "tabs1"; tabs1.Pages.Add(tabPage1); - tabs1.Pages.Add(tabPage2); - tabs1.Pages.Add(tabPage3); - tabs1.Pages.Add(tabPage4); - tabs1.Pages.Add(tabPage5); tabs1.Size = new Size(675, 530); tabs1.Style = styleLine1; tabs1.TabIndex = 26; tabs1.Text = "tabs1"; - tabs1.SelectedIndex = 0; // // tabPage1 // @@ -439,230 +406,6 @@ btnAdd.Type = AntdUI.TTypeMini.Primary; btnAdd.WaveSize = 0; // - // tabPage2 - // - tabPage2.Controls.Add(TableSartProcess); - tabPage2.Controls.Add(panel2); - tabPage2.Location = new Point(-669, -499); - tabPage2.Name = "tabPage2"; - tabPage2.Size = new Size(669, 499); - tabPage2.TabIndex = 1; - tabPage2.Text = "流程启动表"; - // - // TableSartProcess - // - TableSartProcess.Dock = DockStyle.Fill; - TableSartProcess.EmptyHeader = true; - TableSartProcess.Location = new Point(0, 45); - TableSartProcess.Name = "TableSartProcess"; - TableSartProcess.Padding = new Padding(5); - TableSartProcess.Size = new Size(669, 454); - TableSartProcess.TabIndex = 38; - TableSartProcess.Text = "table1"; - // - // panel2 - // - panel2.Back = Color.Transparent; - panel2.BackColor = SystemColors.Window; - panel2.Controls.Add(btnSartProcessDelete); - panel2.Controls.Add(btnSartProcessAdd); - panel2.Dock = DockStyle.Top; - panel2.Location = new Point(0, 0); - panel2.Name = "panel2"; - panel2.Size = new Size(669, 45); - panel2.TabIndex = 37; - panel2.Text = "panel2"; - // - // btnSartProcessDelete - // - btnSartProcessDelete.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); - btnSartProcessDelete.Location = new Point(110, 10); - btnSartProcessDelete.Name = "btnSartProcessDelete"; - btnSartProcessDelete.Size = new Size(74, 32); - btnSartProcessDelete.TabIndex = 36; - btnSartProcessDelete.Text = "删除"; - btnSartProcessDelete.Type = AntdUI.TTypeMini.Error; - btnSartProcessDelete.WaveSize = 0; - // - // btnSartProcessAdd - // - btnSartProcessAdd.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); - btnSartProcessAdd.Location = new Point(13, 10); - btnSartProcessAdd.Name = "btnSartProcessAdd"; - btnSartProcessAdd.Size = new Size(82, 32); - btnSartProcessAdd.TabIndex = 35; - btnSartProcessAdd.Text = "新增"; - btnSartProcessAdd.Type = AntdUI.TTypeMini.Primary; - btnSartProcessAdd.WaveSize = 0; - // - // tabPage3 - // - tabPage3.Controls.Add(TableStopProcess); - tabPage3.Controls.Add(panel3); - tabPage3.Location = new Point(-669, -499); - tabPage3.Name = "tabPage3"; - tabPage3.Size = new Size(669, 499); - tabPage3.TabIndex = 2; - tabPage3.Text = "流程结束表"; - // - // TableStopProcess - // - TableStopProcess.Dock = DockStyle.Fill; - TableStopProcess.EmptyHeader = true; - TableStopProcess.Location = new Point(0, 45); - TableStopProcess.Name = "TableStopProcess"; - TableStopProcess.Padding = new Padding(5); - TableStopProcess.Size = new Size(669, 454); - TableStopProcess.TabIndex = 38; - TableStopProcess.Text = "table1"; - // - // panel3 - // - panel3.Back = Color.Transparent; - panel3.BackColor = SystemColors.Window; - panel3.Controls.Add(btnStopProcessDelete); - panel3.Controls.Add(btnStopProcessAdd); - panel3.Dock = DockStyle.Top; - panel3.Location = new Point(0, 0); - panel3.Name = "panel3"; - panel3.Size = new Size(669, 45); - panel3.TabIndex = 37; - panel3.Text = "panel3"; - // - // btnStopProcessDelete - // - btnStopProcessDelete.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); - btnStopProcessDelete.Location = new Point(110, 10); - btnStopProcessDelete.Name = "btnStopProcessDelete"; - btnStopProcessDelete.Size = new Size(74, 32); - btnStopProcessDelete.TabIndex = 36; - btnStopProcessDelete.Text = "删除"; - btnStopProcessDelete.Type = AntdUI.TTypeMini.Error; - btnStopProcessDelete.WaveSize = 0; - // - // btnStopProcessAdd - // - btnStopProcessAdd.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); - btnStopProcessAdd.Location = new Point(13, 10); - btnStopProcessAdd.Name = "btnStopProcessAdd"; - btnStopProcessAdd.Size = new Size(82, 32); - btnStopProcessAdd.TabIndex = 35; - btnStopProcessAdd.Text = "新增"; - btnStopProcessAdd.Type = AntdUI.TTypeMini.Primary; - btnStopProcessAdd.WaveSize = 0; - // - // tabPage4 - // - tabPage4.Controls.Add(TableStartReset); - tabPage4.Controls.Add(panel4); - tabPage4.Location = new Point(-669, -499); - tabPage4.Name = "tabPage4"; - tabPage4.Size = new Size(669, 499); - tabPage4.TabIndex = 3; - tabPage4.Text = "复位开始表"; - // - // TableStartReset - // - TableStartReset.Dock = DockStyle.Fill; - TableStartReset.EmptyHeader = true; - TableStartReset.Location = new Point(0, 45); - TableStartReset.Name = "TableStartReset"; - TableStartReset.Padding = new Padding(5); - TableStartReset.Size = new Size(669, 454); - TableStartReset.TabIndex = 38; - TableStartReset.Text = "table1"; - // - // panel4 - // - panel4.Back = Color.Transparent; - panel4.BackColor = SystemColors.Window; - panel4.Controls.Add(btnStartResetDelete); - panel4.Controls.Add(btnStartResetAdd); - panel4.Dock = DockStyle.Top; - panel4.Location = new Point(0, 0); - panel4.Name = "panel4"; - panel4.Size = new Size(669, 45); - panel4.TabIndex = 37; - panel4.Text = "panel4"; - // - // btnStartResetDelete - // - btnStartResetDelete.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); - btnStartResetDelete.Location = new Point(110, 10); - btnStartResetDelete.Name = "btnStartResetDelete"; - btnStartResetDelete.Size = new Size(74, 32); - btnStartResetDelete.TabIndex = 36; - btnStartResetDelete.Text = "删除"; - btnStartResetDelete.Type = AntdUI.TTypeMini.Error; - btnStartResetDelete.WaveSize = 0; - // - // btnStartResetAdd - // - btnStartResetAdd.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); - btnStartResetAdd.Location = new Point(13, 10); - btnStartResetAdd.Name = "btnStartResetAdd"; - btnStartResetAdd.Size = new Size(82, 32); - btnStartResetAdd.TabIndex = 35; - btnStartResetAdd.Text = "新增"; - btnStartResetAdd.Type = AntdUI.TTypeMini.Primary; - btnStartResetAdd.WaveSize = 0; - // - // tabPage5 - // - tabPage5.Controls.Add(TableStopReset); - tabPage5.Controls.Add(panel5); - tabPage5.Location = new Point(-669, -499); - tabPage5.Name = "tabPage5"; - tabPage5.Size = new Size(669, 499); - tabPage5.TabIndex = 4; - tabPage5.Text = "复位结束表"; - // - // TableStopReset - // - TableStopReset.Dock = DockStyle.Fill; - TableStopReset.EmptyHeader = true; - TableStopReset.Location = new Point(0, 45); - TableStopReset.Name = "TableStopReset"; - TableStopReset.Padding = new Padding(5); - TableStopReset.Size = new Size(669, 454); - TableStopReset.TabIndex = 38; - TableStopReset.Text = "table1"; - // - // panel5 - // - panel5.Back = Color.Transparent; - panel5.BackColor = SystemColors.Window; - panel5.Controls.Add(btnStopResetDelete); - panel5.Controls.Add(btnStopResetAdd); - panel5.Dock = DockStyle.Top; - panel5.Location = new Point(0, 0); - panel5.Name = "panel5"; - panel5.Size = new Size(669, 45); - panel5.TabIndex = 37; - panel5.Text = "panel5"; - // - // btnStopResetDelete - // - btnStopResetDelete.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); - btnStopResetDelete.Location = new Point(110, 10); - btnStopResetDelete.Name = "btnStopResetDelete"; - btnStopResetDelete.Size = new Size(74, 32); - btnStopResetDelete.TabIndex = 36; - btnStopResetDelete.Text = "删除"; - btnStopResetDelete.Type = AntdUI.TTypeMini.Error; - btnStopResetDelete.WaveSize = 0; - // - // btnStopResetAdd - // - btnStopResetAdd.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); - btnStopResetAdd.Location = new Point(13, 10); - btnStopResetAdd.Name = "btnStopResetAdd"; - btnStopResetAdd.Size = new Size(82, 32); - btnStopResetAdd.TabIndex = 35; - btnStopResetAdd.Text = "新增"; - btnStopResetAdd.Type = AntdUI.TTypeMini.Primary; - btnStopResetAdd.WaveSize = 0; - // // MotionControl // AutoScaleDimensions = new SizeF(7F, 17F); @@ -684,14 +427,6 @@ tabs1.ResumeLayout(false); tabPage1.ResumeLayout(false); panel1.ResumeLayout(false); - tabPage2.ResumeLayout(false); - panel2.ResumeLayout(false); - tabPage3.ResumeLayout(false); - panel3.ResumeLayout(false); - tabPage4.ResumeLayout(false); - panel4.ResumeLayout(false); - tabPage5.ResumeLayout(false); - panel5.ResumeLayout(false); ResumeLayout(false); } @@ -727,29 +462,9 @@ private AntdUI.Label label3; private AntdUI.Tabs tabs1; private AntdUI.TabPage tabPage1; - private AntdUI.TabPage tabPage2; - private AntdUI.TabPage tabPage3; - private AntdUI.TabPage tabPage4; - private AntdUI.TabPage tabPage5; private AntdUI.Table PLCItemsTable; private AntdUI.Panel panel1; private AntdUI.Button btnDelete; private AntdUI.Button btnAdd; - private AntdUI.Table TableSartProcess; - private AntdUI.Panel panel2; - private AntdUI.Button btnSartProcessDelete; - private AntdUI.Button btnSartProcessAdd; - private AntdUI.Table TableStopProcess; - private AntdUI.Panel panel3; - private AntdUI.Button btnStopProcessDelete; - private AntdUI.Button btnStopProcessAdd; - private AntdUI.Table TableStartReset; - private AntdUI.Panel panel4; - private AntdUI.Button btnStartResetDelete; - private AntdUI.Button btnStartResetAdd; - private AntdUI.Table TableStopReset; - private AntdUI.Panel panel5; - private AntdUI.Button btnStopResetDelete; - private AntdUI.Button btnStopResetAdd; } } diff --git a/DHSoftware/Views/MotionControl.cs b/DHSoftware/Views/MotionControl.cs index 67c5d05..7d57ee6 100644 --- a/DHSoftware/Views/MotionControl.cs +++ b/DHSoftware/Views/MotionControl.cs @@ -38,495 +38,9 @@ namespace DHSoftware.Views btnAdd.Click += BtnAdd_Click; btnDelete.Click += BtnDelete_Click; PLCItemsTable.CellButtonClick += PLCItemsTable_CellButtonClick; - - btnSartProcessAdd.Click += BtnSartProcessAdd_Click; - btnSartProcessDelete.Click += BtnSartProcessDelete_Click; - TableSartProcess.CellButtonClick += TableSartProcess_CellButtonClick; - - btnStopProcessAdd.Click += BtnStopProcessAdd_Click; - btnStopProcessDelete.Click += BtnStopProcessDelete_Click; - TableStopProcess.CellButtonClick += TableStopProcess_CellButtonClick; - - btnStartResetAdd.Click += BtnStartResetAdd_Click; - btnStartResetDelete.Click += BtnStartResetDelete_Click; - TableStartReset.CellButtonClick += TableStartReset_CellButtonClick; - - btnStopResetAdd.Click += BtnStopResetAdd_Click; - btnStopResetDelete.Click += BtnStopResetDelete_Click; - TableStopReset.CellButtonClick += TableStopReset_CellButtonClick; + } - private void TableStopReset_CellButtonClick(object sender, TableButtonEventArgs e) - { - var buttontext = e.Btn.Text; - - if (e.Record is PLCItem pLCItem) - { - switch (buttontext) - { - //暂不支持进入整行编辑，只支持指定单元格编辑，推荐使用弹窗或抽屉编辑整行数据 - case "编辑": - var form = new MotionProcessEdit(window, "复位结束表操作-编辑", pLCItem, pLCBase.PLCItemList) { Size = new Size(500, 300) }; - AntdUI.Drawer.open(new AntdUI.Drawer.Config(window, form) - { - OnLoad = () => - { - AntdUI.Message.info(window, "进入复位结束表编辑", autoClose: 1); - }, - OnClose = () => - { - AntdUI.Message.info(window, "退出复位结束表编辑", autoClose: 1); - } - }); - break; - - case "删除": - var result = Modal.open(window, "删除警告！", "确认要删除选择的数据吗？", TType.Warn); - if (result == DialogResult.OK) - { - pLCBase.PLCStopResetList.Remove(pLCItem); - } - break; - - case "上移": - if (e.RowIndex <= 1) - { - AntdUI.Message.warn(window, "已是第一条，无法上移！", autoClose: 3); - return; - } - MoveItemUp(pLCBase.PLCStopResetList, pLCItem); - break; - - case "下移": - if (e.RowIndex > pLCBase.PLCStopResetList.Count - 1) - { - AntdUI.Message.warn(window, "已是最后一条，无法下移！", autoClose: 3); - return; - } - MoveItemDown(pLCBase.PLCStopResetList, pLCItem); - break; - } - } - } - - private void BtnStopResetDelete_Click(object? sender, EventArgs e) - { - if (pLCBase.PLCStopResetList.Count == 0 || !pLCBase.PLCStopResetList.Any(x => x.Selected)) - { - AntdUI.Message.warn(window, "请选择要删除的行！", autoClose: 3); - return; - } - - var result = Modal.open(window, "删除警告！", "确认要删除选择的数据吗？", TType.Warn); - if (result == DialogResult.OK) - { - // 使用反转for循环删除主列表中选中的项 - for (int i = pLCBase.PLCStopResetList.Count - 1; i >= 0; i--) - { - // 删除选中的主列表项 - if (pLCBase.PLCStopResetList[i].Selected) - { - pLCBase.PLCStopResetList.RemoveAt(i); - } - } - // 提示删除完成 - AntdUI.Message.success(window, "删除成功！", autoClose: 3); - } - } - - private void BtnStopResetAdd_Click(object? sender, EventArgs e) - { - if (pLCBase.PLCItemList?.Count == 0) - { - AntdUI.Message.warn(window, "点位表无数据，不允许新增！", autoClose: 3); - return; - } - - PLCItem pLCItem = new PLCItem() - { - StartIndex = pLCBase.PLCStopResetList.Count + 1, - CellLinks = new CellLink[] - { - new CellButton(Guid.NewGuid().ToString(), "上移", TTypeMini.Default), - new CellButton(Guid.NewGuid().ToString(), "下移", TTypeMini.Default), - new CellButton(Guid.NewGuid().ToString(), "编辑", TTypeMini.Primary), - new CellButton(Guid.NewGuid().ToString(), "删除", TTypeMini.Error) - } - }; - - var form = new MotionProcessEdit(window, "复位结束表操作-新增", pLCItem, pLCBase.PLCItemList) { Size = new Size(450, 550) }; - - AntdUI.Drawer.open(new AntdUI.Drawer.Config(window, form) - { - OnLoad = () => - { - AntdUI.Message.info(window, "进入复位结束表新增", autoClose: 1); - }, - OnClose = () => - { - if (form.submit) - { - pLCBase.PLCStopResetList.Add(pLCItem); - } - - AntdUI.Message.info(window, "退出复位结束表新增", autoClose: 1); - } - }); - } - - private void TableStartReset_CellButtonClick(object sender, TableButtonEventArgs e) - { - var buttontext = e.Btn.Text; - - if (e.Record is PLCItem pLCItem) - { - switch (buttontext) - { - //暂不支持进入整行编辑，只支持指定单元格编辑，推荐使用弹窗或抽屉编辑整行数据 - case "编辑": - var form = new MotionProcessEdit(window, "复位开始表操作-编辑", pLCItem, pLCBase.PLCItemList) { Size = new Size(500, 300) }; - AntdUI.Drawer.open(new AntdUI.Drawer.Config(window, form) - { - OnLoad = () => - { - AntdUI.Message.info(window, "进入复位开始表编辑", autoClose: 1); - }, - OnClose = () => - { - AntdUI.Message.info(window, "退出复位开始表编辑", autoClose: 1); - } - }); - break; - - case "删除": - var result = Modal.open(window, "删除警告！", "确认要删除选择的数据吗？", TType.Warn); - if (result == DialogResult.OK) - { - pLCBase.PLCStartResetList.Remove(pLCItem); - } - break; - - case "上移": - if (e.RowIndex <= 1) - { - AntdUI.Message.warn(window, "已是第一条，无法上移！", autoClose: 3); - return; - } - MoveItemUp(pLCBase.PLCStartResetList, pLCItem); - break; - - case "下移": - if (e.RowIndex > pLCBase.PLCStartResetList.Count - 1) - { - AntdUI.Message.warn(window, "已是最后一条，无法下移！", autoClose: 3); - return; - } - MoveItemDown(pLCBase.PLCStartResetList, pLCItem); - break; - } - } - } - - private void BtnStartResetDelete_Click(object? sender, EventArgs e) - { - if (pLCBase.PLCStartResetList.Count == 0 || !pLCBase.PLCStartResetList.Any(x => x.Selected)) - { - AntdUI.Message.warn(window, "请选择要删除的行！", autoClose: 3); - return; - } - - var result = Modal.open(window, "删除警告！", "确认要删除选择的数据吗？", TType.Warn); - if (result == DialogResult.OK) - { - // 使用反转for循环删除主列表中选中的项 - for (int i = pLCBase.PLCStartResetList.Count - 1; i >= 0; i--) - { - // 删除选中的主列表项 - if (pLCBase.PLCStartResetList[i].Selected) - { - pLCBase.PLCStartResetList.RemoveAt(i); - } - } - // 提示删除完成 - AntdUI.Message.success(window, "删除成功！", autoClose: 3); - } - } - - private void BtnStartResetAdd_Click(object? sender, EventArgs e) - { - if (pLCBase.PLCItemList?.Count == 0) - { - AntdUI.Message.warn(window, "点位表无数据，不允许新增！", autoClose: 3); - return; - } - - PLCItem pLCItem = new PLCItem() - { - StartIndex = pLCBase.PLCStartResetList.Count + 1, - CellLinks = new CellLink[] - { - new CellButton(Guid.NewGuid().ToString(), "上移", TTypeMini.Default), - new CellButton(Guid.NewGuid().ToString(), "下移", TTypeMini.Default), - new CellButton(Guid.NewGuid().ToString(), "编辑", TTypeMini.Primary), - new CellButton(Guid.NewGuid().ToString(), "删除", TTypeMini.Error) - } - }; - - var form = new MotionProcessEdit(window, "复位开始表操作-新增", pLCItem, pLCBase.PLCItemList) { Size = new Size(450, 550) }; - - AntdUI.Drawer.open(new AntdUI.Drawer.Config(window, form) - { - OnLoad = () => - { - AntdUI.Message.info(window, "进入复位开始表新增", autoClose: 1); - }, - OnClose = () => - { - if (form.submit) - { - pLCBase.PLCStartResetList.Add(pLCItem); - } - - AntdUI.Message.info(window, "退出复位开始表新增", autoClose: 1); - } - }); - } - - private void TableStopProcess_CellButtonClick(object sender, TableButtonEventArgs e) - { - var buttontext = e.Btn.Text; - - if (e.Record is PLCItem pLCItem) - { - switch (buttontext) - { - //暂不支持进入整行编辑，只支持指定单元格编辑，推荐使用弹窗或抽屉编辑整行数据 - case "编辑": - var form = new MotionProcessEdit(window, "流程结束表操作-编辑", pLCItem, pLCBase.PLCItemList) { Size = new Size(500, 300) }; - AntdUI.Drawer.open(new AntdUI.Drawer.Config(window, form) - { - OnLoad = () => - { - AntdUI.Message.info(window, "进入流程结束表编辑", autoClose: 1); - }, - OnClose = () => - { - AntdUI.Message.info(window, "退出流程结束表编辑", autoClose: 1); - } - }); - break; - - case "删除": - var result = Modal.open(window, "删除警告！", "确认要删除选择的数据吗？", TType.Warn); - if (result == DialogResult.OK) - { - pLCBase.PLCStopProcessList.Remove(pLCItem); - } - break; - - case "上移": - if (e.RowIndex <= 1) - { - AntdUI.Message.warn(window, "已是第一条，无法上移！", autoClose: 3); - return; - } - MoveItemUp(pLCBase.PLCStopProcessList, pLCItem); - break; - - case "下移": - if (e.RowIndex > pLCBase.PLCStopProcessList.Count - 1) - { - AntdUI.Message.warn(window, "已是最后一条，无法下移！", autoClose: 3); - return; - } - MoveItemDown(pLCBase.PLCStopProcessList, pLCItem); - break; - } - } - } - - private void BtnStopProcessDelete_Click(object? sender, EventArgs e) - { - if (pLCBase.PLCStopProcessList.Count == 0 || !pLCBase.PLCStopProcessList.Any(x => x.Selected)) - { - AntdUI.Message.warn(window, "请选择要删除的行！", autoClose: 3); - return; - } - - var result = Modal.open(window, "删除警告！", "确认要删除选择的数据吗？", TType.Warn); - if (result == DialogResult.OK) - { - // 使用反转for循环删除主列表中选中的项 - for (int i = pLCBase.PLCStopProcessList.Count - 1; i >= 0; i--) - { - // 删除选中的主列表项 - if (pLCBase.PLCStopProcessList[i].Selected) - { - pLCBase.PLCStopProcessList.RemoveAt(i); - } - } - // 提示删除完成 - AntdUI.Message.success(window, "删除成功！", autoClose: 3); - } - } - - private void BtnStopProcessAdd_Click(object? sender, EventArgs e) - { - if (pLCBase.PLCItemList?.Count == 0) - { - AntdUI.Message.warn(window, "点位表无数据，不允许新增！", autoClose: 3); - return; - } - - PLCItem pLCItem = new PLCItem() - { - StartIndex = pLCBase.PLCStopProcessList.Count + 1, - CellLinks = new CellLink[] - { - new CellButton(Guid.NewGuid().ToString(), "上移", TTypeMini.Default), - new CellButton(Guid.NewGuid().ToString(), "下移", TTypeMini.Default), - new CellButton(Guid.NewGuid().ToString(), "编辑", TTypeMini.Primary), - new CellButton(Guid.NewGuid().ToString(), "删除", TTypeMini.Error) - } - }; - - var form = new MotionProcessEdit(window, "流程结束表操作-新增", pLCItem, pLCBase.PLCItemList) { Size = new Size(450, 550) }; - - AntdUI.Drawer.open(new AntdUI.Drawer.Config(window, form) - { - OnLoad = () => - { - AntdUI.Message.info(window, "进入流程结束表新增", autoClose: 1); - }, - OnClose = () => - { - if (form.submit) - { - pLCBase.PLCStopProcessList.Add(pLCItem); - } - - AntdUI.Message.info(window, "退出流程结束表新增", autoClose: 1); - } - }); - } - - private void TableSartProcess_CellButtonClick(object sender, TableButtonEventArgs e) - { - var buttontext = e.Btn.Text; - - if (e.Record is PLCItem pLCItem) - { - switch (buttontext) - { - //暂不支持进入整行编辑，只支持指定单元格编辑，推荐使用弹窗或抽屉编辑整行数据 - case "编辑": - var form = new MotionProcessEdit(window, "流程开始表操作-编辑", pLCItem, pLCBase.PLCItemList) { Size = new Size(500, 300) }; - AntdUI.Drawer.open(new AntdUI.Drawer.Config(window, form) - { - OnLoad = () => - { - AntdUI.Message.info(window, "进入流程开始表编辑", autoClose: 1); - }, - OnClose = () => - { - AntdUI.Message.info(window, "退出流程开始表编辑", autoClose: 1); - } - }); - break; - - case "删除": - var result = Modal.open(window, "删除警告！", "确认要删除选择的数据吗？", TType.Warn); - if (result == DialogResult.OK) - { - pLCBase.PLCStartProcessList.Remove(pLCItem); - } - break; - - case "上移": - if (e.RowIndex <= 1) - { - AntdUI.Message.warn(window, "已是第一条，无法上移！", autoClose: 3); - return; - } - MoveItemUp(pLCBase.PLCStartProcessList, pLCItem); - break; - - case "下移": - if (e.RowIndex > pLCBase.PLCStartProcessList.Count - 1) - { - AntdUI.Message.warn(window, "已是最后一条，无法下移！", autoClose: 3); - return; - } - MoveItemDown(pLCBase.PLCStartProcessList, pLCItem); - break; - } - } - } - - private void BtnSartProcessDelete_Click(object? sender, EventArgs e) - { - if (pLCBase.PLCStartProcessList.Count == 0 || !pLCBase.PLCStartProcessList.Any(x => x.Selected)) - { - AntdUI.Message.warn(window, "请选择要删除的行！", autoClose: 3); - return; - } - - var result = Modal.open(window, "删除警告！", "确认要删除选择的数据吗？", TType.Warn); - if (result == DialogResult.OK) - { - // 使用反转for循环删除主列表中选中的项 - for (int i = pLCBase.PLCStartProcessList.Count - 1; i >= 0; i--) - { - // 删除选中的主列表项 - if (pLCBase.PLCStartProcessList[i].Selected) - { - pLCBase.PLCStartProcessList.RemoveAt(i); - } - } - // 提示删除完成 - AntdUI.Message.success(window, "删除成功！", autoClose: 3); - } - } - - private void BtnSartProcessAdd_Click(object? sender, EventArgs e) - { - if (pLCBase.PLCItemList?.Count == 0) - { - AntdUI.Message.warn(window, "点位表无数据，不允许新增！", autoClose: 3); - return; - } - - PLCItem pLCItem = new PLCItem() - { - StartIndex = pLCBase.PLCStartProcessList.Count + 1, - CellLinks = new CellLink[] - { - new CellButton(Guid.NewGuid().ToString(), "上移", TTypeMini.Default), - new CellButton(Guid.NewGuid().ToString(), "下移", TTypeMini.Default), - new CellButton(Guid.NewGuid().ToString(), "编辑", TTypeMini.Primary), - new CellButton(Guid.NewGuid().ToString(), "删除", TTypeMini.Error) - } - }; - - var form = new MotionProcessEdit(window, "流程开始表操作-新增", pLCItem, pLCBase.PLCItemList) { Size = new Size(450, 550) }; - - AntdUI.Drawer.open(new AntdUI.Drawer.Config(window, form) - { - OnLoad = () => - { - AntdUI.Message.info(window, "进入流程开始表新增", autoClose: 1); - }, - OnClose = () => - { - if (form.submit) - { - pLCBase.PLCStartProcessList.Add(pLCItem); - } - - AntdUI.Message.info(window, "退出流程开始表新增", autoClose: 1); - } - }); - } private void PLCItemsTable_CellButtonClick(object sender, TableButtonEventArgs e) { @@ -787,101 +301,7 @@ namespace DHSoftware.Views } PLCItemsTable.Binding(pLCBase.PLCItemList); - TableSartProcess.Columns = new ColumnCollection() { - new ColumnCheck("Selected"){Fixed = true}, - new Column("StartIndex", "序号", ColumnAlign.Center), - new ColumnSwitch("StartExecute", "启用", ColumnAlign.Center), - new Column("Name", "名称", ColumnAlign.Center), - new Column("Type", "类型",ColumnAlign.Center){Visible=false}, - new Column("Address", "地址",ColumnAlign.Center){Visible=false}, - new Column("Value", "值",ColumnAlign.Center), - new Column("CellLinks", "操作", ColumnAlign.Center) - }; - if (pLCBase.PLCStartProcessList.Count > 0) - { - foreach (var item in pLCBase.PLCStartProcessList) - { - item.CellLinks = new CellLink[] { - new CellButton(Guid.NewGuid().ToString(), "上移", TTypeMini.Default), - new CellButton(Guid.NewGuid().ToString(), "下移", TTypeMini.Default), - new CellButton(Guid.NewGuid().ToString(), "编辑", TTypeMini.Primary) , - new CellButton(Guid.NewGuid().ToString(), "删除", TTypeMini.Error) - }; - } - } - //TableSartProcess.Binding(pLCBase.PLCStartProcessList); - TableSartProcess.Binding(pLCBase.PLCStartProcessList); - TableStopProcess.Columns = new ColumnCollection() { - new ColumnCheck("Selected"){Fixed = true}, - new Column("StartIndex", "序号", ColumnAlign.Center), - new ColumnSwitch("StartExecute", "启用", ColumnAlign.Center), - new Column("Name", "名称", ColumnAlign.Center), - new Column("Type", "类型",ColumnAlign.Center){Visible=false}, - new Column("Address", "地址",ColumnAlign.Center){Visible=false}, - new Column("Value", "值",ColumnAlign.Center), - new Column("CellLinks", "操作", ColumnAlign.Center) - }; - if (pLCBase.PLCStopProcessList.Count > 0) - { - foreach (var item in pLCBase.PLCStopProcessList) - { - item.CellLinks = new CellLink[] { - new CellButton(Guid.NewGuid().ToString(), "上移", TTypeMini.Default), - new CellButton(Guid.NewGuid().ToString(), "下移", TTypeMini.Default), - new CellButton(Guid.NewGuid().ToString(), "编辑", TTypeMini.Primary) , - new CellButton(Guid.NewGuid().ToString(), "删除", TTypeMini.Error) - }; - } - } - TableStopProcess.Binding(pLCBase.PLCStopProcessList); - - TableStartReset.Columns = new ColumnCollection() { - new ColumnCheck("Selected"){Fixed = true}, - new Column("StartIndex", "序号", ColumnAlign.Center), - new ColumnSwitch("StartExecute", "启用", ColumnAlign.Center), - new Column("Name", "名称", ColumnAlign.Center), - new Column("Type", "类型",ColumnAlign.Center){Visible=false}, - new Column("Address", "地址",ColumnAlign.Center){Visible=false}, - new Column("Value", "值",ColumnAlign.Center), - new Column("CellLinks", "操作", ColumnAlign.Center) - }; - if (pLCBase.PLCStartResetList.Count > 0) - { - foreach (var item in pLCBase.PLCStartResetList) - { - item.CellLinks = new CellLink[] { - new CellButton(Guid.NewGuid().ToString(), "上移", TTypeMini.Default), - new CellButton(Guid.NewGuid().ToString(), "下移", TTypeMini.Default), - new CellButton(Guid.NewGuid().ToString(), "编辑", TTypeMini.Primary) , - new CellButton(Guid.NewGuid().ToString(), "删除", TTypeMini.Error) - }; - } - } - TableStartReset.Binding(pLCBase.PLCStartResetList); - - TableStopReset.Columns = new ColumnCollection() { - new ColumnCheck("Selected"){Fixed = true}, - new Column("StartIndex", "序号", ColumnAlign.Center), - new ColumnSwitch("StartExecute", "启用", ColumnAlign.Center), - new Column("Name", "名称", ColumnAlign.Center), - new Column("Type", "类型",ColumnAlign.Center){Visible=false}, - new Column("Address", "地址",ColumnAlign.Center){Visible=false}, - new Column("Value", "值",ColumnAlign.Center), - new Column("CellLinks", "操作", ColumnAlign.Center) - }; - if (pLCBase.PLCStopResetList.Count > 0) - { - foreach (var item in pLCBase.PLCStopResetList) - { - item.CellLinks = new CellLink[] { - new CellButton(Guid.NewGuid().ToString(), "上移", TTypeMini.Default), - new CellButton(Guid.NewGuid().ToString(), "下移", TTypeMini.Default), - new CellButton(Guid.NewGuid().ToString(), "编辑", TTypeMini.Primary) , - new CellButton(Guid.NewGuid().ToString(), "删除", TTypeMini.Error) - }; - } - } - TableStopReset.Binding(pLCBase.PLCStopResetList); + } private void SetupDataBindings() diff --git a/DHSoftware/Views/MotionProcessEdit.Designer.cs b/DHSoftware/Views/MotionProcessEdit.Designer.cs index ab58144..ff79879 100644 --- a/DHSoftware/Views/MotionProcessEdit.Designer.cs +++ b/DHSoftware/Views/MotionProcessEdit.Designer.cs @@ -37,6 +37,7 @@ divider1 = new AntdUI.Divider(); lbTitleName = new AntdUI.Label(); panel1 = new AntdUI.Panel(); + sltValue = new AntdUI.Select(); iptValue = new AntdUI.Input(); label1 = new AntdUI.Label(); iptAddress = new AntdUI.Input(); @@ -131,6 +132,7 @@ // // panel1 // + panel1.Controls.Add(sltValue); panel1.Controls.Add(iptValue); panel1.Controls.Add(label1); panel1.Controls.Add(iptAddress); @@ -150,21 +152,32 @@ panel1.Name = "panel1"; panel1.Padding = new Padding(12); panel1.Shadow = 6; - panel1.Size = new Size(445, 451); + panel1.Size = new Size(445, 549); panel1.TabIndex = 1; panel1.Text = "panel1"; panel1.Click += panel1_Click; // + // sltValue + // + sltValue.Dock = DockStyle.Top; + sltValue.List = true; + sltValue.Location = new Point(18, 420); + sltValue.Name = "sltValue"; + sltValue.Size = new Size(409, 38); + sltValue.TabIndex = 63; + sltValue.Visible = false; + // // iptValue // iptValue.Dock = DockStyle.Top; iptValue.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); iptValue.Location = new Point(18, 382); iptValue.Name = "iptValue"; - iptValue.PlaceholderText = "布尔类型1(true)或0(false),其它类型实值"; + iptValue.PlaceholderText = ""; iptValue.Radius = 3; iptValue.Size = new Size(409, 38); iptValue.TabIndex = 62; + iptValue.Visible = false; // // label1 // @@ -242,7 +255,7 @@ AutoScaleMode = AutoScaleMode.Font; Controls.Add(panel1); Name = "MotionProcessEdit"; - Size = new Size(445, 451); + Size = new Size(445, 549); stackPanel1.ResumeLayout(false); panel1.ResumeLayout(false); ResumeLayout(false); @@ -266,5 +279,6 @@ private AntdUI.Label label7; private AntdUI.Select sltDataType; private AntdUI.Label label4; + private AntdUI.Select sltValue; } } diff --git a/DHSoftware/Views/MotionProcessEdit.cs b/DHSoftware/Views/MotionProcessEdit.cs index 4e27b02..5148d91 100644 --- a/DHSoftware/Views/MotionProcessEdit.cs +++ b/DHSoftware/Views/MotionProcessEdit.cs @@ -29,9 +29,15 @@ namespace DHSoftware.Views sltName.SelectedIndexChanged += SltName_SelectedIndexChanged; button_ok.Click += Button_ok_Click; button_cancel.Click += Button_cancel_Click; + sltDataType.SelectedIndexChanged += SltDataType_SelectedIndexChanged; + } + private void SltDataType_SelectedIndexChanged(object sender, IntEventArgs e) + { + iptValue.Visible = e.Value != 3; + sltValue.Visible = e.Value == 3; } private void SltName_SelectedIndexChanged(object sender, IntEventArgs e) @@ -64,7 +70,15 @@ namespace DHSoftware.Views plcItem.Name = sltName.Text; plcItem.Address = iptAddress.Text; plcItem.Type = (EnumPLCDataType)sltDataType.SelectedIndex; - plcItem.Value=iptValue.Text; + if (sltDataType.SelectedIndex != 3) + { + plcItem.Value = iptValue.Text; + } + else + { + plcItem.Value = sltValue.Text; + } + plcItem.StartExecute = sltEnable.SelectedIndex != 0; submit = true; this.Dispose(); @@ -76,15 +90,24 @@ namespace DHSoftware.Views foreach (var item in plcItemList) { sltName.Items.Add(item.Name); - sltDataType.Items.Add(item.Type); } + var PLCDataTypes = Enum.GetNames(typeof(EnumPLCDataType)); + foreach (var name in PLCDataTypes) + { + sltDataType.Items.Add(name); + } + var boolNames = Enum.GetNames(typeof(EnumBool)); foreach (var name in boolNames) { sltEnable.Items.Add(name); } - + var bool1Names = Enum.GetNames(typeof(EnumBool1)); + foreach (var name in bool1Names) + { + sltValue.Items.Add(name); + } if (!string.IsNullOrEmpty(plcItem.Name)) { @@ -92,7 +115,14 @@ namespace DHSoftware.Views iptAddress.Text = plcItem.Address; sltDataType.SelectedIndex = (int)plcItem.Type; sltEnable.SelectedIndex = plcItem.StartExecute ? 1 : 0; - iptValue.Text = plcItem.Value; + if (sltDataType.SelectedIndex != 3) + { + iptValue.Text = plcItem.Value; + } + else + { + sltValue.SelectedIndex=plcItem.Value=="True"?1:0; + } } } diff --git a/DHSoftware/Views/SettingWindow.Designer.cs b/DHSoftware/Views/SettingWindow.Designer.cs index a30c81d..9bc02f5 100644 --- a/DHSoftware/Views/SettingWindow.Designer.cs +++ b/DHSoftware/Views/SettingWindow.Designer.cs @@ -28,10 +28,12 @@ /// private void InitializeComponent() { + AntdUI.MenuItem menuItem1 = new AntdUI.MenuItem(); + AntdUI.MenuItem menuItem2 = new AntdUI.MenuItem(); + AntdUI.MenuItem menuItem3 = new AntdUI.MenuItem(); AntdUI.MenuItem menuItem4 = new AntdUI.MenuItem(); AntdUI.MenuItem menuItem5 = new AntdUI.MenuItem(); - AntdUI.MenuItem menuItem6 = new AntdUI.MenuItem(); - AntdUI.Tabs.StyleCard styleCard2 = new AntdUI.Tabs.StyleCard(); + AntdUI.Tabs.StyleCard styleCard1 = new AntdUI.Tabs.StyleCard(); pageHeader1 = new AntdUI.PageHeader(); panel1 = new AntdUI.Panel(); panel2 = new AntdUI.StackPanel(); @@ -116,15 +118,25 @@ // menu1.BackColor = SystemColors.Window; menu1.Dock = DockStyle.Top; - menuItem4.IconSvg = "VideoCameraOutlined"; - menuItem4.Text = "相机设置"; - menuItem5.IconSvg = "AppstoreOutlined"; - menuItem5.Text = "工位设置"; - menuItem6.IconSvg = "ControlOutlined"; - menuItem6.Text = "运控设置"; + menuItem1.Expand = false; + menuItem1.IconSvg = "VideoCameraOutlined"; + menuItem1.Text = "相机设置"; + menuItem2.Expand = false; + menuItem2.IconSvg = "AppstoreOutlined"; + menuItem2.Text = "工位设置"; + menuItem3.Expand = false; + menuItem3.IconSvg = "ControlOutlined"; + menuItem3.Text = "运控设置"; + menuItem4.Expand = false; + menuItem4.IconSvg = "BarsOutlined"; + menuItem5.IconSvg = "BarsOutlined"; + menuItem5.Text = "全局设置"; + menuItem4.Sub.Add(menuItem5); + menuItem4.Text = "其他设置"; + menu1.Items.Add(menuItem1); + menu1.Items.Add(menuItem2); + menu1.Items.Add(menuItem3); menu1.Items.Add(menuItem4); - menu1.Items.Add(menuItem5); - menu1.Items.Add(menuItem6); menu1.Location = new Point(0, 0); menu1.Name = "menu1"; menu1.Size = new Size(141, 632); @@ -152,8 +164,8 @@ tabs1.Location = new Point(151, 33); tabs1.Name = "tabs1"; tabs1.Size = new Size(891, 666); - styleCard2.Closable = true; - tabs1.Style = styleCard2; + styleCard1.Closable = true; + tabs1.Style = styleCard1; tabs1.TabIndex = 5; tabs1.Text = "tabs1"; tabs1.Type = AntdUI.TabType.Card; @@ -170,13 +182,13 @@ divider1.Text = ""; divider1.Vertical = true; // - // SettingWindow1 + // SettingWindow // AutoScaleDimensions = new SizeF(7F, 17F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(1042, 699); Controls.Add(panel3); - Name = "SettingWindow1"; + Name = "SettingWindow"; StartPosition = FormStartPosition.CenterScreen; Text = "SettingWinform"; panel1.ResumeLayout(false); @@ -195,6 +207,6 @@ private AntdUI.Tabs tabs1; private AntdUI.Divider divider1; private AntdUI.Dropdown btnAdd; - private AntdUI.Button btnSave; + private AntdUI.Dropdown btnSave; } } \ No newline at end of file diff --git a/DHSoftware/Views/SettingWindow.cs b/DHSoftware/Views/SettingWindow.cs index b015f75..0d97e03 100644 --- a/DHSoftware/Views/SettingWindow.cs +++ b/DHSoftware/Views/SettingWindow.cs @@ -173,6 +173,51 @@ namespace DHSoftware.Views currControl = control; } break; + case "其他设置": + foreach (var tab in tabs1.Pages) + { + if (tab is AntdUI.TabPage existingTab && existingTab.Text == $"{clickedItem.PARENTITEM.Text}-{clickedItem.Text}") + { + isUpdatingTabs = true; + tabs1.SelectedTab = existingTab; // 直接跳转到已存在的 TabPage + isUpdatingTabs = false; + currControl = existingTab.Controls.Count > 0 ? existingTab.Controls[0] as UserControl : null; + return; + } + } + + if (clickedItem.Text == "全局设置") + { + //先获取是否存在该名称的配置 + //如果没有新建项 + GlobalConfig? global = ConfigModel + .GlobalList.FirstOrDefault() ; + if (global == null) + { + global = new GlobalConfig(); + } + + UserControl control3 = null; + control = new GlobalControl(this, global); + if (control != null) + { + //容器添加控件，需要调整dpi + control.Dock = DockStyle.Fill; + AutoDpi(control); + AntdUI.TabPage tabPage = new AntdUI.TabPage() + { + Text = $"{clickedItem.PARENTITEM.Text}-{clickedItem.Text}", + ReadOnly = false, + }; + tabPage.Controls.Add(control); + tabs1.Pages.Add(tabPage); + isUpdatingTabs = true; + tabs1.SelectedTab = tabPage; + isUpdatingTabs = false; + currControl = control; + } + } + break; } } } @@ -186,7 +231,6 @@ namespace DHSoftware.Views btnAdd.Items.Add("相机设置"); btnAdd.Items.Add("工位设置"); btnAdd.Items.Add("运控设置"); - x = Width; y = Height; AdaptiveHelper.setTag(this); @@ -237,6 +281,12 @@ namespace DHSoftware.Views } } } + if (ConfigModel.GlobalList?.Count <= 0) + { + GlobalConfig globalConfig = new GlobalConfig(); + ConfigModel.GlobalList.Add(globalConfig); + } + } private void BtnSave_Click(object? sender, EventArgs e) @@ -652,6 +702,8 @@ namespace DHSoftware.Views } } break; + + } } }