diff --git a/HighWayIot.Plc/PlcHelper/WorkStationHelper.cs b/HighWayIot.Plc/PlcHelper/WorkStationHelper.cs index 59f794f..c35aa84 100644 --- a/HighWayIot.Plc/PlcHelper/WorkStationHelper.cs +++ b/HighWayIot.Plc/PlcHelper/WorkStationHelper.cs @@ -7,6 +7,9 @@ using System.Threading.Tasks; namespace HighWayIot.Plc.PlcHelper { + /// + /// PLC工位识别工位读取 + /// public class WorkStationHelper { /// diff --git a/HighWayIot.Repository/HighWayIot.Repository.csproj b/HighWayIot.Repository/HighWayIot.Repository.csproj index 55f815a..4607436 100644 --- a/HighWayIot.Repository/HighWayIot.Repository.csproj +++ b/HighWayIot.Repository/HighWayIot.Repository.csproj @@ -62,6 +62,7 @@ + @@ -69,6 +70,7 @@ + diff --git a/HighWayIot.Repository/domain/ZxRecipeParaEntity.cs b/HighWayIot.Repository/domain/ZxRecipeParaEntity.cs index 50c56ae..e03cb04 100644 --- a/HighWayIot.Repository/domain/ZxRecipeParaEntity.cs +++ b/HighWayIot.Repository/domain/ZxRecipeParaEntity.cs @@ -11,7 +11,6 @@ namespace Models public class ZxRecipeParaEntity { - /// /// 备 注: /// 默认值: @@ -20,333 +19,116 @@ namespace Models public int Id { get; set; } /// - /// 备 注:配方代码 + /// 备 注:关联配方号 /// 默认值: /// [SugarColumn(ColumnName = "recipe_code")] - public string RecipeCode { get; set; } = null; - - /// - /// 备 注:是否删除 - /// 默认值: - /// - [SugarColumn(ColumnName = "is_deleted")] - public bool? IsDeleted { get; set; } + public string RecipeCode { get; set; } = string.Empty; /// /// 备 注: /// 默认值: /// - [SugarColumn(ColumnName = "E1P1")] - public int? E1P1 { get; set; } + [SugarColumn(ColumnName = "P1")] + public int? P1 { get; set; } /// /// 备 注: /// 默认值: /// - [SugarColumn(ColumnName = "E1P2")] - public int? E1P2 { get; set; } + [SugarColumn(ColumnName = "P2")] + public int? P2 { get; set; } /// /// 备 注: /// 默认值: /// - [SugarColumn(ColumnName = "E1P3")] - public int? E1P3 { get; set; } + [SugarColumn(ColumnName = "P31")] + public int? P31 { get; set; } /// /// 备 注: /// 默认值: /// - [SugarColumn(ColumnName = "E1P4")] - public int? E1P4 { get; set; } + [SugarColumn(ColumnName = "P32")] + public int? P32 { get; set; } /// /// 备 注: /// 默认值: /// - [SugarColumn(ColumnName = "E1P5")] - public int? E1P5 { get; set; } + [SugarColumn(ColumnName = "P41")] + public int? P41 { get; set; } /// /// 备 注: /// 默认值: /// - [SugarColumn(ColumnName = "E1P6")] - public int? E1P6 { get; set; } + [SugarColumn(ColumnName = "P42")] + public int? P42 { get; set; } /// /// 备 注: /// 默认值: /// - [SugarColumn(ColumnName = "E1P7")] - public int? E1P7 { get; set; } + [SugarColumn(ColumnName = "P51")] + public int? P51 { get; set; } /// /// 备 注: /// 默认值: /// - [SugarColumn(ColumnName = "E1P8")] - public int? E1P8 { get; set; } + [SugarColumn(ColumnName = "P52")] + public int? P52 { get; set; } /// - /// 备 注: + /// 备 注:钢圈尺寸 /// 默认值: /// - [SugarColumn(ColumnName = "E1P9")] - public int? E1P9 { get; set; } + [SugarColumn(ColumnName = "rim_inch")] + public int? RimInch { get; set; } /// - /// 备 注: + /// 备 注:灯标宽度 /// 默认值: /// - [SugarColumn(ColumnName = "E1P10")] - public int? E1P10 { get; set; } + [SugarColumn(ColumnName = "light_width")] + public int? LightWidth { get; set; } /// - /// 备 注: + /// 备 注:减速距离 /// 默认值: /// - [SugarColumn(ColumnName = "E1P11")] - public int? E1P11 { get; set; } + [SugarColumn(ColumnName = "slow_distance")] + public int? SlowDistance { get; set; } /// - /// 备 注: + /// 备 注:停止距离 /// 默认值: /// - [SugarColumn(ColumnName = "E1P12")] - public int? E1P12 { get; set; } + [SugarColumn(ColumnName = "stop_distance")] + public int? StopDistance { get; set; } /// - /// 备 注: + /// 备 注:胎体重量 /// 默认值: /// - [SugarColumn(ColumnName = "E1P13")] - public int? E1P13 { get; set; } + [SugarColumn(ColumnName = "tire_weight")] + public int? TireWeight { get; set; } /// - /// 备 注: + /// 备 注:规格名 /// 默认值: /// - [SugarColumn(ColumnName = "E1P14")] - public int? E1P14 { get; set; } + [SugarColumn(ColumnName = "spec_name")] + public string SpecName { get; set; } = string.Empty; /// - /// 备 注: + /// 备 注:规格号 /// 默认值: /// - [SugarColumn(ColumnName = "E1P15")] - public int? E1P15 { get; set; } - - /// - /// 备 注: - /// 默认值: - /// - [SugarColumn(ColumnName = "E2P1")] - public int? E2P1 { get; set; } - - /// - /// 备 注: - /// 默认值: - /// - [SugarColumn(ColumnName = "E2P2")] - public int? E2P2 { get; set; } - - /// - /// 备 注: - /// 默认值: - /// - [SugarColumn(ColumnName = "E2P3")] - public int? E2P3 { get; set; } - - /// - /// 备 注: - /// 默认值: - /// - [SugarColumn(ColumnName = "E2P4")] - public int? E2P4 { get; set; } - - /// - /// 备 注: - /// 默认值: - /// - [SugarColumn(ColumnName = "E2P5")] - public int? E2P5 { get; set; } - - /// - /// 备 注: - /// 默认值: - /// - [SugarColumn(ColumnName = "E2P6")] - public int? E2P6 { get; set; } - - /// - /// 备 注: - /// 默认值: - /// - [SugarColumn(ColumnName = "E2P7")] - public int? E2P7 { get; set; } - - /// - /// 备 注: - /// 默认值: - /// - [SugarColumn(ColumnName = "E2P8")] - public int? E2P8 { get; set; } - - /// - /// 备 注: - /// 默认值: - /// - [SugarColumn(ColumnName = "E2P9")] - public int? E2P9 { get; set; } - - /// - /// 备 注: - /// 默认值: - /// - [SugarColumn(ColumnName = "E2P10")] - public int? E2P10 { get; set; } - - /// - /// 备 注: - /// 默认值: - /// - [SugarColumn(ColumnName = "E2P11")] - public int? E2P11 { get; set; } - - /// - /// 备 注: - /// 默认值: - /// - [SugarColumn(ColumnName = "E2P12")] - public int? E2P12 { get; set; } - - /// - /// 备 注: - /// 默认值: - /// - [SugarColumn(ColumnName = "E2P13")] - public int? E2P13 { get; set; } - - /// - /// 备 注: - /// 默认值: - /// - [SugarColumn(ColumnName = "E2P14")] - public int? E2P14 { get; set; } - - /// - /// 备 注: - /// 默认值: - /// - [SugarColumn(ColumnName = "E2P15")] - public int? E2P15 { get; set; } - - /// - /// 备 注: - /// 默认值: - /// - [SugarColumn(ColumnName = "E3P1")] - public int? E3P1 { get; set; } - - /// - /// 备 注: - /// 默认值: - /// - [SugarColumn(ColumnName = "E3P2")] - public int? E3P2 { get; set; } - - /// - /// 备 注: - /// 默认值: - /// - [SugarColumn(ColumnName = "E3P3")] - public int? E3P3 { get; set; } - - /// - /// 备 注: - /// 默认值: - /// - [SugarColumn(ColumnName = "E3P4")] - public int? E3P4 { get; set; } - - /// - /// 备 注: - /// 默认值: - /// - [SugarColumn(ColumnName = "E3P5")] - public int? E3P5 { get; set; } - - /// - /// 备 注: - /// 默认值: - /// - [SugarColumn(ColumnName = "E3P6")] - public int? E3P6 { get; set; } - - /// - /// 备 注: - /// 默认值: - /// - [SugarColumn(ColumnName = "E3P7")] - public int? E3P7 { get; set; } - - /// - /// 备 注: - /// 默认值: - /// - [SugarColumn(ColumnName = "E3P8")] - public int? E3P8 { get; set; } - - /// - /// 备 注: - /// 默认值: - /// - [SugarColumn(ColumnName = "E3P9")] - public int? E3P9 { get; set; } - - /// - /// 备 注: - /// 默认值: - /// - [SugarColumn(ColumnName = "E3P10")] - public int? E3P10 { get; set; } - - /// - /// 备 注: - /// 默认值: - /// - [SugarColumn(ColumnName = "E3P11")] - public int? E3P11 { get; set; } - - /// - /// 备 注: - /// 默认值: - /// - [SugarColumn(ColumnName = "E3P12")] - public int? E3P12 { get; set; } - - /// - /// 备 注: - /// 默认值: - /// - [SugarColumn(ColumnName = "E3P13")] - public int? E3P13 { get; set; } - - /// - /// 备 注: - /// 默认值: - /// - [SugarColumn(ColumnName = "E3P14")] - public int? E3P14 { get; set; } - - /// - /// 备 注: - /// 默认值: - /// - [SugarColumn(ColumnName = "E3P15")] - public int? E3P15 { get; set; } + [SugarColumn(ColumnName = "spec_code")] + public int? SpecCode { get; set; } } diff --git a/HighWayIot.Repository/domain/ZxRecipePositionParaEntity.cs b/HighWayIot.Repository/domain/ZxRecipePositionParaEntity.cs new file mode 100644 index 0000000..76b93b0 --- /dev/null +++ b/HighWayIot.Repository/domain/ZxRecipePositionParaEntity.cs @@ -0,0 +1,128 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HighWayIot.Repository.domain +{ + /// + /// + /// + [SugarTable("zx_recipe_position_para")] + public class ZxRecipePositionParaEntity + { + /// + /// 备 注: + /// 默认值: + /// + [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)] + public int Id { get; set; } + + /// + /// 备 注: + /// 默认值: + /// + [SugarColumn(ColumnName = "E1")] + public int? E1 { get; set; } + + /// + /// 备 注: + /// 默认值: + /// + [SugarColumn(ColumnName = "E2")] + public int? E2 { get; set; } + + /// + /// 备 注: + /// 默认值: + /// + [SugarColumn(ColumnName = "E3")] + public int? E3 { get; set; } + + /// + /// 备 注: + /// 默认值: + /// + [SugarColumn(ColumnName = "E4")] + public int? E4 { get; set; } + + /// + /// 备 注: + /// 默认值: + /// + [SugarColumn(ColumnName = "E5")] + public int? E5 { get; set; } + + /// + /// 备 注: + /// 默认值: + /// + [SugarColumn(ColumnName = "E6")] + public int? E6 { get; set; } + + /// + /// 备 注: + /// 默认值: + /// + [SugarColumn(ColumnName = "E7")] + public int? E7 { get; set; } + + /// + /// 备 注: + /// 默认值: + /// + [SugarColumn(ColumnName = "E8")] + public int? E8 { get; set; } + + /// + /// 备 注: + /// 默认值: + /// + [SugarColumn(ColumnName = "E9")] + public int? E9 { get; set; } + + /// + /// 备 注: + /// 默认值: + /// + [SugarColumn(ColumnName = "E10")] + public int? E10 { get; set; } + + /// + /// 备 注: + /// 默认值: + /// + [SugarColumn(ColumnName = "E11")] + public int? E11 { get; set; } + + /// + /// 备 注: + /// 默认值: + /// + [SugarColumn(ColumnName = "E12")] + public int? E12 { get; set; } + + /// + /// 备 注: + /// 默认值: + /// + [SugarColumn(ColumnName = "E13")] + public int? E13 { get; set; } + + /// + /// 备 注: + /// 默认值: + /// + [SugarColumn(ColumnName = "E14")] + public int? E14 { get; set; } + + /// + /// 备 注: + /// 默认值: + /// + [SugarColumn(ColumnName = "E15")] + public int? E15 { get; set; } + } +} diff --git a/HighWayIot.Repository/service/ZxRecipeParaService.cs b/HighWayIot.Repository/service/ZxRecipeParaService.cs index 86ca071..18579e8 100644 --- a/HighWayIot.Repository/service/ZxRecipeParaService.cs +++ b/HighWayIot.Repository/service/ZxRecipeParaService.cs @@ -38,7 +38,7 @@ namespace HighWayIot.Repository.service } catch (Exception ex) { - log.Error("用户信息获取异常", ex); + log.Error("配方信息获取异常", ex); return null; } } @@ -51,12 +51,12 @@ namespace HighWayIot.Repository.service { try { - List entity = _repository.GetList(x => x.IsDeleted == false); + List entity = _repository.GetList(); return entity; } catch (Exception ex) { - log.Error("用户信息获取异常", ex); + log.Error("配方信息获取异常", ex); return null; } } @@ -70,12 +70,12 @@ namespace HighWayIot.Repository.service { try { - List entity = _repository.GetList(x => x.IsDeleted == false && x.RecipeCode == recipeCode); + List entity = _repository.GetList(x => x.RecipeCode == recipeCode); return entity; } catch (Exception ex) { - log.Error("用户信息获取异常", ex); + log.Error("配方信息获取异常", ex); return null; } } diff --git a/HighWayIot.Repository/service/ZxRecipePositionParaService.cs b/HighWayIot.Repository/service/ZxRecipePositionParaService.cs new file mode 100644 index 0000000..a5c4ad0 --- /dev/null +++ b/HighWayIot.Repository/service/ZxRecipePositionParaService.cs @@ -0,0 +1,118 @@ +using HighWayIot.Log4net; +using HighWayIot.Repository.domain; +using Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HighWayIot.Repository.service +{ + public class ZxRecipePositionParaService + { + private static readonly Lazy lazy = new Lazy(() => new ZxRecipePositionParaService()); + + public static ZxRecipePositionParaService Instance + { + get + { + return lazy.Value; + } + } + + private LogHelper log = LogHelper.Instance; + Repository _repository => new Repository("sqlserver"); + + /// + /// 查询工位配方字段信息 + /// + /// + public List GetRecipePositionParaInfos() + { + try + { + List entity = _repository.GetList(); + return entity; + } + catch (Exception ex) + { + log.Error("工位配方字段信息获取异常", ex); + return null; + } + } + + /// + /// 根据ID查询工位配方字段信息 + /// + /// 工位配方编号 + /// + public ZxRecipePositionParaEntity GetRecipePositionParaInfoById(int id) + { + try + { + ZxRecipePositionParaEntity entity = _repository.GetById(id); + return entity; + } + catch (Exception ex) + { + log.Error("工位配方字段信息获取异常", ex); + return new ZxRecipePositionParaEntity(); + } + } + + /// + /// 修改工位配方字段信息 + /// + /// + /// + public bool UpdateRecipePositionParaInfo(ZxRecipePositionParaEntity entity) + { + try + { + return _repository.Update(entity); + } + catch (Exception ex) + { + log.Error("工位配方字段信息修改异常", ex); + return false; + } + } + + /// + /// 添加工位配方字段信息 + /// + /// + /// + public bool InsertRecipePositionParaInfo(ZxRecipePositionParaEntity entity) + { + try + { + return _repository.Insert(entity); + } + catch (Exception ex) + { + log.Error("工位配方字段信息修改异常", ex); + return false; + } + } + + /// + /// ID删除工位配方字段信息 + /// + /// + /// + public bool DeleteRecipePositionParaInfoById(int id) + { + try + { + return _repository.DeleteById(id); + } + catch (Exception ex) + { + log.Error("工位配方字段信息删除异常", ex); + return false; + } + } + } +} diff --git a/HighWayIot.Repository/service/ZxRecipePositionParaService.cs.cs b/HighWayIot.Repository/service/ZxRecipePositionParaService.cs.cs new file mode 100644 index 0000000..bc028da --- /dev/null +++ b/HighWayIot.Repository/service/ZxRecipePositionParaService.cs.cs @@ -0,0 +1,138 @@ +using HighWayIot.Log4net; +using Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using HighWayIot.Repository.domain; + +namespace HighWayIot.Repository.service +{ + + public class ZxRecipePositionParaService + { + private static readonly Lazy lazy = new Lazy(() => new ZxRecipePositionParaService()); + + public static ZxRecipePositionParaService Instance + { + get + { + return lazy.Value; + } + } + + private LogHelper log = LogHelper.Instance; + Repository _repository => new Repository("sqlserver"); + + /// + /// 查询工位配方字段信息 + /// + /// + public List GetRecipePositionParaInfos() + { + try + { + List entity = _repository.GetList(); + return entity; + } + catch (Exception ex) + { + log.Error("工位配方信息获取异常", ex); + return null; + } + } + + /// + /// 查询工位配方字段信息 + /// + /// + public List GetRecipePositionParaInfoByRecipeCode() + { + try + { + List entity = _repository.GetList(); + return entity; + } + catch (Exception ex) + { + log.Error("工位配方信息获取异常", ex); + return null; + } + } + + /// + /// 根据工位配方号查询工位配方字段信息 + /// + /// 工位配方编号 + /// + public List GetRecipePositionParaInfoByRecipeCode(int positionCode) + { + try + { + List entity = _repository.GetList(x => x.ParaCode == positionCode); + return entity; + } + catch (Exception ex) + { + log.Error("工位配方信息获取异常", ex); + return null; + } + } + + /// + /// 修改工位配方字段信息 + /// + /// + /// + public bool UpdateRecipePositionParaInfo(ZxRecipePositionParaEntity entity) + { + try + { + return _repository.Update(entity); + } + catch (Exception ex) + { + log.Error("工位配方字段信息修改异常", ex); + return false; + } + } + + /// + /// 添加工位配方字段信息 + /// + /// + /// + public bool InsertRecipePositionParaInfo(ZxRecipePositionParaEntity entity) + { + try + { + return _repository.Insert(entity); + } + catch (Exception ex) + { + log.Error("工位配方字段信息修改异常", ex); + return false; + } + } + + /// + /// ID删除工位配方字段信息 + /// + /// + /// + public bool DeleteRecipePositionParaInfoById(int id) + { + try + { + return _repository.DeleteById(id); + } + catch (Exception ex) + { + log.Error("工位配方字段信息删除异常", ex); + return false; + } + } + + } +} diff --git a/HighWayIot.TouchSocket/TouchSocketTcpClient.cs b/HighWayIot.TouchSocket/TouchSocketTcpClient.cs index 1f645b7..84ffc31 100644 --- a/HighWayIot.TouchSocket/TouchSocketTcpClient.cs +++ b/HighWayIot.TouchSocket/TouchSocketTcpClient.cs @@ -53,15 +53,24 @@ namespace HighWayIot.TouchSocket };//有客户端断开连接 tcpClient.Received = async (client, e) => { + GetMessageAction.Invoke(e.ByteBlock.Span.ToArray(), client.IP); - }; + + }; //接收信号 await tcpClient.SetupAsync(new TouchSocketConfig() .SetRemoteIPHost($"{ip}:{port}") .ConfigureContainer(a => { a.AddConsoleLogger();//添加一个日志注入 - })); + }) + .ConfigurePlugins(a => + { + a.UseTcpReconnection() + .UsePolling(TimeSpan.FromSeconds(1)); + }) + ); + Result result = Result.Default; //不断尝试重连 do diff --git a/HighWayIot.Winform/Business/GeneralUtils.cs b/HighWayIot.Winform/Business/GeneralUtils.cs index b1e28de..ff219da 100644 --- a/HighWayIot.Winform/Business/GeneralUtils.cs +++ b/HighWayIot.Winform/Business/GeneralUtils.cs @@ -33,7 +33,7 @@ namespace HighWayIot.Winform.Business { return int.TryParse(text, out int result) ? (int?)result : null; } - + public static string IntEmptyOrToString(int? value) { if (value == null) diff --git a/HighWayIot.Winform/MainForm/BaseForm.Designer.cs b/HighWayIot.Winform/MainForm/BaseForm.Designer.cs index 4dddd92..ff84472 100644 --- a/HighWayIot.Winform/MainForm/BaseForm.Designer.cs +++ b/HighWayIot.Winform/MainForm/BaseForm.Designer.cs @@ -54,6 +54,8 @@ namespace HighWayIot.Winform.MainForm this.EquipMaterialBindingStripItem = new System.Windows.Forms.ToolStripMenuItem(); this.TestMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.DeviceDataManageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.RFIDParamManageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.DeviceParamManageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.UserControlTabs = new System.Windows.Forms.TabControl(); this.ClosePageButton = new System.Windows.Forms.Button(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); @@ -61,13 +63,13 @@ namespace HighWayIot.Winform.MainForm this.SplitLabel1 = new System.Windows.Forms.ToolStripStatusLabel(); this.StripLabel1 = new System.Windows.Forms.ToolStripStatusLabel(); this.NowLoginUserName = new System.Windows.Forms.ToolStripStatusLabel(); - this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel(); + this.LogInformation = new System.Windows.Forms.ToolStripStatusLabel(); this.StripLabel2 = new System.Windows.Forms.ToolStripStatusLabel(); this.TimeStripLabel = new System.Windows.Forms.ToolStripStatusLabel(); this.TimeDisplayTimer = new System.Windows.Forms.Timer(this.components); this.DataRefreshTimer = new System.Windows.Forms.Timer(this.components); - this.RFIDParamManageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.DeviceParamManageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.SplitLabel2 = new System.Windows.Forms.ToolStripStatusLabel(); + this.SplitLabel3 = new System.Windows.Forms.ToolStripStatusLabel(); this.MainMenu.SuspendLayout(); this.statusStrip1.SuspendLayout(); this.SuspendLayout(); @@ -87,7 +89,7 @@ namespace HighWayIot.Winform.MainForm this.MainMenu.Location = new System.Drawing.Point(0, 0); this.MainMenu.Name = "MainMenu"; this.MainMenu.Padding = new System.Windows.Forms.Padding(5, 1, 0, 1); - this.MainMenu.Size = new System.Drawing.Size(1904, 24); + this.MainMenu.Size = new System.Drawing.Size(1475, 24); this.MainMenu.TabIndex = 1; this.MainMenu.Text = "menuStrip1"; // @@ -236,6 +238,19 @@ namespace HighWayIot.Winform.MainForm this.DeviceDataManageToolStripMenuItem.Size = new System.Drawing.Size(68, 22); this.DeviceDataManageToolStripMenuItem.Text = "参数管理"; // + // RFIDParamManageToolStripMenuItem + // + this.RFIDParamManageToolStripMenuItem.Name = "RFIDParamManageToolStripMenuItem"; + this.RFIDParamManageToolStripMenuItem.Size = new System.Drawing.Size(151, 22); + this.RFIDParamManageToolStripMenuItem.Text = "RFID参数配置"; + this.RFIDParamManageToolStripMenuItem.Click += new System.EventHandler(this.StripMenuItemClick); + // + // DeviceParamManageToolStripMenuItem + // + this.DeviceParamManageToolStripMenuItem.Name = "DeviceParamManageToolStripMenuItem"; + this.DeviceParamManageToolStripMenuItem.Size = new System.Drawing.Size(151, 22); + this.DeviceParamManageToolStripMenuItem.Text = "设备参数配置"; + // // UserControlTabs // this.UserControlTabs.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) @@ -246,7 +261,7 @@ namespace HighWayIot.Winform.MainForm this.UserControlTabs.Margin = new System.Windows.Forms.Padding(0); this.UserControlTabs.Name = "UserControlTabs"; this.UserControlTabs.SelectedIndex = 0; - this.UserControlTabs.Size = new System.Drawing.Size(1905, 995); + this.UserControlTabs.Size = new System.Drawing.Size(1476, 817); this.UserControlTabs.TabIndex = 3; // // ClosePageButton @@ -256,7 +271,7 @@ namespace HighWayIot.Winform.MainForm this.ClosePageButton.Cursor = System.Windows.Forms.Cursors.Hand; this.ClosePageButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.ClosePageButton.ForeColor = System.Drawing.SystemColors.ButtonHighlight; - this.ClosePageButton.Location = new System.Drawing.Point(1884, 1); + this.ClosePageButton.Location = new System.Drawing.Point(1455, 1); this.ClosePageButton.Name = "ClosePageButton"; this.ClosePageButton.Size = new System.Drawing.Size(20, 20); this.ClosePageButton.TabIndex = 4; @@ -271,12 +286,14 @@ namespace HighWayIot.Winform.MainForm this.SplitLabel1, this.StripLabel1, this.NowLoginUserName, - this.toolStripStatusLabel1, + this.SplitLabel2, + this.LogInformation, + this.SplitLabel3, this.StripLabel2, this.TimeStripLabel}); - this.statusStrip1.Location = new System.Drawing.Point(0, 1019); + this.statusStrip1.Location = new System.Drawing.Point(0, 841); this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Size = new System.Drawing.Size(1904, 22); + this.statusStrip1.Size = new System.Drawing.Size(1475, 22); this.statusStrip1.TabIndex = 5; this.statusStrip1.Text = "statusStrip1"; // @@ -304,12 +321,12 @@ namespace HighWayIot.Winform.MainForm this.NowLoginUserName.Size = new System.Drawing.Size(31, 17); this.NowLoginUserName.Text = "N/A"; // - // toolStripStatusLabel1 + // LogInformation // - this.toolStripStatusLabel1.BorderSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right))); - this.toolStripStatusLabel1.Name = "toolStripStatusLabel1"; - this.toolStripStatusLabel1.Size = new System.Drawing.Size(1532, 17); - this.toolStripStatusLabel1.Spring = true; + this.LogInformation.BorderSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right))); + this.LogInformation.Name = "LogInformation"; + this.LogInformation.Size = new System.Drawing.Size(1064, 17); + this.LogInformation.Spring = true; // // StripLabel2 // @@ -332,25 +349,23 @@ namespace HighWayIot.Winform.MainForm // this.DataRefreshTimer.Tick += new System.EventHandler(this.DataRefreshTimer_Tick); // - // RFIDParamManageToolStripMenuItem + // SplitLabel2 // - this.RFIDParamManageToolStripMenuItem.Name = "RFIDParamManageToolStripMenuItem"; - this.RFIDParamManageToolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.RFIDParamManageToolStripMenuItem.Text = "RFID参数配置"; - this.RFIDParamManageToolStripMenuItem.Click += new System.EventHandler(this.StripMenuItemClick); + this.SplitLabel2.BorderSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Right; + this.SplitLabel2.Name = "SplitLabel2"; + this.SplitLabel2.Size = new System.Drawing.Size(4, 17); // - // DeviceParamManageToolStripMenuItem + // SplitLabel3 // - this.DeviceParamManageToolStripMenuItem.Name = "DeviceParamManageToolStripMenuItem"; - this.DeviceParamManageToolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.DeviceParamManageToolStripMenuItem.Text = "设备参数配置"; - this.RFIDParamManageToolStripMenuItem.Click += new System.EventHandler(this.StripMenuItemClick); + this.SplitLabel3.BorderSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Left; + this.SplitLabel3.Name = "SplitLabel3"; + this.SplitLabel3.Size = new System.Drawing.Size(4, 17); // // BaseForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1904, 1041); + this.ClientSize = new System.Drawing.Size(1475, 863); this.Controls.Add(this.statusStrip1); this.Controls.Add(this.ClosePageButton); this.Controls.Add(this.UserControlTabs); @@ -388,7 +403,7 @@ namespace HighWayIot.Winform.MainForm private ToolStripStatusLabel StripLabel1; private ToolStripStatusLabel SplitLabel1; private ToolStripStatusLabel NowLoginUserName; - private ToolStripStatusLabel toolStripStatusLabel1; + private ToolStripStatusLabel LogInformation; private ToolStripStatusLabel StripLabel2; private ToolStripStatusLabel TimeStripLabel; private Timer TimeDisplayTimer; @@ -405,5 +420,7 @@ namespace HighWayIot.Winform.MainForm private Timer DataRefreshTimer; private ToolStripMenuItem RFIDParamManageToolStripMenuItem; private ToolStripMenuItem DeviceParamManageToolStripMenuItem; + private ToolStripStatusLabel SplitLabel2; + private ToolStripStatusLabel SplitLabel3; } } \ No newline at end of file diff --git a/HighWayIot.Winform/UserControlPages/RecipeConfigPages/RecipeConfigPage.Designer.cs b/HighWayIot.Winform/UserControlPages/RecipeConfigPages/RecipeConfigPage.Designer.cs index eb0a885..aeee997 100644 --- a/HighWayIot.Winform/UserControlPages/RecipeConfigPages/RecipeConfigPage.Designer.cs +++ b/HighWayIot.Winform/UserControlPages/RecipeConfigPages/RecipeConfigPage.Designer.cs @@ -65,69 +65,74 @@ namespace HighWayIot.Winform.UserControlPages this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.groupBox3 = new System.Windows.Forms.GroupBox(); this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); - this.groupBox4 = new System.Windows.Forms.GroupBox(); - this.E1P4TextBox = new System.Windows.Forms.TextBox(); - this.label4 = new System.Windows.Forms.Label(); - this.E1P3TextBox = new System.Windows.Forms.TextBox(); - this.label3 = new System.Windows.Forms.Label(); - this.E1P2TextBox = new System.Windows.Forms.TextBox(); - this.label2 = new System.Windows.Forms.Label(); - this.E1P1TextBox = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); - this.groupBox5 = new System.Windows.Forms.GroupBox(); - this.E2P4TextBox = new System.Windows.Forms.TextBox(); - this.label5 = new System.Windows.Forms.Label(); - this.label8 = new System.Windows.Forms.Label(); - this.E2P3TextBox = new System.Windows.Forms.TextBox(); - this.E2P1TextBox = new System.Windows.Forms.TextBox(); - this.label6 = new System.Windows.Forms.Label(); - this.label7 = new System.Windows.Forms.Label(); - this.E2P2TextBox = new System.Windows.Forms.TextBox(); - this.groupBox6 = new System.Windows.Forms.GroupBox(); - this.E3P10TextBox = new System.Windows.Forms.TextBox(); - this.label22 = new System.Windows.Forms.Label(); - this.E3P15TextBox = new System.Windows.Forms.TextBox(); - this.label21 = new System.Windows.Forms.Label(); - this.E3P14TextBox = new System.Windows.Forms.TextBox(); - this.E3P11TextBox = new System.Windows.Forms.TextBox(); - this.label17 = new System.Windows.Forms.Label(); - this.label18 = new System.Windows.Forms.Label(); - this.E3P13TextBox = new System.Windows.Forms.TextBox(); - this.label19 = new System.Windows.Forms.Label(); - this.label20 = new System.Windows.Forms.Label(); - this.E3P12TextBox = new System.Windows.Forms.TextBox(); - this.E3P9TextBox = new System.Windows.Forms.TextBox(); - this.E3P6TextBox = new System.Windows.Forms.TextBox(); - this.label13 = new System.Windows.Forms.Label(); - this.label14 = new System.Windows.Forms.Label(); - this.E3P8TextBox = new System.Windows.Forms.TextBox(); - this.label15 = new System.Windows.Forms.Label(); - this.label16 = new System.Windows.Forms.Label(); - this.E3P7TextBox = new System.Windows.Forms.TextBox(); - this.E3P5CheckBox = new System.Windows.Forms.CheckBox(); - this.E3P4TextBox = new System.Windows.Forms.TextBox(); - this.E3P1TextBox = new System.Windows.Forms.TextBox(); - this.label9 = new System.Windows.Forms.Label(); - this.label12 = new System.Windows.Forms.Label(); - this.E3P3TextBox = new System.Windows.Forms.TextBox(); - this.label11 = new System.Windows.Forms.Label(); - this.label10 = new System.Windows.Forms.Label(); - this.E3P2TextBox = new System.Windows.Forms.TextBox(); this.groupBox7 = new System.Windows.Forms.GroupBox(); + this.PastePositionButton = new System.Windows.Forms.Button(); + this.CopyPositionButton = new System.Windows.Forms.Button(); + this.label16 = new System.Windows.Forms.Label(); + this.label17 = new System.Windows.Forms.Label(); this.NowCopyLabel = new System.Windows.Forms.Label(); this.label23 = new System.Windows.Forms.Label(); this.ClearCutBoradButton = new System.Windows.Forms.Button(); this.PasteParaButton = new System.Windows.Forms.Button(); this.CopyParaButton = new System.Windows.Forms.Button(); this.SaveParaButton = new System.Windows.Forms.Button(); + this.groupBox4 = new System.Windows.Forms.GroupBox(); + this.button2 = new System.Windows.Forms.Button(); + this.button1 = new System.Windows.Forms.Button(); + this.SpecNameLabel = new System.Windows.Forms.Label(); + this.SpecNoLabel = new System.Windows.Forms.Label(); + this.label19 = new System.Windows.Forms.Label(); + this.label18 = new System.Windows.Forms.Label(); + this.label11 = new System.Windows.Forms.Label(); + this.TireWeightTextBox = new System.Windows.Forms.TextBox(); + this.label12 = new System.Windows.Forms.Label(); + this.StopDistanceTextBox = new System.Windows.Forms.TextBox(); + this.label13 = new System.Windows.Forms.Label(); + this.SlowDistanceTextBox = new System.Windows.Forms.TextBox(); + this.label14 = new System.Windows.Forms.Label(); + this.LightWidthTextBox = new System.Windows.Forms.TextBox(); + this.label15 = new System.Windows.Forms.Label(); + this.RimInchTextBox = new System.Windows.Forms.TextBox(); + this.SideCutCheckBox = new System.Windows.Forms.CheckBox(); + this.WeightCalCheckBox = new System.Windows.Forms.CheckBox(); + this.PosititonIsUseCheckBox = new System.Windows.Forms.CheckBox(); + this.label6 = new System.Windows.Forms.Label(); + this.E10TextBox = new System.Windows.Forms.TextBox(); + this.label7 = new System.Windows.Forms.Label(); + this.E9TextBox = new System.Windows.Forms.TextBox(); + this.label8 = new System.Windows.Forms.Label(); + this.E8TextBox = new System.Windows.Forms.TextBox(); + this.label9 = new System.Windows.Forms.Label(); + this.E7TextBox = new System.Windows.Forms.TextBox(); + this.label10 = new System.Windows.Forms.Label(); + this.E6TextBox = new System.Windows.Forms.TextBox(); + this.label5 = new System.Windows.Forms.Label(); + this.E5TextBox = new System.Windows.Forms.TextBox(); + this.label4 = new System.Windows.Forms.Label(); + this.E4TextBox = new System.Windows.Forms.TextBox(); + this.label3 = new System.Windows.Forms.Label(); + this.E3TextBox = new System.Windows.Forms.TextBox(); + this.label2 = new System.Windows.Forms.Label(); + this.E2TextBox = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.E1TextBox = new System.Windows.Forms.TextBox(); + this.SideRadioButtonPanel = new System.Windows.Forms.Panel(); + this.SideRadioButton = new System.Windows.Forms.RadioButton(); + this.BodyRadioButton = new System.Windows.Forms.RadioButton(); + this.PositionRadioButtonPanel = new System.Windows.Forms.Panel(); + this.Position5RadioButton = new System.Windows.Forms.RadioButton(); + this.Position4RadioButton = new System.Windows.Forms.RadioButton(); + this.Position3RadioButton = new System.Windows.Forms.RadioButton(); + this.Position2RadioButton = new System.Windows.Forms.RadioButton(); + this.Position1RadioButton = new System.Windows.Forms.RadioButton(); this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); this.panel1 = new System.Windows.Forms.Panel(); + this.label27 = new System.Windows.Forms.Label(); this.label24 = new System.Windows.Forms.Label(); this.RefreshWeightButton = new System.Windows.Forms.Button(); this.UpdateWeightButton = new System.Windows.Forms.Button(); this.AddWeightButton = new System.Windows.Forms.Button(); this.DeleteWeightButton = new System.Windows.Forms.Button(); - this.label27 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.WeightDataGridView)).BeginInit(); this.ButtonPanel.SuspendLayout(); this.groupBox1.SuspendLayout(); @@ -136,10 +141,10 @@ namespace HighWayIot.Winform.UserControlPages this.tableLayoutPanel1.SuspendLayout(); this.groupBox3.SuspendLayout(); this.tableLayoutPanel3.SuspendLayout(); - this.groupBox4.SuspendLayout(); - this.groupBox5.SuspendLayout(); - this.groupBox6.SuspendLayout(); this.groupBox7.SuspendLayout(); + this.groupBox4.SuspendLayout(); + this.SideRadioButtonPanel.SuspendLayout(); + this.PositionRadioButtonPanel.SuspendLayout(); this.tableLayoutPanel2.SuspendLayout(); this.panel1.SuspendLayout(); this.SuspendLayout(); @@ -487,467 +492,25 @@ namespace HighWayIot.Winform.UserControlPages // // tableLayoutPanel3 // - this.tableLayoutPanel3.ColumnCount = 4; - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 22.22222F)); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 22.22222F)); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 55.55556F)); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 185F)); - this.tableLayoutPanel3.Controls.Add(this.groupBox4, 0, 0); - this.tableLayoutPanel3.Controls.Add(this.groupBox5, 1, 0); - this.tableLayoutPanel3.Controls.Add(this.groupBox6, 2, 0); - this.tableLayoutPanel3.Controls.Add(this.groupBox7, 3, 0); + this.tableLayoutPanel3.ColumnCount = 2; + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 300F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel3.Controls.Add(this.groupBox7, 0, 0); + this.tableLayoutPanel3.Controls.Add(this.groupBox4, 1, 0); this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel3.Location = new System.Drawing.Point(3, 17); this.tableLayoutPanel3.Name = "tableLayoutPanel3"; this.tableLayoutPanel3.RowCount = 1; this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 170F)); this.tableLayoutPanel3.Size = new System.Drawing.Size(1767, 170); this.tableLayoutPanel3.TabIndex = 0; // - // groupBox4 - // - this.groupBox4.Controls.Add(this.E1P4TextBox); - this.groupBox4.Controls.Add(this.label4); - this.groupBox4.Controls.Add(this.E1P3TextBox); - this.groupBox4.Controls.Add(this.label3); - this.groupBox4.Controls.Add(this.E1P2TextBox); - this.groupBox4.Controls.Add(this.label2); - this.groupBox4.Controls.Add(this.E1P1TextBox); - this.groupBox4.Controls.Add(this.label1); - this.groupBox4.Dock = System.Windows.Forms.DockStyle.Fill; - this.groupBox4.Location = new System.Drawing.Point(0, 0); - this.groupBox4.Margin = new System.Windows.Forms.Padding(0); - this.groupBox4.Name = "groupBox4"; - this.groupBox4.Size = new System.Drawing.Size(351, 170); - this.groupBox4.TabIndex = 0; - this.groupBox4.TabStop = false; - this.groupBox4.Text = "开炼机#1参数"; - // - // E1P4TextBox - // - this.E1P4TextBox.Location = new System.Drawing.Point(146, 101); - this.E1P4TextBox.Name = "E1P4TextBox"; - this.E1P4TextBox.Size = new System.Drawing.Size(95, 21); - this.E1P4TextBox.TabIndex = 7; - // - // label4 - // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(27, 104); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(113, 12); - this.label4.TabIndex = 6; - this.label4.Text = "1#工位胶片贴合时间"; - // - // E1P3TextBox - // - this.E1P3TextBox.Location = new System.Drawing.Point(146, 74); - this.E1P3TextBox.Name = "E1P3TextBox"; - this.E1P3TextBox.Size = new System.Drawing.Size(95, 21); - this.E1P3TextBox.TabIndex = 5; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(15, 78); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(125, 12); - this.label3.TabIndex = 4; - this.label3.Text = "1#工位贴合末横裁延时"; - // - // E1P2TextBox - // - this.E1P2TextBox.Location = new System.Drawing.Point(146, 47); - this.E1P2TextBox.Name = "E1P2TextBox"; - this.E1P2TextBox.Size = new System.Drawing.Size(95, 21); - this.E1P2TextBox.TabIndex = 3; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(15, 51); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(125, 12); - this.label2.TabIndex = 2; - this.label2.Text = "1#工位贴合鼓脱开延时"; - // - // E1P1TextBox - // - this.E1P1TextBox.Location = new System.Drawing.Point(146, 20); - this.E1P1TextBox.Name = "E1P1TextBox"; - this.E1P1TextBox.Size = new System.Drawing.Size(95, 21); - this.E1P1TextBox.TabIndex = 1; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(15, 24); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(125, 12); - this.label1.TabIndex = 0; - this.label1.Text = "1#工位贴合鼓到位延时"; - // - // groupBox5 - // - this.groupBox5.Controls.Add(this.E2P4TextBox); - this.groupBox5.Controls.Add(this.label5); - this.groupBox5.Controls.Add(this.label8); - this.groupBox5.Controls.Add(this.E2P3TextBox); - this.groupBox5.Controls.Add(this.E2P1TextBox); - this.groupBox5.Controls.Add(this.label6); - this.groupBox5.Controls.Add(this.label7); - this.groupBox5.Controls.Add(this.E2P2TextBox); - this.groupBox5.Dock = System.Windows.Forms.DockStyle.Fill; - this.groupBox5.Location = new System.Drawing.Point(351, 0); - this.groupBox5.Margin = new System.Windows.Forms.Padding(0); - this.groupBox5.Name = "groupBox5"; - this.groupBox5.Size = new System.Drawing.Size(351, 170); - this.groupBox5.TabIndex = 1; - this.groupBox5.TabStop = false; - this.groupBox5.Text = "开炼机#2参数"; - // - // E2P4TextBox - // - this.E2P4TextBox.Location = new System.Drawing.Point(147, 102); - this.E2P4TextBox.Name = "E2P4TextBox"; - this.E2P4TextBox.Size = new System.Drawing.Size(95, 21); - this.E2P4TextBox.TabIndex = 15; - // - // label5 - // - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(28, 105); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(113, 12); - this.label5.TabIndex = 14; - this.label5.Text = "2#工位胶片贴合时间"; - // - // label8 - // - this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(16, 25); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(125, 12); - this.label8.TabIndex = 8; - this.label8.Text = "2#工位贴合鼓到位延时"; - // - // E2P3TextBox - // - this.E2P3TextBox.Location = new System.Drawing.Point(147, 75); - this.E2P3TextBox.Name = "E2P3TextBox"; - this.E2P3TextBox.Size = new System.Drawing.Size(95, 21); - this.E2P3TextBox.TabIndex = 13; - // - // E2P1TextBox - // - this.E2P1TextBox.Location = new System.Drawing.Point(147, 21); - this.E2P1TextBox.Name = "E2P1TextBox"; - this.E2P1TextBox.Size = new System.Drawing.Size(95, 21); - this.E2P1TextBox.TabIndex = 9; - // - // label6 - // - this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(16, 79); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(125, 12); - this.label6.TabIndex = 12; - this.label6.Text = "2#工位贴合末横裁延时"; - // - // label7 - // - this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(16, 52); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(125, 12); - this.label7.TabIndex = 10; - this.label7.Text = "2#工位贴合鼓脱开延时"; - // - // E2P2TextBox - // - this.E2P2TextBox.Location = new System.Drawing.Point(147, 48); - this.E2P2TextBox.Name = "E2P2TextBox"; - this.E2P2TextBox.Size = new System.Drawing.Size(95, 21); - this.E2P2TextBox.TabIndex = 11; - // - // groupBox6 - // - this.groupBox6.Controls.Add(this.E3P10TextBox); - this.groupBox6.Controls.Add(this.label22); - this.groupBox6.Controls.Add(this.E3P15TextBox); - this.groupBox6.Controls.Add(this.label21); - this.groupBox6.Controls.Add(this.E3P14TextBox); - this.groupBox6.Controls.Add(this.E3P11TextBox); - this.groupBox6.Controls.Add(this.label17); - this.groupBox6.Controls.Add(this.label18); - this.groupBox6.Controls.Add(this.E3P13TextBox); - this.groupBox6.Controls.Add(this.label19); - this.groupBox6.Controls.Add(this.label20); - this.groupBox6.Controls.Add(this.E3P12TextBox); - this.groupBox6.Controls.Add(this.E3P9TextBox); - this.groupBox6.Controls.Add(this.E3P6TextBox); - this.groupBox6.Controls.Add(this.label13); - this.groupBox6.Controls.Add(this.label14); - this.groupBox6.Controls.Add(this.E3P8TextBox); - this.groupBox6.Controls.Add(this.label15); - this.groupBox6.Controls.Add(this.label16); - this.groupBox6.Controls.Add(this.E3P7TextBox); - this.groupBox6.Controls.Add(this.E3P5CheckBox); - this.groupBox6.Controls.Add(this.E3P4TextBox); - this.groupBox6.Controls.Add(this.E3P1TextBox); - this.groupBox6.Controls.Add(this.label9); - this.groupBox6.Controls.Add(this.label12); - this.groupBox6.Controls.Add(this.E3P3TextBox); - this.groupBox6.Controls.Add(this.label11); - this.groupBox6.Controls.Add(this.label10); - this.groupBox6.Controls.Add(this.E3P2TextBox); - this.groupBox6.Dock = System.Windows.Forms.DockStyle.Fill; - this.groupBox6.Location = new System.Drawing.Point(702, 0); - this.groupBox6.Margin = new System.Windows.Forms.Padding(0); - this.groupBox6.Name = "groupBox6"; - this.groupBox6.Size = new System.Drawing.Size(878, 170); - this.groupBox6.TabIndex = 2; - this.groupBox6.TabStop = false; - this.groupBox6.Text = "开炼机#3参数"; - // - // E3P10TextBox - // - this.E3P10TextBox.Location = new System.Drawing.Point(380, 129); - this.E3P10TextBox.Name = "E3P10TextBox"; - this.E3P10TextBox.Size = new System.Drawing.Size(95, 21); - this.E3P10TextBox.TabIndex = 44; - // - // label22 - // - this.label22.AutoSize = true; - this.label22.Location = new System.Drawing.Point(297, 133); - this.label22.Name = "label22"; - this.label22.Size = new System.Drawing.Size(77, 12); - this.label22.TabIndex = 43; - this.label22.Text = "压合进给速度"; - // - // E3P15TextBox - // - this.E3P15TextBox.Location = new System.Drawing.Point(590, 128); - this.E3P15TextBox.Name = "E3P15TextBox"; - this.E3P15TextBox.Size = new System.Drawing.Size(95, 21); - this.E3P15TextBox.TabIndex = 42; - // - // label21 - // - this.label21.AutoSize = true; - this.label21.Location = new System.Drawing.Point(483, 132); - this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(101, 12); - this.label21.TabIndex = 41; - this.label21.Text = "进退准备位置速度"; - // - // E3P14TextBox - // - this.E3P14TextBox.Location = new System.Drawing.Point(590, 101); - this.E3P14TextBox.Name = "E3P14TextBox"; - this.E3P14TextBox.Size = new System.Drawing.Size(95, 21); - this.E3P14TextBox.TabIndex = 40; - // - // E3P11TextBox - // - this.E3P11TextBox.Location = new System.Drawing.Point(590, 20); - this.E3P11TextBox.Name = "E3P11TextBox"; - this.E3P11TextBox.Size = new System.Drawing.Size(95, 21); - this.E3P11TextBox.TabIndex = 34; - // - // label17 - // - this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(483, 105); - this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(101, 12); - this.label17.TabIndex = 39; - this.label17.Text = "分合准备位置速度"; - // - // label18 - // - this.label18.AutoSize = true; - this.label18.Location = new System.Drawing.Point(507, 24); - this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(77, 12); - this.label18.TabIndex = 33; - this.label18.Text = "包边压合起点"; - // - // E3P13TextBox - // - this.E3P13TextBox.Location = new System.Drawing.Point(590, 74); - this.E3P13TextBox.Name = "E3P13TextBox"; - this.E3P13TextBox.Size = new System.Drawing.Size(95, 21); - this.E3P13TextBox.TabIndex = 38; - // - // label19 - // - this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(507, 51); - this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(77, 12); - this.label19.TabIndex = 35; - this.label19.Text = "包边压合终点"; - // - // label20 - // - this.label20.AutoSize = true; - this.label20.Location = new System.Drawing.Point(507, 78); - this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(77, 12); - this.label20.TabIndex = 37; - this.label20.Text = "包边压合宽度"; - // - // E3P12TextBox - // - this.E3P12TextBox.Location = new System.Drawing.Point(590, 47); - this.E3P12TextBox.Name = "E3P12TextBox"; - this.E3P12TextBox.Size = new System.Drawing.Size(95, 21); - this.E3P12TextBox.TabIndex = 36; - // - // E3P9TextBox - // - this.E3P9TextBox.Location = new System.Drawing.Point(380, 102); - this.E3P9TextBox.Name = "E3P9TextBox"; - this.E3P9TextBox.Size = new System.Drawing.Size(95, 21); - this.E3P9TextBox.TabIndex = 32; - // - // E3P6TextBox - // - this.E3P6TextBox.Location = new System.Drawing.Point(380, 21); - this.E3P6TextBox.Name = "E3P6TextBox"; - this.E3P6TextBox.Size = new System.Drawing.Size(95, 21); - this.E3P6TextBox.TabIndex = 26; - // - // label13 - // - this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(273, 105); - this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(101, 12); - this.label13.TabIndex = 31; - this.label13.Text = "3#包边鼓脱开延时"; - // - // label14 - // - this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(261, 25); - this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(113, 12); - this.label14.TabIndex = 25; - this.label14.Text = "3#工位包边贴合时间"; - // - // E3P8TextBox - // - this.E3P8TextBox.Location = new System.Drawing.Point(380, 75); - this.E3P8TextBox.Name = "E3P8TextBox"; - this.E3P8TextBox.Size = new System.Drawing.Size(95, 21); - this.E3P8TextBox.TabIndex = 30; - // - // label15 - // - this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(249, 52); - this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(125, 12); - this.label15.TabIndex = 27; - this.label15.Text = "3#工位包边末横裁延时"; - // - // label16 - // - this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(273, 79); - this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(101, 12); - this.label16.TabIndex = 29; - this.label16.Text = "3#包边工作位延时"; - // - // E3P7TextBox - // - this.E3P7TextBox.Location = new System.Drawing.Point(380, 48); - this.E3P7TextBox.Name = "E3P7TextBox"; - this.E3P7TextBox.Size = new System.Drawing.Size(95, 21); - this.E3P7TextBox.TabIndex = 28; - // - // E3P5CheckBox - // - this.E3P5CheckBox.AutoSize = true; - this.E3P5CheckBox.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.E3P5CheckBox.Location = new System.Drawing.Point(151, 128); - this.E3P5CheckBox.Name = "E3P5CheckBox"; - this.E3P5CheckBox.Size = new System.Drawing.Size(90, 20); - this.E3P5CheckBox.TabIndex = 24; - this.E3P5CheckBox.Text = "包边压合"; - this.E3P5CheckBox.UseVisualStyleBackColor = true; - // - // E3P4TextBox - // - this.E3P4TextBox.Location = new System.Drawing.Point(148, 101); - this.E3P4TextBox.Name = "E3P4TextBox"; - this.E3P4TextBox.Size = new System.Drawing.Size(95, 21); - this.E3P4TextBox.TabIndex = 23; - // - // E3P1TextBox - // - this.E3P1TextBox.Location = new System.Drawing.Point(148, 20); - this.E3P1TextBox.Name = "E3P1TextBox"; - this.E3P1TextBox.Size = new System.Drawing.Size(95, 21); - this.E3P1TextBox.TabIndex = 17; - // - // label9 - // - this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(29, 104); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(113, 12); - this.label9.TabIndex = 22; - this.label9.Text = "3#工位胶片贴合时间"; - // - // label12 - // - this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(17, 24); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(125, 12); - this.label12.TabIndex = 16; - this.label12.Text = "3#工位贴合鼓到位延时"; - // - // E3P3TextBox - // - this.E3P3TextBox.Location = new System.Drawing.Point(148, 74); - this.E3P3TextBox.Name = "E3P3TextBox"; - this.E3P3TextBox.Size = new System.Drawing.Size(95, 21); - this.E3P3TextBox.TabIndex = 21; - // - // label11 - // - this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(17, 51); - this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(125, 12); - this.label11.TabIndex = 18; - this.label11.Text = "3#工位贴合鼓脱开延时"; - // - // label10 - // - this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(17, 78); - this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(125, 12); - this.label10.TabIndex = 20; - this.label10.Text = "3#工位贴合末横裁延时"; - // - // E3P2TextBox - // - this.E3P2TextBox.Location = new System.Drawing.Point(148, 47); - this.E3P2TextBox.Name = "E3P2TextBox"; - this.E3P2TextBox.Size = new System.Drawing.Size(95, 21); - this.E3P2TextBox.TabIndex = 19; - // // groupBox7 // + this.groupBox7.Controls.Add(this.PastePositionButton); + this.groupBox7.Controls.Add(this.CopyPositionButton); + this.groupBox7.Controls.Add(this.label16); + this.groupBox7.Controls.Add(this.label17); this.groupBox7.Controls.Add(this.NowCopyLabel); this.groupBox7.Controls.Add(this.label23); this.groupBox7.Controls.Add(this.ClearCutBoradButton); @@ -955,14 +518,52 @@ namespace HighWayIot.Winform.UserControlPages this.groupBox7.Controls.Add(this.CopyParaButton); this.groupBox7.Controls.Add(this.SaveParaButton); this.groupBox7.Dock = System.Windows.Forms.DockStyle.Fill; - this.groupBox7.Location = new System.Drawing.Point(1580, 0); + this.groupBox7.Location = new System.Drawing.Point(0, 0); this.groupBox7.Margin = new System.Windows.Forms.Padding(0); this.groupBox7.Name = "groupBox7"; - this.groupBox7.Size = new System.Drawing.Size(187, 170); + this.groupBox7.Size = new System.Drawing.Size(300, 170); this.groupBox7.TabIndex = 3; this.groupBox7.TabStop = false; this.groupBox7.Text = "参数操作"; // + // PastePositionButton + // + this.PastePositionButton.Font = new System.Drawing.Font("宋体", 12F); + this.PastePositionButton.Location = new System.Drawing.Point(172, 69); + this.PastePositionButton.Name = "PastePositionButton"; + this.PastePositionButton.Size = new System.Drawing.Size(122, 43); + this.PastePositionButton.TabIndex = 9; + this.PastePositionButton.Text = "粘贴工位参数"; + this.PastePositionButton.UseVisualStyleBackColor = true; + // + // CopyPositionButton + // + this.CopyPositionButton.Font = new System.Drawing.Font("宋体", 12F); + this.CopyPositionButton.Location = new System.Drawing.Point(171, 20); + this.CopyPositionButton.Name = "CopyPositionButton"; + this.CopyPositionButton.Size = new System.Drawing.Size(122, 43); + this.CopyPositionButton.TabIndex = 8; + this.CopyPositionButton.Text = "复制工位参数"; + this.CopyPositionButton.UseVisualStyleBackColor = true; + // + // label16 + // + this.label16.AutoSize = true; + this.label16.Location = new System.Drawing.Point(89, 142); + this.label16.Name = "label16"; + this.label16.Size = new System.Drawing.Size(23, 12); + this.label16.TabIndex = 7; + this.label16.Text = "N/A"; + // + // label17 + // + this.label17.AutoSize = true; + this.label17.Location = new System.Drawing.Point(89, 118); + this.label17.Name = "label17"; + this.label17.Size = new System.Drawing.Size(77, 12); + this.label17.TabIndex = 6; + this.label17.Text = "当前复制工位"; + // // NowCopyLabel // this.NowCopyLabel.AutoSize = true; @@ -979,38 +580,38 @@ namespace HighWayIot.Winform.UserControlPages this.label23.Name = "label23"; this.label23.Size = new System.Drawing.Size(77, 12); this.label23.TabIndex = 4; - this.label23.Text = "当前复制编号"; + this.label23.Text = "当前复制配方"; // // ClearCutBoradButton // this.ClearCutBoradButton.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.ClearCutBoradButton.Location = new System.Drawing.Point(88, 118); + this.ClearCutBoradButton.Location = new System.Drawing.Point(172, 118); this.ClearCutBoradButton.Name = "ClearCutBoradButton"; - this.ClearCutBoradButton.Size = new System.Drawing.Size(76, 43); + this.ClearCutBoradButton.Size = new System.Drawing.Size(122, 43); this.ClearCutBoradButton.TabIndex = 3; - this.ClearCutBoradButton.Text = "清除"; + this.ClearCutBoradButton.Text = "清除复制信息"; this.ClearCutBoradButton.UseVisualStyleBackColor = true; this.ClearCutBoradButton.Click += new System.EventHandler(this.ClearCutBoradButton_Click); // // PasteParaButton // - this.PasteParaButton.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.PasteParaButton.Font = new System.Drawing.Font("宋体", 9F); this.PasteParaButton.Location = new System.Drawing.Point(88, 69); this.PasteParaButton.Name = "PasteParaButton"; this.PasteParaButton.Size = new System.Drawing.Size(76, 43); this.PasteParaButton.TabIndex = 2; - this.PasteParaButton.Text = "粘贴"; + this.PasteParaButton.Text = "粘贴配方"; this.PasteParaButton.UseVisualStyleBackColor = true; this.PasteParaButton.Click += new System.EventHandler(this.PasteParaButton_Click); // // CopyParaButton // - this.CopyParaButton.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.CopyParaButton.Font = new System.Drawing.Font("宋体", 9F); this.CopyParaButton.Location = new System.Drawing.Point(6, 69); this.CopyParaButton.Name = "CopyParaButton"; this.CopyParaButton.Size = new System.Drawing.Size(76, 43); this.CopyParaButton.TabIndex = 1; - this.CopyParaButton.Text = "复制"; + this.CopyParaButton.Text = "复制配方"; this.CopyParaButton.UseVisualStyleBackColor = true; this.CopyParaButton.Click += new System.EventHandler(this.CopyParaButton_Click); // @@ -1025,6 +626,500 @@ namespace HighWayIot.Winform.UserControlPages this.SaveParaButton.UseVisualStyleBackColor = true; this.SaveParaButton.Click += new System.EventHandler(this.SaveParaButton_Click); // + // groupBox4 + // + this.groupBox4.Controls.Add(this.button2); + this.groupBox4.Controls.Add(this.button1); + this.groupBox4.Controls.Add(this.SpecNameLabel); + this.groupBox4.Controls.Add(this.SpecNoLabel); + this.groupBox4.Controls.Add(this.label19); + this.groupBox4.Controls.Add(this.label18); + this.groupBox4.Controls.Add(this.label11); + this.groupBox4.Controls.Add(this.TireWeightTextBox); + this.groupBox4.Controls.Add(this.label12); + this.groupBox4.Controls.Add(this.StopDistanceTextBox); + this.groupBox4.Controls.Add(this.label13); + this.groupBox4.Controls.Add(this.SlowDistanceTextBox); + this.groupBox4.Controls.Add(this.label14); + this.groupBox4.Controls.Add(this.LightWidthTextBox); + this.groupBox4.Controls.Add(this.label15); + this.groupBox4.Controls.Add(this.RimInchTextBox); + this.groupBox4.Controls.Add(this.SideCutCheckBox); + this.groupBox4.Controls.Add(this.WeightCalCheckBox); + this.groupBox4.Controls.Add(this.PosititonIsUseCheckBox); + this.groupBox4.Controls.Add(this.label6); + this.groupBox4.Controls.Add(this.E10TextBox); + this.groupBox4.Controls.Add(this.label7); + this.groupBox4.Controls.Add(this.E9TextBox); + this.groupBox4.Controls.Add(this.label8); + this.groupBox4.Controls.Add(this.E8TextBox); + this.groupBox4.Controls.Add(this.label9); + this.groupBox4.Controls.Add(this.E7TextBox); + this.groupBox4.Controls.Add(this.label10); + this.groupBox4.Controls.Add(this.E6TextBox); + this.groupBox4.Controls.Add(this.label5); + this.groupBox4.Controls.Add(this.E5TextBox); + this.groupBox4.Controls.Add(this.label4); + this.groupBox4.Controls.Add(this.E4TextBox); + this.groupBox4.Controls.Add(this.label3); + this.groupBox4.Controls.Add(this.E3TextBox); + this.groupBox4.Controls.Add(this.label2); + this.groupBox4.Controls.Add(this.E2TextBox); + this.groupBox4.Controls.Add(this.label1); + this.groupBox4.Controls.Add(this.E1TextBox); + this.groupBox4.Controls.Add(this.SideRadioButtonPanel); + this.groupBox4.Controls.Add(this.PositionRadioButtonPanel); + this.groupBox4.Dock = System.Windows.Forms.DockStyle.Fill; + this.groupBox4.Location = new System.Drawing.Point(300, 0); + this.groupBox4.Margin = new System.Windows.Forms.Padding(0); + this.groupBox4.Name = "groupBox4"; + this.groupBox4.Size = new System.Drawing.Size(1467, 170); + this.groupBox4.TabIndex = 4; + this.groupBox4.TabStop = false; + this.groupBox4.Text = "参数设置"; + // + // button2 + // + this.button2.Font = new System.Drawing.Font("宋体", 12F); + this.button2.Location = new System.Drawing.Point(1079, 99); + this.button2.Name = "button2"; + this.button2.Size = new System.Drawing.Size(122, 43); + this.button2.TabIndex = 48; + this.button2.Text = "下发到PLC"; + this.button2.UseVisualStyleBackColor = true; + // + // button1 + // + this.button1.Font = new System.Drawing.Font("宋体", 12F); + this.button1.Location = new System.Drawing.Point(939, 99); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(122, 43); + this.button1.TabIndex = 47; + this.button1.Text = "从PLC读取"; + this.button1.UseVisualStyleBackColor = true; + // + // SpecNameLabel + // + this.SpecNameLabel.AutoSize = true; + this.SpecNameLabel.Font = new System.Drawing.Font("宋体", 13F); + this.SpecNameLabel.Location = new System.Drawing.Point(1040, 52); + this.SpecNameLabel.Name = "SpecNameLabel"; + this.SpecNameLabel.Size = new System.Drawing.Size(35, 18); + this.SpecNameLabel.TabIndex = 46; + this.SpecNameLabel.Text = "N/A"; + // + // SpecNoLabel + // + this.SpecNoLabel.AutoSize = true; + this.SpecNoLabel.Font = new System.Drawing.Font("宋体", 13F); + this.SpecNoLabel.Location = new System.Drawing.Point(1040, 26); + this.SpecNoLabel.Name = "SpecNoLabel"; + this.SpecNoLabel.Size = new System.Drawing.Size(35, 18); + this.SpecNoLabel.TabIndex = 45; + this.SpecNoLabel.Text = "N/A"; + // + // label19 + // + this.label19.AutoSize = true; + this.label19.Font = new System.Drawing.Font("宋体", 13F); + this.label19.Location = new System.Drawing.Point(936, 52); + this.label19.Name = "label19"; + this.label19.Size = new System.Drawing.Size(98, 18); + this.label19.TabIndex = 44; + this.label19.Text = "规格名称："; + // + // label18 + // + this.label18.AutoSize = true; + this.label18.Font = new System.Drawing.Font("宋体", 13F); + this.label18.Location = new System.Drawing.Point(954, 26); + this.label18.Name = "label18"; + this.label18.Size = new System.Drawing.Size(80, 18); + this.label18.TabIndex = 43; + this.label18.Text = "规格号："; + // + // label11 + // + this.label11.AutoSize = true; + this.label11.Location = new System.Drawing.Point(743, 136); + this.label11.Name = "label11"; + this.label11.Size = new System.Drawing.Size(53, 12); + this.label11.TabIndex = 41; + this.label11.Text = "胎体重量"; + // + // TireWeightTextBox + // + this.TireWeightTextBox.Location = new System.Drawing.Point(802, 132); + this.TireWeightTextBox.Name = "TireWeightTextBox"; + this.TireWeightTextBox.Size = new System.Drawing.Size(100, 21); + this.TireWeightTextBox.TabIndex = 40; + // + // label12 + // + this.label12.AutoSize = true; + this.label12.Location = new System.Drawing.Point(743, 109); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(53, 12); + this.label12.TabIndex = 39; + this.label12.Text = "停止距离"; + // + // StopDistanceTextBox + // + this.StopDistanceTextBox.Location = new System.Drawing.Point(802, 105); + this.StopDistanceTextBox.Name = "StopDistanceTextBox"; + this.StopDistanceTextBox.Size = new System.Drawing.Size(100, 21); + this.StopDistanceTextBox.TabIndex = 38; + // + // label13 + // + this.label13.AutoSize = true; + this.label13.Location = new System.Drawing.Point(743, 83); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(53, 12); + this.label13.TabIndex = 37; + this.label13.Text = "减速距离"; + // + // SlowDistanceTextBox + // + this.SlowDistanceTextBox.Location = new System.Drawing.Point(802, 78); + this.SlowDistanceTextBox.Name = "SlowDistanceTextBox"; + this.SlowDistanceTextBox.Size = new System.Drawing.Size(100, 21); + this.SlowDistanceTextBox.TabIndex = 36; + // + // label14 + // + this.label14.AutoSize = true; + this.label14.Location = new System.Drawing.Point(743, 55); + this.label14.Name = "label14"; + this.label14.Size = new System.Drawing.Size(53, 12); + this.label14.TabIndex = 35; + this.label14.Text = "灯标宽度"; + // + // LightWidthTextBox + // + this.LightWidthTextBox.Location = new System.Drawing.Point(802, 51); + this.LightWidthTextBox.Name = "LightWidthTextBox"; + this.LightWidthTextBox.Size = new System.Drawing.Size(100, 21); + this.LightWidthTextBox.TabIndex = 34; + // + // label15 + // + this.label15.AutoSize = true; + this.label15.Location = new System.Drawing.Point(743, 28); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(53, 12); + this.label15.TabIndex = 33; + this.label15.Text = "钢圈尺寸"; + // + // RimInchTextBox + // + this.RimInchTextBox.Location = new System.Drawing.Point(802, 24); + this.RimInchTextBox.Name = "RimInchTextBox"; + this.RimInchTextBox.Size = new System.Drawing.Size(100, 21); + this.RimInchTextBox.TabIndex = 32; + // + // SideCutCheckBox + // + this.SideCutCheckBox.AutoSize = true; + this.SideCutCheckBox.Location = new System.Drawing.Point(641, 54); + this.SideCutCheckBox.Name = "SideCutCheckBox"; + this.SideCutCheckBox.Size = new System.Drawing.Size(72, 16); + this.SideCutCheckBox.TabIndex = 31; + this.SideCutCheckBox.Text = "包边裁切"; + this.SideCutCheckBox.UseVisualStyleBackColor = true; + // + // WeightCalCheckBox + // + this.WeightCalCheckBox.AutoSize = true; + this.WeightCalCheckBox.Location = new System.Drawing.Point(641, 108); + this.WeightCalCheckBox.Name = "WeightCalCheckBox"; + this.WeightCalCheckBox.Size = new System.Drawing.Size(72, 16); + this.WeightCalCheckBox.TabIndex = 30; + this.WeightCalCheckBox.Text = "称重校准"; + this.WeightCalCheckBox.UseVisualStyleBackColor = true; + // + // PosititonIsUseCheckBox + // + this.PosititonIsUseCheckBox.AutoSize = true; + this.PosititonIsUseCheckBox.Location = new System.Drawing.Point(641, 81); + this.PosititonIsUseCheckBox.Name = "PosititonIsUseCheckBox"; + this.PosititonIsUseCheckBox.Size = new System.Drawing.Size(72, 16); + this.PosititonIsUseCheckBox.TabIndex = 29; + this.PosititonIsUseCheckBox.Text = "工位使用"; + this.PosititonIsUseCheckBox.UseVisualStyleBackColor = true; + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(403, 136); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(95, 12); + this.label6.TabIndex = 28; + this.label6.Text = "贴合补偿脉冲(P)"; + // + // E10TextBox + // + this.E10TextBox.Location = new System.Drawing.Point(504, 132); + this.E10TextBox.Name = "E10TextBox"; + this.E10TextBox.Size = new System.Drawing.Size(100, 21); + this.E10TextBox.TabIndex = 27; + // + // label7 + // + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(409, 109); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(89, 12); + this.label7.TabIndex = 26; + this.label7.Text = "纵裁刀宽度(mm)"; + // + // E9TextBox + // + this.E9TextBox.Location = new System.Drawing.Point(504, 105); + this.E9TextBox.Name = "E9TextBox"; + this.E9TextBox.Size = new System.Drawing.Size(100, 21); + this.E9TextBox.TabIndex = 25; + // + // label8 + // + this.label8.AutoSize = true; + this.label8.Location = new System.Drawing.Point(463, 82); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(35, 12); + this.label8.TabIndex = 24; + this.label8.Text = "备用3"; + // + // E8TextBox + // + this.E8TextBox.Location = new System.Drawing.Point(504, 78); + this.E8TextBox.Name = "E8TextBox"; + this.E8TextBox.Size = new System.Drawing.Size(100, 21); + this.E8TextBox.TabIndex = 23; + // + // label9 + // + this.label9.AutoSize = true; + this.label9.Location = new System.Drawing.Point(463, 55); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(35, 12); + this.label9.TabIndex = 22; + this.label9.Text = "备用2"; + // + // E7TextBox + // + this.E7TextBox.Location = new System.Drawing.Point(504, 51); + this.E7TextBox.Name = "E7TextBox"; + this.E7TextBox.Size = new System.Drawing.Size(100, 21); + this.E7TextBox.TabIndex = 21; + // + // label10 + // + this.label10.AutoSize = true; + this.label10.Location = new System.Drawing.Point(463, 28); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(35, 12); + this.label10.TabIndex = 20; + this.label10.Text = "备用1"; + // + // E6TextBox + // + this.E6TextBox.Location = new System.Drawing.Point(504, 24); + this.E6TextBox.Name = "E6TextBox"; + this.E6TextBox.Size = new System.Drawing.Size(100, 21); + this.E6TextBox.TabIndex = 19; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(232, 135); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(53, 12); + this.label5.TabIndex = 18; + this.label5.Text = "贴合层数"; + // + // E5TextBox + // + this.E5TextBox.Location = new System.Drawing.Point(291, 132); + this.E5TextBox.Name = "E5TextBox"; + this.E5TextBox.Size = new System.Drawing.Size(100, 21); + this.E5TextBox.TabIndex = 17; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(172, 111); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(113, 12); + this.label4.TabIndex = 16; + this.label4.Text = "胶片贴合时间(0.1s)"; + // + // E4TextBox + // + this.E4TextBox.Location = new System.Drawing.Point(291, 107); + this.E4TextBox.Name = "E4TextBox"; + this.E4TextBox.Size = new System.Drawing.Size(100, 21); + this.E4TextBox.TabIndex = 15; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(160, 85); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(125, 12); + this.label3.TabIndex = 14; + this.label3.Text = "贴合末横裁延时(0.1s)"; + // + // E3TextBox + // + this.E3TextBox.Location = new System.Drawing.Point(291, 80); + this.E3TextBox.Name = "E3TextBox"; + this.E3TextBox.Size = new System.Drawing.Size(100, 21); + this.E3TextBox.TabIndex = 13; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(160, 58); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(125, 12); + this.label2.TabIndex = 12; + this.label2.Text = "贴合鼓脱开延时(0.1s)"; + // + // E2TextBox + // + this.E2TextBox.Location = new System.Drawing.Point(291, 53); + this.E2TextBox.Name = "E2TextBox"; + this.E2TextBox.Size = new System.Drawing.Size(100, 21); + this.E2TextBox.TabIndex = 11; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(160, 31); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(125, 12); + this.label1.TabIndex = 10; + this.label1.Text = "贴合鼓到位延时(0.1s)"; + // + // E1TextBox + // + this.E1TextBox.Location = new System.Drawing.Point(291, 26); + this.E1TextBox.Name = "E1TextBox"; + this.E1TextBox.Size = new System.Drawing.Size(100, 21); + this.E1TextBox.TabIndex = 9; + // + // SideRadioButtonPanel + // + this.SideRadioButtonPanel.Controls.Add(this.SideRadioButton); + this.SideRadioButtonPanel.Controls.Add(this.BodyRadioButton); + this.SideRadioButtonPanel.Location = new System.Drawing.Point(87, 88); + this.SideRadioButtonPanel.Name = "SideRadioButtonPanel"; + this.SideRadioButtonPanel.Size = new System.Drawing.Size(63, 66); + this.SideRadioButtonPanel.TabIndex = 8; + // + // SideRadioButton + // + this.SideRadioButton.AutoSize = true; + this.SideRadioButton.Enabled = false; + this.SideRadioButton.Location = new System.Drawing.Point(6, 38); + this.SideRadioButton.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5); + this.SideRadioButton.Name = "SideRadioButton"; + this.SideRadioButton.Size = new System.Drawing.Size(47, 16); + this.SideRadioButton.TabIndex = 6; + this.SideRadioButton.TabStop = true; + this.SideRadioButton.Text = "包边"; + this.SideRadioButton.UseVisualStyleBackColor = true; + this.SideRadioButton.CheckedChanged += new System.EventHandler(this.PositionRadioBoxChange); + // + // BodyRadioButton + // + this.BodyRadioButton.AutoSize = true; + this.BodyRadioButton.Checked = true; + this.BodyRadioButton.Enabled = false; + this.BodyRadioButton.Location = new System.Drawing.Point(6, 12); + this.BodyRadioButton.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5); + this.BodyRadioButton.Name = "BodyRadioButton"; + this.BodyRadioButton.Size = new System.Drawing.Size(47, 16); + this.BodyRadioButton.TabIndex = 5; + this.BodyRadioButton.TabStop = true; + this.BodyRadioButton.Text = "胎体"; + this.BodyRadioButton.UseVisualStyleBackColor = true; + this.BodyRadioButton.CheckedChanged += new System.EventHandler(this.PositionRadioBoxChange); + // + // PositionRadioButtonPanel + // + this.PositionRadioButtonPanel.Controls.Add(this.Position5RadioButton); + this.PositionRadioButtonPanel.Controls.Add(this.Position4RadioButton); + this.PositionRadioButtonPanel.Controls.Add(this.Position3RadioButton); + this.PositionRadioButtonPanel.Controls.Add(this.Position2RadioButton); + this.PositionRadioButtonPanel.Controls.Add(this.Position1RadioButton); + this.PositionRadioButtonPanel.Location = new System.Drawing.Point(8, 20); + this.PositionRadioButtonPanel.Name = "PositionRadioButtonPanel"; + this.PositionRadioButtonPanel.Size = new System.Drawing.Size(73, 144); + this.PositionRadioButtonPanel.TabIndex = 7; + // + // Position5RadioButton + // + this.Position5RadioButton.AutoSize = true; + this.Position5RadioButton.Location = new System.Drawing.Point(8, 116); + this.Position5RadioButton.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5); + this.Position5RadioButton.Name = "Position5RadioButton"; + this.Position5RadioButton.Size = new System.Drawing.Size(59, 16); + this.Position5RadioButton.TabIndex = 4; + this.Position5RadioButton.Text = "5#工位"; + this.Position5RadioButton.UseVisualStyleBackColor = true; + this.Position5RadioButton.CheckedChanged += new System.EventHandler(this.PositionRadioBoxChange); + // + // Position4RadioButton + // + this.Position4RadioButton.AutoSize = true; + this.Position4RadioButton.Location = new System.Drawing.Point(8, 90); + this.Position4RadioButton.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5); + this.Position4RadioButton.Name = "Position4RadioButton"; + this.Position4RadioButton.Size = new System.Drawing.Size(59, 16); + this.Position4RadioButton.TabIndex = 3; + this.Position4RadioButton.Text = "4#工位"; + this.Position4RadioButton.UseVisualStyleBackColor = true; + this.Position4RadioButton.CheckedChanged += new System.EventHandler(this.PositionRadioBoxChange); + // + // Position3RadioButton + // + this.Position3RadioButton.AutoSize = true; + this.Position3RadioButton.Location = new System.Drawing.Point(8, 64); + this.Position3RadioButton.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5); + this.Position3RadioButton.Name = "Position3RadioButton"; + this.Position3RadioButton.Size = new System.Drawing.Size(59, 16); + this.Position3RadioButton.TabIndex = 2; + this.Position3RadioButton.Text = "3#工位"; + this.Position3RadioButton.UseVisualStyleBackColor = true; + this.Position3RadioButton.CheckedChanged += new System.EventHandler(this.PositionRadioBoxChange); + // + // Position2RadioButton + // + this.Position2RadioButton.AutoSize = true; + this.Position2RadioButton.Location = new System.Drawing.Point(8, 38); + this.Position2RadioButton.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5); + this.Position2RadioButton.Name = "Position2RadioButton"; + this.Position2RadioButton.Size = new System.Drawing.Size(59, 16); + this.Position2RadioButton.TabIndex = 1; + this.Position2RadioButton.Text = "2#工位"; + this.Position2RadioButton.UseVisualStyleBackColor = true; + this.Position2RadioButton.CheckedChanged += new System.EventHandler(this.PositionRadioBoxChange); + // + // Position1RadioButton + // + this.Position1RadioButton.AutoSize = true; + this.Position1RadioButton.Checked = true; + this.Position1RadioButton.Location = new System.Drawing.Point(8, 12); + this.Position1RadioButton.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5); + this.Position1RadioButton.Name = "Position1RadioButton"; + this.Position1RadioButton.Size = new System.Drawing.Size(59, 16); + this.Position1RadioButton.TabIndex = 0; + this.Position1RadioButton.TabStop = true; + this.Position1RadioButton.Text = "1#工位"; + this.Position1RadioButton.UseVisualStyleBackColor = true; + this.Position1RadioButton.CheckedChanged += new System.EventHandler(this.PositionRadioBoxChange); + // // tableLayoutPanel2 // this.tableLayoutPanel2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) @@ -1058,6 +1153,15 @@ namespace HighWayIot.Winform.UserControlPages this.panel1.Size = new System.Drawing.Size(887, 58); this.panel1.TabIndex = 5; // + // label27 + // + this.label27.AutoSize = true; + this.label27.Location = new System.Drawing.Point(338, 9); + this.label27.Name = "label27"; + this.label27.Size = new System.Drawing.Size(269, 12); + this.label27.TabIndex = 8; + this.label27.Text = "双击单元格更改数值再点击修改按钮完成数值更改"; + // // label24 // this.label24.AutoSize = true; @@ -1112,15 +1216,6 @@ namespace HighWayIot.Winform.UserControlPages this.DeleteWeightButton.UseVisualStyleBackColor = true; this.DeleteWeightButton.Click += new System.EventHandler(this.DeleteWeightButton_Click); // - // label27 - // - this.label27.AutoSize = true; - this.label27.Location = new System.Drawing.Point(338, 9); - this.label27.Name = "label27"; - this.label27.Size = new System.Drawing.Size(269, 12); - this.label27.TabIndex = 8; - this.label27.Text = "双击单元格更改数值再点击修改按钮完成数值更改"; - // // RecipeConfigPage // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -1141,14 +1236,14 @@ namespace HighWayIot.Winform.UserControlPages this.tableLayoutPanel1.ResumeLayout(false); this.groupBox3.ResumeLayout(false); this.tableLayoutPanel3.ResumeLayout(false); - this.groupBox4.ResumeLayout(false); - this.groupBox4.PerformLayout(); - this.groupBox5.ResumeLayout(false); - this.groupBox5.PerformLayout(); - this.groupBox6.ResumeLayout(false); - this.groupBox6.PerformLayout(); this.groupBox7.ResumeLayout(false); this.groupBox7.PerformLayout(); + this.groupBox4.ResumeLayout(false); + this.groupBox4.PerformLayout(); + this.SideRadioButtonPanel.ResumeLayout(false); + this.SideRadioButtonPanel.PerformLayout(); + this.PositionRadioButtonPanel.ResumeLayout(false); + this.PositionRadioButtonPanel.PerformLayout(); this.tableLayoutPanel2.ResumeLayout(false); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); @@ -1176,54 +1271,6 @@ namespace HighWayIot.Winform.UserControlPages private Button RefreshRecipeButton; private Button RefreshWeightButton; private TableLayoutPanel tableLayoutPanel3; - private GroupBox groupBox4; - private GroupBox groupBox5; - private GroupBox groupBox6; - private TextBox E1P4TextBox; - private Label label4; - private TextBox E1P3TextBox; - private Label label3; - private TextBox E1P2TextBox; - private Label label2; - private TextBox E1P1TextBox; - private Label label1; - private TextBox E2P4TextBox; - private Label label5; - private Label label8; - private TextBox E2P3TextBox; - private TextBox E2P1TextBox; - private Label label6; - private Label label7; - private TextBox E2P2TextBox; - private TextBox E3P4TextBox; - private TextBox E3P1TextBox; - private Label label9; - private Label label12; - private TextBox E3P3TextBox; - private Label label11; - private Label label10; - private TextBox E3P2TextBox; - private TextBox E3P14TextBox; - private TextBox E3P11TextBox; - private Label label17; - private Label label18; - private TextBox E3P13TextBox; - private Label label19; - private Label label20; - private TextBox E3P12TextBox; - private TextBox E3P9TextBox; - private TextBox E3P6TextBox; - private Label label13; - private Label label14; - private TextBox E3P8TextBox; - private Label label15; - private Label label16; - private TextBox E3P7TextBox; - private CheckBox E3P5CheckBox; - private TextBox E3P10TextBox; - private Label label22; - private TextBox E3P15TextBox; - private Label label21; private GroupBox groupBox7; private Button PasteParaButton; private Button CopyParaButton; @@ -1255,5 +1302,58 @@ namespace HighWayIot.Winform.UserControlPages private Label label25; private Label label26; private Label label27; + private GroupBox groupBox4; + private RadioButton Position3RadioButton; + private RadioButton Position2RadioButton; + private RadioButton Position1RadioButton; + private RadioButton SideRadioButton; + private RadioButton BodyRadioButton; + private RadioButton Position5RadioButton; + private RadioButton Position4RadioButton; + private Panel SideRadioButtonPanel; + private Panel PositionRadioButtonPanel; + private Label label1; + private TextBox E1TextBox; + private Label label6; + private TextBox E10TextBox; + private Label label7; + private TextBox E9TextBox; + private Label label8; + private TextBox E8TextBox; + private Label label9; + private TextBox E7TextBox; + private Label label10; + private TextBox E6TextBox; + private Label label5; + private TextBox E5TextBox; + private Label label4; + private TextBox E4TextBox; + private Label label3; + private TextBox E3TextBox; + private Label label2; + private TextBox E2TextBox; + private CheckBox SideCutCheckBox; + private CheckBox WeightCalCheckBox; + private CheckBox PosititonIsUseCheckBox; + private Label label11; + private TextBox TireWeightTextBox; + private Label label12; + private TextBox StopDistanceTextBox; + private Label label13; + private TextBox SlowDistanceTextBox; + private Label label14; + private TextBox LightWidthTextBox; + private Label label15; + private TextBox RimInchTextBox; + private Button PastePositionButton; + private Button CopyPositionButton; + private Label label16; + private Label label17; + private Label label19; + private Label label18; + private Label SpecNameLabel; + private Label SpecNoLabel; + private Button button2; + private Button button1; } } diff --git a/HighWayIot.Winform/UserControlPages/RecipeConfigPages/RecipeConfigPage.cs b/HighWayIot.Winform/UserControlPages/RecipeConfigPages/RecipeConfigPage.cs index f86f88e..6714f65 100644 --- a/HighWayIot.Winform/UserControlPages/RecipeConfigPages/RecipeConfigPage.cs +++ b/HighWayIot.Winform/UserControlPages/RecipeConfigPages/RecipeConfigPage.cs @@ -22,47 +22,57 @@ namespace HighWayIot.Winform.UserControlPages /// /// 配方服务类实例 /// - ZxRecipeService zxRecipeService = ZxRecipeService.Instance; + private ZxRecipeService zxRecipeService = ZxRecipeService.Instance; /// /// 称重服务类实例 /// - ZxWeightService zxWeightService = ZxWeightService.Instance; + private ZxWeightService zxWeightService = ZxWeightService.Instance; /// /// 配方服务类实例 /// - ZxMaterialService zxMaterialService = ZxMaterialService.Instance; + private ZxMaterialService zxMaterialService = ZxMaterialService.Instance; /// /// 配方字段服务类实例 /// - ZxRecipeParaService zxRecipeParaService = ZxRecipeParaService.Instance; + private ZxRecipeParaService zxRecipeParaService = ZxRecipeParaService.Instance; + + /// + /// 工位配方字段服务类实例 + /// + private ZxRecipePositionParaService zxRecipePositionParaService = ZxRecipePositionParaService.Instance; /// /// 配方字段实例 /// - ZxRecipeParaEntity zxRecipeParaEntity = new ZxRecipeParaEntity(); + private ZxRecipeParaEntity zxRecipeParaEntity = new ZxRecipeParaEntity(); + + /// + /// 工位配方字段实例 + /// + private ZxRecipePositionParaEntity zxRecipePositionParaEntity = new ZxRecipePositionParaEntity(); /// /// 配方字段实例剪切板 /// - ZxRecipeParaEntity zxRecipeParaEntityCut; + private ZxRecipeParaEntity zxRecipeParaEntityCut; /// /// 称重DataGridView数据源 /// - List weightDataSourceEntities; + private List weightDataSourceEntities; /// /// 配方列表 /// - List RecipeLists; + private List RecipeLists; /// /// 称量列表 /// - List WeightLists; + private List WeightLists; public RecipeConfigPage() { @@ -368,20 +378,17 @@ namespace HighWayIot.Winform.UserControlPages { string s = RecipeDataGridView.CurrentRow.Cells["RecipeCode"].Value.ToString(); - if (MessageBox.Show($"确定要保存配方编号为 [{s}] 的配方的参数？", "确认", MessageBoxButtons.OKCancel) == DialogResult.Cancel) - { - return; - } + //if (MessageBox.Show($"确定要保存配方编号为 [{s}] 的配方的参数？", "确认", MessageBoxButtons.OKCancel) == DialogResult.Cancel) + //{ + // return; + //} - ZxRecipeParaEntity entity = GetParaValue(); - - entity.IsDeleted = false; - entity.RecipeCode = s; - - zxRecipeParaEntity = entity; + ZxRecipePositionParaEntity entity = GetParaValue(); var paraData = zxRecipeParaService.GetRecipeParaInfoByRecipeCode(zxRecipeParaEntity.RecipeCode); + int flag = GetSelectIndex(); + //没有就插入 if (paraData.Count == 0) { @@ -421,7 +428,7 @@ namespace HighWayIot.Winform.UserControlPages /// private void CopyParaButton_Click(object sender, EventArgs e) { - zxRecipeParaEntityCut = GetParaValue(); + //zxRecipeParaEntityCut = GetParaValue(); NowCopyLabel.Text = RecipeDataGridView.CurrentRow.Cells["RecipeCode"].Value.ToString(); } @@ -437,7 +444,7 @@ namespace HighWayIot.Winform.UserControlPages MessageBox.Show("剪切板为空！"); return; } - SetParaValue(zxRecipeParaEntityCut); + //SetParaValue(zxRecipeParaEntityCut); } /// @@ -452,7 +459,7 @@ namespace HighWayIot.Winform.UserControlPages if (MessageBox.Show("是否要清空前端数据", "", MessageBoxButtons.YesNo) == DialogResult.OK) { - SetParaValue(new ZxRecipeParaEntity()); + //SetParaValue(new ZxRecipeParaEntity()); } } @@ -473,22 +480,23 @@ namespace HighWayIot.Winform.UserControlPages WeightDataGridView.DataSource = null; WeightDataGridView.DataSource = weightDataSourceEntities; + //设置参数 var paraData = zxRecipeParaService.GetRecipeParaInfoByRecipeCode(s); //没有就全0 if (paraData.Count == 0) { - SetParaValue(new ZxRecipeParaEntity()); + //SetParaValue(new ZxRecipeParaEntity()); } //有就显示 else if (paraData.Count == 1) { - SetParaValue(paraData[0]); + //SetParaValue(paraData[0]); } //有多条设为第一条 else { MessageBox.Show("存在多条未删除的相同配方字段信息！将设置为第一条，请检查数据库。"); - SetParaValue(paraData[0]); + //SetParaValue(paraData[0]); } } @@ -534,71 +542,155 @@ namespace HighWayIot.Winform.UserControlPages } /// - /// 设置配方字段值 + /// 设置显示的配方字段值 /// /// - private void SetParaValue(ZxRecipeParaEntity entity) + private void SetParaValue(ZxRecipePositionParaEntity entity) { - zxRecipeParaEntity = entity; - E1P1TextBox.Text = GeneralUtils.IntEmptyOrToString(zxRecipeParaEntity.E1P1); - E1P2TextBox.Text = GeneralUtils.IntEmptyOrToString(zxRecipeParaEntity.E1P2); - E1P3TextBox.Text = GeneralUtils.IntEmptyOrToString(zxRecipeParaEntity.E1P3); - E1P4TextBox.Text = GeneralUtils.IntEmptyOrToString(zxRecipeParaEntity.E1P4); - E2P1TextBox.Text = GeneralUtils.IntEmptyOrToString(zxRecipeParaEntity.E2P1); - E2P2TextBox.Text = GeneralUtils.IntEmptyOrToString(zxRecipeParaEntity.E2P2); - E2P3TextBox.Text = GeneralUtils.IntEmptyOrToString(zxRecipeParaEntity.E2P3); - E2P4TextBox.Text = GeneralUtils.IntEmptyOrToString(zxRecipeParaEntity.E2P4); - E3P1TextBox.Text = GeneralUtils.IntEmptyOrToString(zxRecipeParaEntity.E3P1); - E3P2TextBox.Text = GeneralUtils.IntEmptyOrToString(zxRecipeParaEntity.E3P2); - E3P3TextBox.Text = GeneralUtils.IntEmptyOrToString(zxRecipeParaEntity.E3P3); - E3P4TextBox.Text = GeneralUtils.IntEmptyOrToString(zxRecipeParaEntity.E3P4); - E3P5CheckBox.Checked = zxRecipeParaEntity.E3P5 == 1; - E3P6TextBox.Text = GeneralUtils.IntEmptyOrToString(zxRecipeParaEntity.E3P6); - E3P7TextBox.Text = GeneralUtils.IntEmptyOrToString(zxRecipeParaEntity.E3P7); - E3P8TextBox.Text = GeneralUtils.IntEmptyOrToString(zxRecipeParaEntity.E3P8); - E3P9TextBox.Text = GeneralUtils.IntEmptyOrToString(zxRecipeParaEntity.E3P9); - E3P10TextBox.Text = GeneralUtils.IntEmptyOrToString(zxRecipeParaEntity.E3P10); - E3P11TextBox.Text = GeneralUtils.IntEmptyOrToString(zxRecipeParaEntity.E3P11); - E3P12TextBox.Text = GeneralUtils.IntEmptyOrToString(zxRecipeParaEntity.E3P12); - E3P13TextBox.Text = GeneralUtils.IntEmptyOrToString(zxRecipeParaEntity.E3P13); - E3P14TextBox.Text = GeneralUtils.IntEmptyOrToString(zxRecipeParaEntity.E3P14); - E3P15TextBox.Text = GeneralUtils.IntEmptyOrToString(zxRecipeParaEntity.E3P15); + E1TextBox.Text = GeneralUtils.IntEmptyOrToString(entity.E1); + E2TextBox.Text = GeneralUtils.IntEmptyOrToString(entity.E2); + E3TextBox.Text = GeneralUtils.IntEmptyOrToString(entity.E3); + E4TextBox.Text = GeneralUtils.IntEmptyOrToString(entity.E4); + E5TextBox.Text = GeneralUtils.IntEmptyOrToString(entity.E5); + E6TextBox.Text = GeneralUtils.IntEmptyOrToString(entity.E6); + E7TextBox.Text = GeneralUtils.IntEmptyOrToString(entity.E7); + E8TextBox.Text = GeneralUtils.IntEmptyOrToString(entity.E8); + E9TextBox.Text = GeneralUtils.IntEmptyOrToString(entity.E9); + E10TextBox.Text = GeneralUtils.IntEmptyOrToString(entity.E10); } /// /// 获取界面上的配方参数 /// /// 获取到的配方参数值 - private ZxRecipeParaEntity GetParaValue() + private ZxRecipePositionParaEntity GetParaValue() { - ZxRecipeParaEntity entity = new ZxRecipeParaEntity() + ZxRecipePositionParaEntity entity = new ZxRecipePositionParaEntity() { - E1P1 = GeneralUtils.StringNullOrToInt(E1P1TextBox.Text), - E1P2 = GeneralUtils.StringNullOrToInt(E1P2TextBox.Text), - E1P3 = GeneralUtils.StringNullOrToInt(E1P3TextBox.Text), - E1P4 = GeneralUtils.StringNullOrToInt(E1P4TextBox.Text), - E2P1 = GeneralUtils.StringNullOrToInt(E2P1TextBox.Text), - E2P2 = GeneralUtils.StringNullOrToInt(E2P2TextBox.Text), - E2P3 = GeneralUtils.StringNullOrToInt(E2P3TextBox.Text), - E2P4 = GeneralUtils.StringNullOrToInt(E2P4TextBox.Text), - E3P1 = GeneralUtils.StringNullOrToInt(E3P1TextBox.Text), - E3P2 = GeneralUtils.StringNullOrToInt(E3P2TextBox.Text), - E3P3 = GeneralUtils.StringNullOrToInt(E3P3TextBox.Text), - E3P4 = GeneralUtils.StringNullOrToInt(E3P4TextBox.Text), - E3P5 = E3P5CheckBox.Checked ? 1 : 0, - E3P6 = GeneralUtils.StringNullOrToInt(E3P6TextBox.Text), - E3P7 = GeneralUtils.StringNullOrToInt(E3P7TextBox.Text), - E3P8 = GeneralUtils.StringNullOrToInt(E3P8TextBox.Text), - E3P9 = GeneralUtils.StringNullOrToInt(E3P9TextBox.Text), - E3P10 = GeneralUtils.StringNullOrToInt(E3P10TextBox.Text), - E3P11 = GeneralUtils.StringNullOrToInt(E3P11TextBox.Text), - E3P12 = GeneralUtils.StringNullOrToInt(E3P12TextBox.Text), - E3P13 = GeneralUtils.StringNullOrToInt(E3P13TextBox.Text), - E3P14 = GeneralUtils.StringNullOrToInt(E3P14TextBox.Text), - E3P15 = GeneralUtils.StringNullOrToInt(E3P15TextBox.Text), + E1 = GeneralUtils.StringNullOrToInt(E1TextBox.Text), + E2 = GeneralUtils.StringNullOrToInt(E2TextBox.Text), + E3 = GeneralUtils.StringNullOrToInt(E3TextBox.Text), + E4 = GeneralUtils.StringNullOrToInt(E4TextBox.Text), + E5 = GeneralUtils.StringNullOrToInt(E5TextBox.Text), + E6 = GeneralUtils.StringNullOrToInt(E6TextBox.Text), + E7 = GeneralUtils.StringNullOrToInt(E7TextBox.Text), + E8 = GeneralUtils.StringNullOrToInt(E8TextBox.Text), + E9 = GeneralUtils.StringNullOrToInt(E9TextBox.Text), + E10 = GeneralUtils.StringNullOrToInt(E10TextBox.Text) }; - return entity; } + + /// + /// 工位改变 + /// + /// + /// + private void PositionRadioBoxChange(object sender, EventArgs e) + { + RadioButton s = sender as RadioButton; + + if (s.Checked) + { + int flag = GetSelectIndex(); + switch (flag) + { + case 1: + SetParaViewById(zxRecipeParaEntity.P1); + break; + case 2: + SetParaViewById(zxRecipeParaEntity.P2); + break; + case 31: + SetParaViewById(zxRecipeParaEntity.P31); + break; + case 32: + SetParaViewById(zxRecipeParaEntity.P32); + break; + case 41: + SetParaViewById(zxRecipeParaEntity.P41); + break; + case 42: + SetParaViewById(zxRecipeParaEntity.P42); + break; + case 51: + SetParaViewById(zxRecipeParaEntity.P51); + break; + case 52: + SetParaViewById(zxRecipeParaEntity.P52); + break; + case 0: + SetParaViewById(0); + break; + default: + SetParaViewById(0); + break; + } + } + } + + private void SetParaViewById(int? id) + { + zxRecipePositionParaEntity = zxRecipePositionParaService.GetRecipePositionParaInfoById(id ?? 0); + SetParaValue(zxRecipePositionParaEntity); + } + + /// + /// 获取选择的工位包边 + /// + /// 选的不对劲就返回0 + private int GetSelectIndex() + { + if (Position1RadioButton.Checked) + { + return 1; + } + + if (Position2RadioButton.Checked) + { + return 2; + } + + if (Position3RadioButton.Checked) + { + if (BodyRadioButton.Checked) + { + return 31; + } + + if (SideRadioButton.Checked) + { + return 32; + } + } + + if (Position4RadioButton.Checked) + { + if (BodyRadioButton.Checked) + { + return 41; + } + + if (SideRadioButton.Checked) + { + return 42; + } + } + + if (Position5RadioButton.Checked) + { + if (BodyRadioButton.Checked) + { + return 51; + } + + if (SideRadioButton.Checked) + { + return 52; + } + } + + return 0; + } } } diff --git a/HighWayIot.Winform/UserControlPages/RecipeConfigPages/RecipeConfigPage.resx b/HighWayIot.Winform/UserControlPages/RecipeConfigPages/RecipeConfigPage.resx index fad953c..2c39e2a 100644 --- a/HighWayIot.Winform/UserControlPages/RecipeConfigPages/RecipeConfigPage.resx +++ b/HighWayIot.Winform/UserControlPages/RecipeConfigPages/RecipeConfigPage.resx @@ -150,6 +150,66 @@ True + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + True