SoftwareGroup/602_FD
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加通道配置界面

Browse Source
This commit is contained in:
liming 蔡
2026-08-10 16:05:17 +08:00
parent 45c39f738b
commit 25f2ae3d44
22 changed files with 964 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+7
View File
@@ -37,3 +37,10 @@
/.vs/LargeSquareOne/CopilotIndices/17.14.1431.25910/CodeChunks.db-shm
/.vs/LargeSquareOne/CopilotIndices/17.14.1431.25910/CodeChunks.db
/LargeSquareOne/bin/Debug/Config/Configure.ini
/JinYuan.ControlCenter/.vs/JinYuan.ControlCenters.csproj.dtbcache.json
/JinYuan.DAL/.vs/JinYuan.DAL.csproj.dtbcache.json
/JinYuan.Helper/.vs/JinYuan.Helper.csproj.dtbcache.json
/JinYuan.MES/.vs/JinYuan.MES.csproj.dtbcache.json
/JinYuan.Models/.vs/JinYuan.Models.csproj.dtbcache.json
/JinYuan.VirtualDataLibrary/.vs/JinYuan.VirtualDataLibrary.csproj.dtbcache.json
/LargeSquareOne/.vs/LargeSquareOne.csproj.dtbcache.json
JinYuan.ControlCenter/.vs/JinYuan.ControlCenters.csproj.dtbcache.json
-1
View File
File diff suppressed because one or more lines are too long
JinYuan.ControlCenter/ControlCenter_Plc.cs
+5 -3
View File
@@ -1956,6 +1956,8 @@ namespace JinYuan.ControlCenters
CommonMethods.mesConfig.MaterialCode);//分档查询
var channels = CommonMethods.mesConfig.ChannelConfig.Channels;
var ngChanel = channels.FirstOrDefault(x => x.Gears.Contains("NG"));
int ngVal = ngChanel == null ? 97 : ngChanel.DefaultValue;
try
{
@@ -2016,14 +2018,14 @@ namespace JinYuan.ControlCenters
}
else
{
listGradeResult[i] = (short)(97);// 走分档NG
listGradeResult[i] = (short)(ngVal);// 走分档NG
list[i].Remark = $"出站条码[{list[i].BarCode}]，MES反馈档位:{mesResType[0]},MES未反馈正确档位";
throw new Exception("MES未反馈正确档位");
}
}
else
{
listGradeResult[i] = (short)(97);// 走分档NG
listGradeResult[i] = (short)(ngVal);// 走分档NG
list[i].Remark = $"出站条码[{list[i].BarCode}]外观检OKMES反馈档位:{mesResType[0]},MES未反馈正确档位";
throw new Exception("MES未反馈正确档位");
}
@@ -2033,7 +2035,7 @@ namespace JinYuan.ControlCenters
catch (Exception ex)
{
//listGradeResult[i] = (short)(CommonMethods.MESGradingSet[5] + 20); //(short)26;
listGradeResult[i] = (short)(97);// 走分档NG
listGradeResult[i] = (short)(ngVal);// 走分档NG
list[i].Remark = $"出站条码[{list[i].BarCode}]外观检OK分档NG，MES未反馈正确档位";
LoggerHelp.WriteLog("解析出站MES分档数据异常：{ex.Message}", "SysErrorLog");
JinYuan.DAL/.vs/JinYuan.DAL.csproj.dtbcache.json
-1
View File
File diff suppressed because one or more lines are too long
JinYuan.Helper/.vs/JinYuan.Helper.csproj.dtbcache.json
-1
View File
File diff suppressed because one or more lines are too long
JinYuan.MES/.vs/JinYuan.MES.csproj.dtbcache.json
-1
View File
@@ -1 +0,0 @@
{"RootPath":"E:\\JY_项目\\1086大方形\\1086-1\\LargeSquareOne\\JinYuan.MES","ProjectFileName":"JinYuan.MES.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"Enums\\MesResType.cs"},{"SourceFile":"Enums\\MesUploadType.cs"},{"SourceFile":"IMes.cs"},{"SourceFile":"MESApiHelper.cs"},{"SourceFile":"MesDataProcess.cs"},{"SourceFile":"Models\\EqpStatusParam.cs"},{"SourceFile":"Models\\ParamReturnData.cs"},{"SourceFile":"Models\\SingleCellOutStation.cs"},{"SourceFile":"Models\\SingleCellInStation.cs"},{"SourceFile":"Models\\ManyCellInStation.cs"},{"SourceFile":"Models\\ManyCellOutStation.cs"},{"SourceFile":"Models\\LoginEnyity.cs"},{"SourceFile":"Models\\ParamChange.cs"},{"SourceFile":"Models\\ProductProcessParam.cs"},{"SourceFile":"Models\\ProductResultParameters.cs"},{"SourceFile":"Models\\MesResponse.cs"},{"SourceFile":"Models\\UploadAlarmParam.cs"},{"SourceFile":"Models\\UploadDeviceCollectData.cs"},{"SourceFile":"Models\\WattrMeter.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.7.2.AssemblyAttributes.cs"}],"References":[{"Reference":"E:\\JY_项目\\1086大方形\\1086-1\\LargeSquareOne\\JinYuan.Helper\\bin\\Debug\\JinYuan.Helper.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"E:\\JY_项目\\1086大方形\\1086-1\\LargeSquareOne\\JinYuan.Models\\bin\\Debug\\JinYuan.Models.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\JY_项目\\1086大方形\\1086-1\\LargeSquareOne\\packages\\Newtonsoft.Json.13.0.3\\lib\\net45\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"E:\\JY_项目\\1086大方形\\1086-1\\LargeSquareOne\\JinYuan.MES\\bin\\Debug\\JinYuan.MES.dll","OutputItemRelativePath":"JinYuan.MES.dll"},{"OutputItemFullPath":"E:\\JY_项目\\1086大方形\\1086-1\\LargeSquareOne\\JinYuan.MES\\bin\\Debug\\JinYuan.MES.pdb","OutputItemRelativePath":"JinYuan.MES.pdb"}],"CopyToOutputEntries":[]}
JinYuan.Models/.vs/JinYuan.Models.csproj.dtbcache.json
-1
View File
File diff suppressed because one or more lines are too long
JinYuan.Models/SysCfg/ChannelConfig.cs
+12 -2
View File
@@ -1,10 +1,11 @@
using System;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace JinYuan.Models.SysCfg
namespace JinYuan.Models
{
public class ChannelConfig
{
@@ -16,5 +17,14 @@ namespace JinYuan.Models.SysCfg
public int ChannelId { get; set; }
public int DefaultValue { get; set; }
public List<string> Gears { get; set; } = new List<string>();
[JsonIgnore]
public string AllContent
{
get
{
return $"{ChannelId} {DefaultValue} {string.Join(",", Gears)}";
}
}
}
}
JinYuan.VirtualDataLibrary/.vs/JinYuan.VirtualDataLibrary.csproj.dtbcache.json
-1
View File
File diff suppressed because one or more lines are too long
JinYuan.VirtualDataLibrary/CommonMethods.cs
+1 -1
View File
@@ -542,7 +542,7 @@ namespace JinYuan.VirtualDataLibrary
public static string ChannelPath = Path.Combine(System.Windows.Forms.Application.StartupPath, "Config\\Channel.json");
#region 读取json配置
public static Models.SysCfg.ChannelConfig LoadFromJson(string filePath)
public static Models.ChannelConfig LoadFromJson(string filePath)
{
var json = File.ReadAllText(filePath);
return JsonConvert.DeserializeObject<ChannelConfig>(json);
JinYuan.VirtualDataLibrary/MesConfig.cs
+1 -1
View File
@@ -143,7 +143,7 @@ namespace JinYuan.VirtualDataLibrary
/// <summary>
/// 通道档位设置
/// </summary>
public Models.SysCfg.ChannelConfig ChannelConfig = new ChannelConfig();
public Models.ChannelConfig ChannelConfig = new Models.ChannelConfig();
/// <summary>
/// 设备状态
LargeSquareOne/.vs/LargeSquareOne.csproj.dtbcache.json
-1
View File
File diff suppressed because one or more lines are too long
LargeSquareOne/FrmChannelCfg.Designer.cs
Generated
+311
View File
@@ -0,0 +1,311 @@
namespace LargeSquareOne
{
partial class FrmChannelCfg
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.panel1 = new JinYuan.ControlLib.PanelExt();
this.btnRemoveGear = new System.Windows.Forms.Button();
this.listBoxGears = new System.Windows.Forms.ListBox();
this.numChannelId = new System.Windows.Forms.NumericUpDown();
this.listBoxChannels = new System.Windows.Forms.ListBox();
this.numDefaultValue = new System.Windows.Forms.NumericUpDown();
this.button4 = new System.Windows.Forms.Button();
this.button2 = new System.Windows.Forms.Button();
this.button1 = new System.Windows.Forms.Button();
this.txtNewGear = new System.Windows.Forms.TextBox();
this.label6 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.label7 = new System.Windows.Forms.Label();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numChannelId)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.numDefaultValue)).BeginInit();
this.SuspendLayout();
//
// panel1
//
this.panel1.BackColor = System.Drawing.Color.Transparent;
this.panel1.BordeColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(79)))), ((int)(((byte)(150)))));
this.panel1.BordeWidth = 2;
this.panel1.BottomGap = 0;
this.panel1.Controls.Add(this.label7);
this.panel1.Controls.Add(this.btnRemoveGear);
this.panel1.Controls.Add(this.listBoxGears);
this.panel1.Controls.Add(this.numChannelId);
this.panel1.Controls.Add(this.listBoxChannels);
this.panel1.Controls.Add(this.numDefaultValue);
this.panel1.Controls.Add(this.button4);
this.panel1.Controls.Add(this.button2);
this.panel1.Controls.Add(this.button1);
this.panel1.Controls.Add(this.txtNewGear);
this.panel1.Controls.Add(this.label6);
this.panel1.Controls.Add(this.label5);
this.panel1.Controls.Add(this.label4);
this.panel1.Controls.Add(this.label3);
this.panel1.Controls.Add(this.label2);
this.panel1.Controls.Add(this.label1);
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.LeftGap = 0;
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.panel1.Name = "panel1";
this.panel1.RightGap = 0;
this.panel1.Size = new System.Drawing.Size(1204, 752);
this.panel1.TabIndex = 0;
this.panel1.TopGap = 0;
//
// btnRemoveGear
//
this.btnRemoveGear.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(3)))), ((int)(((byte)(27)))), ((int)(((byte)(78)))));
this.btnRemoveGear.Font = new System.Drawing.Font("微软雅黑", 11.5F);
this.btnRemoveGear.ForeColor = System.Drawing.Color.White;
this.btnRemoveGear.Location = new System.Drawing.Point(1004, 213);
this.btnRemoveGear.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.btnRemoveGear.Name = "btnRemoveGear";
this.btnRemoveGear.Size = new System.Drawing.Size(133, 58);
this.btnRemoveGear.TabIndex = 19;
this.btnRemoveGear.Text = "删除选中项";
this.btnRemoveGear.UseVisualStyleBackColor = false;
this.btnRemoveGear.Click += new System.EventHandler(this.btnRemoveGear_Click);
//
// listBoxGears
//
this.listBoxGears.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38)))));
this.listBoxGears.ForeColor = System.Drawing.Color.White;
this.listBoxGears.FormattingEnabled = true;
this.listBoxGears.ItemHeight = 27;
this.listBoxGears.Location = new System.Drawing.Point(674, 213);
this.listBoxGears.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.listBoxGears.Name = "listBoxGears";
this.listBoxGears.Size = new System.Drawing.Size(289, 247);
this.listBoxGears.TabIndex = 18;
this.listBoxGears.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.listBoxGears_MouseDoubleClick);
//
// numChannelId
//
this.numChannelId.Enabled = false;
this.numChannelId.Location = new System.Drawing.Point(674, 60);
this.numChannelId.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.numChannelId.Name = "numChannelId";
this.numChannelId.Size = new System.Drawing.Size(180, 34);
this.numChannelId.TabIndex = 17;
//
// listBoxChannels
//
this.listBoxChannels.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38)))));
this.listBoxChannels.ForeColor = System.Drawing.Color.White;
this.listBoxChannels.FormattingEnabled = true;
this.listBoxChannels.ItemHeight = 27;
this.listBoxChannels.Location = new System.Drawing.Point(69, 62);
this.listBoxChannels.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.listBoxChannels.Name = "listBoxChannels";
this.listBoxChannels.Size = new System.Drawing.Size(367, 517);
this.listBoxChannels.TabIndex = 16;
this.listBoxChannels.SelectedIndexChanged += new System.EventHandler(this.listBoxChannels_SelectedIndexChanged);
//
// numDefaultValue
//
this.numDefaultValue.Location = new System.Drawing.Point(674, 126);
this.numDefaultValue.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.numDefaultValue.Name = "numDefaultValue";
this.numDefaultValue.Size = new System.Drawing.Size(180, 34);
this.numDefaultValue.TabIndex = 15;
this.numDefaultValue.ValueChanged += new System.EventHandler(this.numDefaultValue_ValueChanged);
this.numDefaultValue.Validating += new System.ComponentModel.CancelEventHandler(this.numDefaultValue_Validating);
//
// button4
//
this.button4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(3)))), ((int)(((byte)(27)))), ((int)(((byte)(78)))));
this.button4.ForeColor = System.Drawing.Color.White;
this.button4.Location = new System.Drawing.Point(674, 662);
this.button4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.button4.Name = "button4";
this.button4.Size = new System.Drawing.Size(112, 41);
this.button4.TabIndex = 14;
this.button4.Text = "退出";
this.button4.UseVisualStyleBackColor = false;
this.button4.Click += new System.EventHandler(this.button4_Click);
//
// button2
//
this.button2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(3)))), ((int)(((byte)(27)))), ((int)(((byte)(78)))));
this.button2.Font = new System.Drawing.Font("微软雅黑", 11.5F);
this.button2.ForeColor = System.Drawing.Color.White;
this.button2.Location = new System.Drawing.Point(324, 662);
this.button2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(112, 41);
this.button2.TabIndex = 12;
this.button2.Text = "保存";
this.button2.UseVisualStyleBackColor = false;
this.button2.Click += new System.EventHandler(this.btnSave_Click);
//
// button1
//
this.button1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(3)))), ((int)(((byte)(27)))), ((int)(((byte)(78)))));
this.button1.Font = new System.Drawing.Font("微软雅黑", 11.5F);
this.button1.ForeColor = System.Drawing.Color.White;
this.button1.Location = new System.Drawing.Point(851, 579);
this.button1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(112, 41);
this.button1.TabIndex = 11;
this.button1.Text = "添加";
this.button1.UseVisualStyleBackColor = false;
this.button1.Click += new System.EventHandler(this.btnAddGear_Click);
//
// txtNewGear
//
this.txtNewGear.Location = new System.Drawing.Point(674, 579);
this.txtNewGear.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtNewGear.Name = "txtNewGear";
this.txtNewGear.Size = new System.Drawing.Size(148, 34);
this.txtNewGear.TabIndex = 10;
//
// label6
//
this.label6.AutoSize = true;
this.label6.ForeColor = System.Drawing.Color.White;
this.label6.Location = new System.Drawing.Point(552, 579);
this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(92, 27);
this.label6.TabIndex = 9;
this.label6.Text = "新增档位";
//
// label5
//
this.label5.AutoSize = true;
this.label5.ForeColor = System.Drawing.Color.White;
this.label5.Location = new System.Drawing.Point(543, 198);
this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(92, 27);
this.label5.TabIndex = 7;
this.label5.Text = "档位列表";
//
// label4
//
this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("微软雅黑", 12F);
this.label4.ForeColor = System.Drawing.Color.White;
this.label4.Location = new System.Drawing.Point(528, 126);
this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(107, 27);
this.label4.TabIndex = 5;
this.label4.Text = "PLC档位值";
//
// label3
//
this.label3.AutoSize = true;
this.label3.ForeColor = System.Drawing.Color.White;
this.label3.Location = new System.Drawing.Point(563, 62);
this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(72, 27);
this.label3.TabIndex = 3;
this.label3.Text = "通道号";
//
// label2
//
this.label2.AutoSize = true;
this.label2.ForeColor = System.Drawing.Color.White;
this.label2.Location = new System.Drawing.Point(669, 19);
this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(92, 27);
this.label2.TabIndex = 2;
this.label2.Text = "通道详情";
//
// label1
//
this.label1.AutoSize = true;
this.label1.ForeColor = System.Drawing.Color.White;
this.label1.Location = new System.Drawing.Point(64, 19);
this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(92, 27);
this.label1.TabIndex = 1;
this.label1.Text = "通道列表";
//
// label7
//
this.label7.AutoSize = true;
this.label7.ForeColor = System.Drawing.Color.DarkGray;
this.label7.Location = new System.Drawing.Point(882, 133);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(292, 27);
this.label7.TabIndex = 20;
this.label7.Text = "98: 扫码NG(不允许在界面配置)";
//
// FrmChannelCfg
//
this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 27F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38)))));
this.ClientSize = new System.Drawing.Size(1204, 752);
this.Controls.Add(this.panel1);
this.Font = new System.Drawing.Font("微软雅黑", 12F);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.Name = "FrmChannelCfg";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "FrmChannelCfg";
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.numChannelId)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.numDefaultValue)).EndInit();
this.ResumeLayout(false);
}
#endregion
private JinYuan.ControlLib.PanelExt panel1;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Button button4;
private System.Windows.Forms.Button button2;
private System.Windows.Forms.Button button1;
private System.Windows.Forms.TextBox txtNewGear;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.NumericUpDown numDefaultValue;
private System.Windows.Forms.ListBox listBoxChannels;
private System.Windows.Forms.NumericUpDown numChannelId;
private System.Windows.Forms.ListBox listBoxGears;
private System.Windows.Forms.Button btnRemoveGear;
private System.Windows.Forms.Label label7;
}
}
LargeSquareOne/FrmChannelCfg.cs
+133
View File
@@ -0,0 +1,133 @@
using JinYuan.Models;
using JinYuan.VirtualDataLibrary;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace LargeSquareOne
{
public partial class FrmChannelCfg : Form
{
private ChannelConfig _config;
private Channel _currentChannel;
public FrmChannelCfg()
{
InitializeComponent();
LoadData();
}
private void LoadData()
{
_config = CommonMethods.LoadFromJson(CommonMethods.ChannelPath);
listBoxChannels.DataSource = _config.Channels;
listBoxChannels.DisplayMember = "AllContent";
}
// 选中通道时更新右侧详情
private void listBoxChannels_SelectedIndexChanged(object sender, EventArgs e)
{
_currentChannel = (Channel)listBoxChannels.SelectedItem;
if (_currentChannel != null)
{
numChannelId.Value = _currentChannel.ChannelId;
numDefaultValue.Value = _currentChannel.DefaultValue;
UpdateGearsList();
}
}
private void UpdateGearsList()
{
listBoxGears.DataSource = null;
listBoxGears.DataSource = _currentChannel.Gears;
}
private void UpdateChannelList()
{
listBoxChannels.DataSource = null;
listBoxChannels.DataSource = _config.Channels;
listBoxChannels.DisplayMember = "AllContent";
}
// 添加档位
private void btnAddGear_Click(object sender, EventArgs e)
{
var gearName = txtNewGear.Text.Trim();
if (!string.IsNullOrEmpty(gearName))
{
_currentChannel.Gears.Add(gearName);
txtNewGear.Text = "";
UpdateGearsList();
}
}
// 删除档位
private void btnRemoveGear_Click(object sender, EventArgs e)
{
if (listBoxGears.SelectedItem != null)
{
var gear = listBoxGears.SelectedItem.ToString();
_currentChannel.Gears.Remove(gear);
UpdateGearsList();
}
}
// 保存
private void btnSave_Click(object sender, EventArgs e)
{
// 更新当前通道数据
if (_currentChannel != null)
{
_currentChannel.DefaultValue = (int)numDefaultValue.Value;
}
CommonMethods.SaveToJson(CommonMethods.ChannelPath, _config);
MessageBox.Show("保存成功！");
}
private void button4_Click(object sender, EventArgs e)
{
this.Close();
}
private void listBoxGears_MouseDoubleClick(object sender, MouseEventArgs e)
{
int index = listBoxGears.IndexFromPoint(e.Location);
if (index != ListBox.NoMatches)
{
string oldValue = listBoxGears.Items[index].ToString();
FrmInput frm = new FrmInput(oldValue);
frm.ShowDialog();
string newValue = frm.CurGear;
if (!string.IsNullOrEmpty(newValue))
{
var gearIndex = _currentChannel.Gears.IndexOf(oldValue);
_currentChannel.Gears[gearIndex] = newValue; // 直接修改 Items
UpdateChannelList();
}
}
}
private void numDefaultValue_ValueChanged(object sender, EventArgs e)
{
_currentChannel.DefaultValue = (int)numDefaultValue.Value;
UpdateChannelList();
}
private void numDefaultValue_Validating(object sender, CancelEventArgs e)
{
if ((int)numDefaultValue.Value == 98)
{
MessageBox.Show("98: 扫码NG(不允许在界面配置)");
e.Cancel = true;
return;
}
}
}
}
LargeSquareOne/FrmChannelCfg.resx
+120
View File
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
LargeSquareOne/FrmInput.Designer.cs
Generated
+116
View File
@@ -0,0 +1,116 @@
namespace LargeSquareOne
{
partial class FrmInput
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.panel1 = new JinYuan.ControlLib.PanelExt();
this.btnOk = new System.Windows.Forms.Button();
this.txtGear = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label();
this.panel1.SuspendLayout();
this.SuspendLayout();
//
// panel1
//
this.panel1.BackColor = System.Drawing.Color.Transparent;
this.panel1.BordeColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(79)))), ((int)(((byte)(150)))));
this.panel1.BordeWidth = 2;
this.panel1.BottomGap = 0;
this.panel1.Controls.Add(this.btnOk);
this.panel1.Controls.Add(this.txtGear);
this.panel1.Controls.Add(this.label1);
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.LeftGap = 0;
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.panel1.Name = "panel1";
this.panel1.RightGap = 0;
this.panel1.Size = new System.Drawing.Size(438, 72);
this.panel1.TabIndex = 0;
this.panel1.TopGap = 0;
//
// btnOk
//
this.btnOk.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(3)))), ((int)(((byte)(27)))), ((int)(((byte)(78)))));
this.btnOk.Font = new System.Drawing.Font("微软雅黑", 11.5F);
this.btnOk.ForeColor = System.Drawing.Color.White;
this.btnOk.Location = new System.Drawing.Point(305, 12);
this.btnOk.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.btnOk.Name = "btnOk";
this.btnOk.Size = new System.Drawing.Size(112, 41);
this.btnOk.TabIndex = 12;
this.btnOk.Text = "确定";
this.btnOk.UseVisualStyleBackColor = false;
this.btnOk.Click += new System.EventHandler(this.btnOk_Click);
//
// txtGear
//
this.txtGear.Location = new System.Drawing.Point(111, 16);
this.txtGear.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtGear.Name = "txtGear";
this.txtGear.Size = new System.Drawing.Size(148, 34);
this.txtGear.TabIndex = 10;
//
// label1
//
this.label1.AutoSize = true;
this.label1.ForeColor = System.Drawing.Color.White;
this.label1.Location = new System.Drawing.Point(32, 19);
this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(52, 27);
this.label1.TabIndex = 1;
this.label1.Text = "档位";
//
// FrmInput
//
this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 27F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38)))));
this.ClientSize = new System.Drawing.Size(438, 72);
this.Controls.Add(this.panel1);
this.Font = new System.Drawing.Font("微软雅黑", 12F);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.Name = "FrmInput";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "FrmChannelCfg";
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
this.ResumeLayout(false);
}
#endregion
private JinYuan.ControlLib.PanelExt panel1;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Button btnOk;
private System.Windows.Forms.TextBox txtGear;
}
}
LargeSquareOne/FrmInput.cs
+42
View File
@@ -0,0 +1,42 @@
using JinYuan.Models;
using JinYuan.VirtualDataLibrary;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace LargeSquareOne
{
public partial class FrmInput : Form
{
public string CurGear
{
get
{
return txtGear.Text?.Trim();
}
}
public FrmInput()
{
InitializeComponent();
}
public FrmInput(string gear)
{
InitializeComponent();
this.txtGear.Text = gear;
}
private void btnOk_Click(object sender, EventArgs e)
{
this.Close();
}
}
}
LargeSquareOne/FrmInput.resx
+120
View File
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
LargeSquareOne/FrmLogin.cs
+1 -1
View File
@@ -72,7 +72,7 @@ namespace LargeSquareOne
CommonMethods.IsLoginOk = true;
}
//ngcode
CommonMethods.listNgCodeEntity = CommonMethods.db.QueryAll<NgCodeEntity>();
//CommonMethods.listNgCodeEntity = CommonMethods.db.QueryAll<NgCodeEntity>();
}
/// <summary>
LargeSquareOne/FrmParamSet.Designer.cs
Generated
+71 -53
View File
@@ -29,9 +29,9 @@
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmSystemSet));
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
this.up_QieHuanPeriod = new JinYuan.ControlLib.UpDownLabel();
this.tog_AutoQieHuanM = new JinYuan.ControlLib.Toggle();
this.label16 = new System.Windows.Forms.Label();
@@ -78,6 +78,7 @@
this.tog_OKSwitching = new JinYuan.ControlLib.Toggle();
this.title5 = new JinYuan.ControlLib.Title();
this.dgvFdConfigs = new System.Windows.Forms.DataGridView();
this.btn_cfgChannel = new System.Windows.Forms.Button();
((System.ComponentModel.ISupportInitialize)(this.dgvFdConfigs)).BeginInit();
this.SuspendLayout();
//
@@ -121,7 +122,7 @@
this.label16.ForeColor = System.Drawing.Color.White;
this.label16.Location = new System.Drawing.Point(911, 276);
this.label16.Name = "label16";
this.label16.Size = new System.Drawing.Size(202, 26);
this.label16.Size = new System.Drawing.Size(254, 31);
this.label16.TabIndex = 43;
this.label16.Text = "自动切换监控界面时间";
//
@@ -133,7 +134,7 @@
this.label17.ForeColor = System.Drawing.Color.White;
this.label17.Location = new System.Drawing.Point(556, 275);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(221, 26);
this.label17.Size = new System.Drawing.Size(278, 31);
this.label17.TabIndex = 44;
this.label17.Text = "无操作自动切换监控界面";
//
@@ -142,7 +143,7 @@
this.txtEqp_code.Font = new System.Drawing.Font("微软雅黑", 12F);
this.txtEqp_code.Location = new System.Drawing.Point(832, 101);
this.txtEqp_code.Name = "txtEqp_code";
this.txtEqp_code.Size = new System.Drawing.Size(173, 29);
this.txtEqp_code.Size = new System.Drawing.Size(173, 34);
this.txtEqp_code.TabIndex = 42;
this.txtEqp_code.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
@@ -154,7 +155,7 @@
this.label13.ForeColor = System.Drawing.Color.White;
this.label13.Location = new System.Drawing.Point(738, 101);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(88, 26);
this.label13.Size = new System.Drawing.Size(110, 31);
this.label13.TabIndex = 41;
this.label13.Text = "设备编号";
//
@@ -163,7 +164,7 @@
this.txtline_No.Font = new System.Drawing.Font("微软雅黑", 12F);
this.txtline_No.Location = new System.Drawing.Point(549, 101);
this.txtline_No.Name = "txtline_No";
this.txtline_No.Size = new System.Drawing.Size(173, 29);
this.txtline_No.Size = new System.Drawing.Size(173, 34);
this.txtline_No.TabIndex = 40;
this.txtline_No.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
@@ -175,7 +176,7 @@
this.label14.ForeColor = System.Drawing.Color.White;
this.label14.Location = new System.Drawing.Point(455, 101);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(88, 26);
this.label14.Size = new System.Drawing.Size(110, 31);
this.label14.TabIndex = 39;
this.label14.Text = "产线编号";
//
@@ -184,7 +185,7 @@
this.txtFactory_code.Font = new System.Drawing.Font("微软雅黑", 12F);
this.txtFactory_code.Location = new System.Drawing.Point(261, 101);
this.txtFactory_code.Name = "txtFactory_code";
this.txtFactory_code.Size = new System.Drawing.Size(173, 29);
this.txtFactory_code.Size = new System.Drawing.Size(173, 34);
this.txtFactory_code.TabIndex = 38;
this.txtFactory_code.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
@@ -196,7 +197,7 @@
this.label15.ForeColor = System.Drawing.Color.White;
this.label15.Location = new System.Drawing.Point(167, 99);
this.label15.Name = "label15";
this.label15.Size = new System.Drawing.Size(88, 26);
this.label15.Size = new System.Drawing.Size(110, 31);
this.label15.TabIndex = 37;
this.label15.Text = "工厂代码";
//
@@ -218,7 +219,7 @@
this.cmb_PLCType.FormattingEnabled = true;
this.cmb_PLCType.Location = new System.Drawing.Point(261, 34);
this.cmb_PLCType.Name = "cmb_PLCType";
this.cmb_PLCType.Size = new System.Drawing.Size(173, 28);
this.cmb_PLCType.Size = new System.Drawing.Size(173, 31);
this.cmb_PLCType.TabIndex = 33;
//
// label12
@@ -229,7 +230,7 @@
this.label12.ForeColor = System.Drawing.Color.White;
this.label12.Location = new System.Drawing.Point(141, 35);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(123, 26);
this.label12.Size = new System.Drawing.Size(155, 31);
this.label12.TabIndex = 34;
this.label12.Text = "PLC类型配置";
//
@@ -270,7 +271,7 @@
this.label11.ForeColor = System.Drawing.Color.White;
this.label11.Location = new System.Drawing.Point(44, 273);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(126, 26);
this.label11.Size = new System.Drawing.Size(158, 31);
this.label11.TabIndex = 30;
this.label11.Text = "开启刷卡模式";
//
@@ -298,7 +299,7 @@
this.label10.ForeColor = System.Drawing.Color.White;
this.label10.Location = new System.Drawing.Point(368, 376);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(130, 26);
this.label10.Size = new System.Drawing.Size(163, 31);
this.label10.TabIndex = 28;
this.label10.Text = "获取MES参数";
//
@@ -326,7 +327,7 @@
this.label9.ForeColor = System.Drawing.Color.White;
this.label9.Location = new System.Drawing.Point(39, 376);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(200, 26);
this.label9.Size = new System.Drawing.Size(251, 31);
this.label9.TabIndex = 26;
this.label9.Text = "MES/非MES模式切换";
//
@@ -354,7 +355,7 @@
this.label8.ForeColor = System.Drawing.Color.White;
this.label8.Location = new System.Drawing.Point(266, 273);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(164, 26);
this.label8.Size = new System.Drawing.Size(206, 31);
this.label8.TabIndex = 24;
this.label8.Text = "线程耗时日志保存";
//
@@ -446,7 +447,7 @@
this.label5.ForeColor = System.Drawing.Color.White;
this.label5.Location = new System.Drawing.Point(1068, 215);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(202, 26);
this.label5.Size = new System.Drawing.Size(254, 31);
this.label5.TabIndex = 12;
this.label5.Text = "焊机功率曲线显示数量";
this.label5.Visible = false;
@@ -459,7 +460,7 @@
this.label4.ForeColor = System.Drawing.Color.White;
this.label4.Location = new System.Drawing.Point(809, 215);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(126, 26);
this.label4.Size = new System.Drawing.Size(158, 31);
this.label4.TabIndex = 13;
this.label4.Text = "自动锁屏时间";
//
@@ -471,7 +472,7 @@
this.label3.ForeColor = System.Drawing.Color.White;
this.label3.Location = new System.Drawing.Point(556, 215);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(145, 26);
this.label3.Size = new System.Drawing.Size(182, 31);
this.label3.TabIndex = 14;
this.label3.Text = "无操作自动锁屏";
//
@@ -483,7 +484,7 @@
this.label6.ForeColor = System.Drawing.Color.WhiteSmoke;
this.label6.Location = new System.Drawing.Point(291, 215);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(126, 26);
this.label6.Size = new System.Drawing.Size(158, 31);
this.label6.TabIndex = 11;
this.label6.Text = "软件自动登录";
//
@@ -495,7 +496,7 @@
this.label7.ForeColor = System.Drawing.Color.White;
this.label7.Location = new System.Drawing.Point(44, 215);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(126, 26);
this.label7.Size = new System.Drawing.Size(158, 31);
this.label7.TabIndex = 10;
this.label7.Text = "开机自动启动";
//
@@ -573,7 +574,7 @@
this.txt_Prot.Font = new System.Drawing.Font("微软雅黑", 12F);
this.txt_Prot.Location = new System.Drawing.Point(832, 35);
this.txt_Prot.Name = "txt_Prot";
this.txt_Prot.Size = new System.Drawing.Size(173, 29);
this.txt_Prot.Size = new System.Drawing.Size(173, 34);
this.txt_Prot.TabIndex = 4;
this.txt_Prot.Text = "9600";
this.txt_Prot.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
@@ -586,7 +587,7 @@
this.label2.ForeColor = System.Drawing.Color.White;
this.label2.Location = new System.Drawing.Point(726, 36);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(107, 26);
this.label2.Size = new System.Drawing.Size(134, 31);
this.label2.TabIndex = 3;
this.label2.Text = "端口号配置";
//
@@ -595,7 +596,7 @@
this.txt_IP.Font = new System.Drawing.Font("微软雅黑", 12F);
this.txt_IP.Location = new System.Drawing.Point(549, 35);
this.txt_IP.Name = "txt_IP";
this.txt_IP.Size = new System.Drawing.Size(173, 29);
this.txt_IP.Size = new System.Drawing.Size(173, 34);
this.txt_IP.TabIndex = 2;
this.txt_IP.Text = "127.0.0.1";
this.txt_IP.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
@@ -608,7 +609,7 @@
this.label1.ForeColor = System.Drawing.Color.White;
this.label1.Location = new System.Drawing.Point(443, 36);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(106, 26);
this.label1.Size = new System.Drawing.Size(134, 31);
this.label1.TabIndex = 1;
this.label1.Text = "IP地址配置";
//
@@ -632,7 +633,7 @@
this.label18.ForeColor = System.Drawing.Color.White;
this.label18.Location = new System.Drawing.Point(634, 376);
this.label18.Name = "label18";
this.label18.Size = new System.Drawing.Size(202, 26);
this.label18.Size = new System.Drawing.Size(254, 31);
this.label18.TabIndex = 47;
this.label18.Text = "强制OK/正常模式切换";
//
@@ -674,50 +675,66 @@
this.dgvFdConfigs.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38)))));
this.dgvFdConfigs.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.dgvFdConfigs.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38)))));
dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 10.5F);
dataGridViewCellStyle1.ForeColor = System.Drawing.Color.White;
dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38)))));
dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dgvFdConfigs.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38)))));
dataGridViewCellStyle7.Font = new System.Drawing.Font("微软雅黑", 10.5F);
dataGridViewCellStyle7.ForeColor = System.Drawing.Color.White;
dataGridViewCellStyle7.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38)))));
dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dgvFdConfigs.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7;
this.dgvFdConfigs.ColumnHeadersHeight = 40;
this.dgvFdConfigs.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(40)))), ((int)(((byte)(86)))));
dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 10.5F);
dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvFdConfigs.DefaultCellStyle = dataGridViewCellStyle2;
dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(40)))), ((int)(((byte)(86)))));
dataGridViewCellStyle8.Font = new System.Drawing.Font("微软雅黑", 10.5F);
dataGridViewCellStyle8.ForeColor = System.Drawing.Color.White;
dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvFdConfigs.DefaultCellStyle = dataGridViewCellStyle8;
this.dgvFdConfigs.EnableHeadersVisualStyles = false;
this.dgvFdConfigs.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(21)))), ((int)(((byte)(77)))), ((int)(((byte)(147)))));
this.dgvFdConfigs.Location = new System.Drawing.Point(44, 486);
this.dgvFdConfigs.Location = new System.Drawing.Point(22, 594);
this.dgvFdConfigs.Name = "dgvFdConfigs";
this.dgvFdConfigs.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(40)))), ((int)(((byte)(86)))));
dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 10.5F);
dataGridViewCellStyle3.ForeColor = System.Drawing.Color.White;
dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dgvFdConfigs.RowHeadersDefaultCellStyle = dataGridViewCellStyle3;
dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(40)))), ((int)(((byte)(86)))));
dataGridViewCellStyle9.Font = new System.Drawing.Font("微软雅黑", 10.5F);
dataGridViewCellStyle9.ForeColor = System.Drawing.Color.White;
dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dgvFdConfigs.RowHeadersDefaultCellStyle = dataGridViewCellStyle9;
this.dgvFdConfigs.RowHeadersWidth = 55;
this.dgvFdConfigs.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
this.dgvFdConfigs.RowTemplate.Height = 40;
this.dgvFdConfigs.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False;
this.dgvFdConfigs.Size = new System.Drawing.Size(1757, 69);
this.dgvFdConfigs.TabIndex = 78;
this.dgvFdConfigs.Visible = false;
//
// btn_cfgChannel
//
this.btn_cfgChannel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(3)))), ((int)(((byte)(27)))), ((int)(((byte)(78)))));
this.btn_cfgChannel.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_cfgChannel.Font = new System.Drawing.Font("微软雅黑", 11.5F);
this.btn_cfgChannel.ForeColor = System.Drawing.Color.White;
this.btn_cfgChannel.Location = new System.Drawing.Point(45, 484);
this.btn_cfgChannel.Name = "btn_cfgChannel";
this.btn_cfgChannel.Size = new System.Drawing.Size(105, 36);
this.btn_cfgChannel.TabIndex = 80;
this.btn_cfgChannel.Text = "修改分档";
this.btn_cfgChannel.UseVisualStyleBackColor = false;
this.btn_cfgChannel.Click += new System.EventHandler(this.btn_cfgChannel_Click);
//
// FrmSystemSet
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 23F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38)))));
this.ClientSize = new System.Drawing.Size(1370, 651);
this.Controls.Add(this.btn_cfgChannel);
this.Controls.Add(this.dgvFdConfigs);
this.Controls.Add(this.title5);
this.Controls.Add(this.tog_OKSwitching);
@@ -822,5 +839,6 @@
private JinYuan.ControlLib.Toggle tog_OKSwitching;
private JinYuan.ControlLib.Title title5;
private System.Windows.Forms.DataGridView dgvFdConfigs;
private System.Windows.Forms.Button btn_cfgChannel;
}
}
LargeSquareOne/FrmParamSet.cs
+6
View File
@@ -928,5 +928,11 @@ namespace LargeSquareOne
}
#endregion
private void btn_cfgChannel_Click(object sender, EventArgs e)
{
FrmChannelCfg frm = new FrmChannelCfg();
frm.ShowDialog();
}
}
}
LargeSquareOne/LargeSquareOne.csproj
+18
View File
@@ -200,6 +200,12 @@
<Compile Include="CustomMessageBox.Designer.cs">
<DependentUpon>CustomMessageBox.cs</DependentUpon>
</Compile>
<Compile Include="FrmChannelCfg.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FrmChannelCfg.Designer.cs">
<DependentUpon>FrmChannelCfg.cs</DependentUpon>
</Compile>
<Compile Include="FrmCpkCount.cs">
<SubType>Form</SubType>
</Compile>
@@ -224,6 +230,12 @@
<Compile Include="FrmHelper.Designer.cs">
<DependentUpon>FrmHelper.cs</DependentUpon>
</Compile>
<Compile Include="FrmInput.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FrmInput.Designer.cs">
<DependentUpon>FrmInput.cs</DependentUpon>
</Compile>
<Compile Include="FrmLogin.cs">
<SubType>Form</SubType>
</Compile>
@@ -324,6 +336,9 @@
<EmbeddedResource Include="CustomMessageBox.resx">
<DependentUpon>CustomMessageBox.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FrmChannelCfg.resx">
<DependentUpon>FrmChannelCfg.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FrmCpkCount.resx">
<DependentUpon>FrmCpkCount.cs</DependentUpon>
</EmbeddedResource>
@@ -337,6 +352,9 @@
<EmbeddedResource Include="FrmHelper.resx">
<DependentUpon>FrmHelper.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FrmInput.resx">
<DependentUpon>FrmInput.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FrmLogin.resx">
<DependentUpon>FrmLogin.cs</DependentUpon>
</EmbeddedResource>