分档
This commit is contained in:
@@ -6,8 +6,9 @@
|
||||
<connectionStrings>
|
||||
<add name="connDbType" connectionString="SqlServer" />
|
||||
<add name="connString" connectionString="Server=192.168.133.180,43852\MSSQLSERVER01;DataBase=LargeSquareOne;Uid=sa;Pwd=123" />
|
||||
<add name="connString2" connectionString="Server=192.168.133.180,43852\MSSQLSERVER01;DataBase=LargeSquareOne;Uid=sa;Pwd=123" />
|
||||
<!--<add name="connString" connectionString="Server=ZCDEEPSEAI;DataBase=LargeSquareOne;Uid=sa;Pwd=123" />-->
|
||||
<add name="connString2" connectionString="Server=192.168.133.180;DataBase=HBG_CupDataTurnover;Uid=jyzdh;Pwd=eve123456" />
|
||||
<!--<add name="connString2" connectionString="Server=192.168.133.180;DataBase=HBG_CupDataTurnover;Uid=jyzdh;Pwd=eve123456" />-->
|
||||
<add name="connString3" connectionString="Server=localhost;DataBase=ProConfigDB;User Id=jypz;Password=eve123456;Persist Security Info=true;Allow Zero Datetime=true;Character Set=utf8;" />
|
||||
</connectionStrings>
|
||||
<runtime>
|
||||
|
||||
+21
-211
@@ -68,34 +68,15 @@
|
||||
this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column22 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column33 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column29 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column138 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column25 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column96 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column97 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column98 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column99 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column100 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column101 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column103 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column104 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column105 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column106 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column107 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column108 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column109 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column110 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column111 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column112 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column113 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column114 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column147 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column34 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column35 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column102 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column22 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.tableLayoutPanel1.SuspendLayout();
|
||||
this.groupBoxEX3.SuspendLayout();
|
||||
this.groupBoxEX2.SuspendLayout();
|
||||
@@ -501,34 +482,15 @@
|
||||
this.dataGridViewTextBoxColumn2,
|
||||
this.Column7,
|
||||
this.dataGridViewTextBoxColumn5,
|
||||
this.Column22,
|
||||
this.Column33,
|
||||
this.Column29,
|
||||
this.Column3,
|
||||
this.Column138,
|
||||
this.Column25,
|
||||
this.Column96,
|
||||
this.Column97,
|
||||
this.Column98,
|
||||
this.Column99,
|
||||
this.Column100,
|
||||
this.Column101,
|
||||
this.Column103,
|
||||
this.Column104,
|
||||
this.Column105,
|
||||
this.Column106,
|
||||
this.Column107,
|
||||
this.Column108,
|
||||
this.Column109,
|
||||
this.Column110,
|
||||
this.Column111,
|
||||
this.Column112,
|
||||
this.Column113,
|
||||
this.Column114,
|
||||
this.Column147,
|
||||
this.Column34,
|
||||
this.Column35,
|
||||
this.Column102,
|
||||
this.Column22});
|
||||
this.Column3});
|
||||
dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
||||
dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(32)))), ((int)(((byte)(32)))));
|
||||
dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 10.5F);
|
||||
@@ -605,6 +567,15 @@
|
||||
this.dataGridViewTextBoxColumn5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
|
||||
this.dataGridViewTextBoxColumn5.Width = 210;
|
||||
//
|
||||
// Column22
|
||||
//
|
||||
this.Column22.DataPropertyName = "Result";
|
||||
this.Column22.HeaderText = "反馈结果";
|
||||
this.Column22.MinimumWidth = 8;
|
||||
this.Column22.Name = "Column22";
|
||||
this.Column22.ReadOnly = true;
|
||||
this.Column22.Width = 150;
|
||||
//
|
||||
// Column33
|
||||
//
|
||||
this.Column33.DataPropertyName = "CSBYHSCHEDULE";
|
||||
@@ -623,14 +594,6 @@
|
||||
this.Column29.ReadOnly = true;
|
||||
this.Column29.Width = 150;
|
||||
//
|
||||
// Column3
|
||||
//
|
||||
this.Column3.DataPropertyName = "Remark";
|
||||
this.Column3.HeaderText = "备注";
|
||||
this.Column3.Name = "Column3";
|
||||
this.Column3.ReadOnly = true;
|
||||
this.Column3.Width = 400;
|
||||
//
|
||||
// Column138
|
||||
//
|
||||
this.Column138.DataPropertyName = "UpState";
|
||||
@@ -638,139 +601,6 @@
|
||||
this.Column138.Name = "Column138";
|
||||
this.Column138.ReadOnly = true;
|
||||
//
|
||||
// Column25
|
||||
//
|
||||
this.Column25.DataPropertyName = "CCDResult1";
|
||||
this.Column25.HeaderText = "正面(2D/3D)";
|
||||
this.Column25.Name = "Column25";
|
||||
this.Column25.ReadOnly = true;
|
||||
//
|
||||
// Column96
|
||||
//
|
||||
this.Column96.DataPropertyName = "CCDResult2";
|
||||
this.Column96.HeaderText = "反面(2D/3D)";
|
||||
this.Column96.Name = "Column96";
|
||||
this.Column96.ReadOnly = true;
|
||||
//
|
||||
// Column97
|
||||
//
|
||||
this.Column97.DataPropertyName = "CCDResult3";
|
||||
this.Column97.HeaderText = "左侧面(2D/3D)";
|
||||
this.Column97.Name = "Column97";
|
||||
this.Column97.ReadOnly = true;
|
||||
//
|
||||
// Column98
|
||||
//
|
||||
this.Column98.DataPropertyName = "CCDResult4";
|
||||
this.Column98.HeaderText = "右侧面(2D/3D)";
|
||||
this.Column98.Name = "Column98";
|
||||
this.Column98.ReadOnly = true;
|
||||
//
|
||||
// Column99
|
||||
//
|
||||
this.Column99.DataPropertyName = "CCDResult5";
|
||||
this.Column99.HeaderText = "顶面(2D/3D)";
|
||||
this.Column99.Name = "Column99";
|
||||
this.Column99.ReadOnly = true;
|
||||
//
|
||||
// Column100
|
||||
//
|
||||
this.Column100.DataPropertyName = "CCDResult6";
|
||||
this.Column100.HeaderText = "底面(2D/3D)";
|
||||
this.Column100.Name = "Column100";
|
||||
this.Column100.ReadOnly = true;
|
||||
//
|
||||
// Column101
|
||||
//
|
||||
this.Column101.DataPropertyName = "CCDResult7";
|
||||
this.Column101.HeaderText = "底DE1";
|
||||
this.Column101.Name = "Column101";
|
||||
this.Column101.ReadOnly = true;
|
||||
//
|
||||
// Column103
|
||||
//
|
||||
this.Column103.DataPropertyName = "CCDResult8";
|
||||
this.Column103.HeaderText = "底DE2";
|
||||
this.Column103.Name = "Column103";
|
||||
this.Column103.ReadOnly = true;
|
||||
//
|
||||
// Column104
|
||||
//
|
||||
this.Column104.DataPropertyName = "CCDResult9";
|
||||
this.Column104.HeaderText = "底DE3";
|
||||
this.Column104.Name = "Column104";
|
||||
this.Column104.ReadOnly = true;
|
||||
//
|
||||
// Column105
|
||||
//
|
||||
this.Column105.DataPropertyName = "CCDResult10";
|
||||
this.Column105.HeaderText = "底DE4";
|
||||
this.Column105.Name = "Column105";
|
||||
this.Column105.ReadOnly = true;
|
||||
//
|
||||
// Column106
|
||||
//
|
||||
this.Column106.DataPropertyName = "CCDResult11";
|
||||
this.Column106.HeaderText = "中ME1";
|
||||
this.Column106.Name = "Column106";
|
||||
this.Column106.ReadOnly = true;
|
||||
//
|
||||
// Column107
|
||||
//
|
||||
this.Column107.DataPropertyName = "CCDResult12";
|
||||
this.Column107.HeaderText = "中ME2";
|
||||
this.Column107.Name = "Column107";
|
||||
this.Column107.ReadOnly = true;
|
||||
//
|
||||
// Column108
|
||||
//
|
||||
this.Column108.DataPropertyName = "CCDResult13";
|
||||
this.Column108.HeaderText = "中ME3";
|
||||
this.Column108.Name = "Column108";
|
||||
this.Column108.ReadOnly = true;
|
||||
//
|
||||
// Column109
|
||||
//
|
||||
this.Column109.DataPropertyName = "CCDResult14";
|
||||
this.Column109.HeaderText = "中ME4";
|
||||
this.Column109.Name = "Column109";
|
||||
this.Column109.ReadOnly = true;
|
||||
//
|
||||
// Column110
|
||||
//
|
||||
this.Column110.DataPropertyName = "CCDResult15";
|
||||
this.Column110.HeaderText = "极柱(POS/NEG)";
|
||||
this.Column110.Name = "Column110";
|
||||
this.Column110.ReadOnly = true;
|
||||
//
|
||||
// Column111
|
||||
//
|
||||
this.Column111.DataPropertyName = "CCDResult16";
|
||||
this.Column111.HeaderText = "防爆阀(PRO)";
|
||||
this.Column111.Name = "Column111";
|
||||
this.Column111.ReadOnly = true;
|
||||
//
|
||||
// Column112
|
||||
//
|
||||
this.Column112.DataPropertyName = "CCDResult17";
|
||||
this.Column112.HeaderText = "厚度1";
|
||||
this.Column112.Name = "Column112";
|
||||
this.Column112.ReadOnly = true;
|
||||
//
|
||||
// Column113
|
||||
//
|
||||
this.Column113.DataPropertyName = "CCDResult18";
|
||||
this.Column113.HeaderText = "厚度2";
|
||||
this.Column113.Name = "Column113";
|
||||
this.Column113.ReadOnly = true;
|
||||
//
|
||||
// Column114
|
||||
//
|
||||
this.Column114.DataPropertyName = "CCDResult19";
|
||||
this.Column114.HeaderText = "厚度3";
|
||||
this.Column114.Name = "Column114";
|
||||
this.Column114.ReadOnly = true;
|
||||
//
|
||||
// Column147
|
||||
//
|
||||
this.Column147.DataPropertyName = "RethrowNum";
|
||||
@@ -805,14 +635,13 @@
|
||||
this.Column102.ReadOnly = true;
|
||||
this.Column102.Width = 150;
|
||||
//
|
||||
// Column22
|
||||
// Column3
|
||||
//
|
||||
this.Column22.DataPropertyName = "Result";
|
||||
this.Column22.HeaderText = "反馈结果";
|
||||
this.Column22.MinimumWidth = 8;
|
||||
this.Column22.Name = "Column22";
|
||||
this.Column22.ReadOnly = true;
|
||||
this.Column22.Width = 150;
|
||||
this.Column3.DataPropertyName = "Remark";
|
||||
this.Column3.HeaderText = "备注";
|
||||
this.Column3.Name = "Column3";
|
||||
this.Column3.ReadOnly = true;
|
||||
this.Column3.Width = 400;
|
||||
//
|
||||
// FrmDataMonitor
|
||||
//
|
||||
@@ -875,33 +704,14 @@
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column7;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column22;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column33;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column29;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column138;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column25;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column96;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column97;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column98;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column99;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column100;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column101;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column103;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column104;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column105;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column106;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column107;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column108;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column109;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column110;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column111;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column112;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column113;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column114;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column147;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column34;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column35;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column102;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column22;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
using HML;
|
||||
using JinYuan.CommunicationLib.Enum;
|
||||
using JinYuan.ControlCenters;
|
||||
using JinYuan.Helper;
|
||||
using JinYuan.MES.Models;
|
||||
using JinYuan.Models;
|
||||
@@ -495,8 +496,8 @@ namespace LargeSquareOne
|
||||
CommonMethods.AddDataMonitorLog(0, "启动开始监控");
|
||||
btSatrt.Text = "连接PLC中…";
|
||||
bool IsLink = CommonMethods.ConnectPLC();
|
||||
|
||||
if (IsLink)
|
||||
bool IsGrading = CommonMethods.WriteGrading();
|
||||
if (IsLink && IsGrading)
|
||||
{
|
||||
OmronStart(true);
|
||||
CommonMethods.IsRun = true;
|
||||
|
||||
@@ -153,27 +153,18 @@
|
||||
<metadata name="dataGridViewTextBoxColumn5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="Column22.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="Column33.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="Column29.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="Column138.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="Column25.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="Column96.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="Column97.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="Column147.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
@@ -186,7 +177,7 @@
|
||||
<metadata name="Column102.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="Column22.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="imageList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
@@ -197,7 +188,7 @@
|
||||
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
|
||||
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
|
||||
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABE
|
||||
DQAAAk1TRnQBSQFMAgEBAwEAAYABAgGAAQIBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
|
||||
DQAAAk1TRnQBSQFMAgEBAwEAAYgBAgGIAQIBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
|
||||
AwABEAMAAQEBAAEgBgABEC4AAxUBHQMkATQDBQEGKAADHQEpAl4BZwHwATUBNgHPAf8BNQE2Ac8B/wE1
|
||||
ATYBzwH/ATUBNgHPAf8BNQE2Ac8B/wNOAZagAAMTARkDZQHlA+YB/wPmAf8D5gH/A+YB/wPmAf8DRwGA
|
||||
HAACUwFUAaoBNQE2Ac8B/wE1ATYBzwH/ATUBNgHPAf8BNQE2Ac8B/wE1ATYBzwH/ATUBNgHPAf8BNQE2
|
||||
|
||||
Generated
-2
@@ -665,7 +665,6 @@
|
||||
this.title5.Size = new System.Drawing.Size(117, 37);
|
||||
this.title5.TabIndex = 49;
|
||||
this.title5.TitleName = "分档设置";
|
||||
this.title5.Visible = false;
|
||||
//
|
||||
// dgvFdConfigs
|
||||
//
|
||||
@@ -712,7 +711,6 @@
|
||||
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;
|
||||
//
|
||||
// FrmSystemSet
|
||||
//
|
||||
|
||||
+116
-63
@@ -26,6 +26,13 @@ namespace LargeSquareOne
|
||||
private List<string> NGLDTypes3 = new List<string>();//NG拉带类型
|
||||
private bool isFDEditing = false;
|
||||
private int editingFDRowIndex = -1;
|
||||
//档位
|
||||
private string Grading1 = "一档";
|
||||
private string Grading2 = "二档";
|
||||
private string Grading3 = "三档";
|
||||
private string Grading4 = "四档";
|
||||
private string Grading5 = "五档";
|
||||
private string Grading6 = "六档";
|
||||
private readonly string configFolderPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Config");
|
||||
/// <summary>
|
||||
/// 打印日志方法
|
||||
@@ -72,8 +79,8 @@ namespace LargeSquareOne
|
||||
NGLDTypes2.AddRange(new string[] { "面1", "面2", "面3" });
|
||||
NGLDTypes3.AddRange(new string[] { "面1", "面2", "面3" });
|
||||
SetupFDDataGridView();
|
||||
//取消分档 ,有单独的分档机
|
||||
// LoadFDConfig();
|
||||
|
||||
LoadFDConfig();
|
||||
|
||||
this.tog_AutoStart.IsChecked = CommonMethods.sysConfig.AutoStart;
|
||||
this.tog_AutoLogin.IsChecked = CommonMethods.sysConfig.AutoLogin;
|
||||
@@ -462,9 +469,11 @@ namespace LargeSquareOne
|
||||
OKLD2Type = device.OKLD2Type,
|
||||
OKLD3Type = device.OKLD3Type,
|
||||
OKLD4Type = device.OKLD4Type,
|
||||
NGLD5Type = device.NGLD5Type,
|
||||
NGLD6Type = device.NGLD6Type,
|
||||
NGLD7Type = device.NGLD7Type,
|
||||
OKLD5Type = device.OKLD5Type,
|
||||
OKLD6Type = device.OKLD6Type,
|
||||
//NGLD5Type = device.NGLD5Type,
|
||||
//NGLD6Type = device.NGLD6Type,
|
||||
//NGLD7Type = device.NGLD7Type,
|
||||
IsFDActive = device.IsFDActive,
|
||||
IsNGActive = device.IsNGActive
|
||||
}).ToList();
|
||||
@@ -561,62 +570,78 @@ namespace LargeSquareOne
|
||||
Width = 120,
|
||||
ValueType = typeof(string)
|
||||
},
|
||||
new DataGridViewTextBoxColumn
|
||||
{
|
||||
Name = "OKLD5Type",
|
||||
HeaderText = "OK拉带类型5",
|
||||
DataPropertyName = "OKLD5Type",
|
||||
Width = 120,
|
||||
ValueType = typeof(string)
|
||||
},
|
||||
new DataGridViewTextBoxColumn
|
||||
{
|
||||
Name = "OKLD6Type",
|
||||
HeaderText = "OK拉带类型6",
|
||||
DataPropertyName = "OKLD6Type",
|
||||
Width = 120,
|
||||
ValueType = typeof(string)
|
||||
},
|
||||
#endregion
|
||||
#region NG拉带类型
|
||||
new DataGridViewComboBoxColumn
|
||||
{
|
||||
Name = "NGLD5Type",
|
||||
HeaderText = "NG拉带类型5",
|
||||
DataPropertyName = "NGLD5Type",//NG拉带
|
||||
DataSource = new List<string>(NGLDTypes1), // 使用新列表避免引用问题
|
||||
Width = 160,
|
||||
ValueType = typeof(string),
|
||||
FlatStyle = FlatStyle.Flat,
|
||||
DefaultCellStyle = new DataGridViewCellStyle
|
||||
{
|
||||
BackColor = Color.FromArgb(14, 23, 38), // 深色背景
|
||||
ForeColor = Color.White, // 白色文字
|
||||
SelectionBackColor = Color.FromArgb(0, 122, 204), // 选中时的背景色
|
||||
SelectionForeColor = Color.White, // 选中时的文字颜色
|
||||
Font = new Font("微软雅黑", 9F) // 字体设置
|
||||
}
|
||||
},
|
||||
new DataGridViewComboBoxColumn
|
||||
{
|
||||
Name = "NGLD6Type",
|
||||
HeaderText = "NG拉带类型6",
|
||||
DataPropertyName = "NGLD6Type",//NG拉带
|
||||
DataSource = new List<string>(NGLDTypes2), // 使用新列表避免引用问题
|
||||
Width = 160,
|
||||
ValueType = typeof(string),
|
||||
FlatStyle = FlatStyle.Flat,
|
||||
DefaultCellStyle = new DataGridViewCellStyle
|
||||
{
|
||||
BackColor = Color.FromArgb(14, 23, 38), // 深色背景
|
||||
ForeColor = Color.White, // 白色文字
|
||||
SelectionBackColor = Color.FromArgb(0, 122, 204), // 选中时的背景色
|
||||
SelectionForeColor = Color.White, // 选中时的文字颜色
|
||||
Font = new Font("微软雅黑", 9F) // 字体设置
|
||||
}
|
||||
},
|
||||
new DataGridViewComboBoxColumn
|
||||
{
|
||||
Name = "NGLD7Type",
|
||||
HeaderText = "NG拉带类型7",
|
||||
DataPropertyName = "NGLD7Type",//NG拉带
|
||||
DataSource = new List<string>(NGLDTypes3), // 使用新列表避免引用问题
|
||||
Width = 160,
|
||||
ValueType = typeof(string),
|
||||
FlatStyle = FlatStyle.Flat,
|
||||
DefaultCellStyle = new DataGridViewCellStyle
|
||||
{
|
||||
BackColor = Color.FromArgb(14, 23, 38), // 深色背景
|
||||
ForeColor = Color.White, // 白色文字
|
||||
SelectionBackColor = Color.FromArgb(0, 122, 204), // 选中时的背景色
|
||||
SelectionForeColor = Color.White, // 选中时的文字颜色
|
||||
Font = new Font("微软雅黑", 9F) // 字体设置
|
||||
}
|
||||
},
|
||||
// new DataGridViewComboBoxColumn
|
||||
//{
|
||||
// Name = "NGLD5Type",
|
||||
// HeaderText = "NG拉带类型5",
|
||||
// DataPropertyName = "NGLD5Type",//NG拉带
|
||||
// DataSource = new List<string>(NGLDTypes1), // 使用新列表避免引用问题
|
||||
// Width = 160,
|
||||
// ValueType = typeof(string),
|
||||
// FlatStyle = FlatStyle.Flat,
|
||||
// DefaultCellStyle = new DataGridViewCellStyle
|
||||
// {
|
||||
// BackColor = Color.FromArgb(14, 23, 38), // 深色背景
|
||||
// ForeColor = Color.White, // 白色文字
|
||||
// SelectionBackColor = Color.FromArgb(0, 122, 204), // 选中时的背景色
|
||||
// SelectionForeColor = Color.White, // 选中时的文字颜色
|
||||
// Font = new Font("微软雅黑", 9F) // 字体设置
|
||||
// }
|
||||
//},
|
||||
//new DataGridViewComboBoxColumn
|
||||
//{
|
||||
// Name = "NGLD6Type",
|
||||
// HeaderText = "NG拉带类型6",
|
||||
// DataPropertyName = "NGLD6Type",//NG拉带
|
||||
// DataSource = new List<string>(NGLDTypes2), // 使用新列表避免引用问题
|
||||
// Width = 160,
|
||||
// ValueType = typeof(string),
|
||||
// FlatStyle = FlatStyle.Flat,
|
||||
// DefaultCellStyle = new DataGridViewCellStyle
|
||||
// {
|
||||
// BackColor = Color.FromArgb(14, 23, 38), // 深色背景
|
||||
// ForeColor = Color.White, // 白色文字
|
||||
// SelectionBackColor = Color.FromArgb(0, 122, 204), // 选中时的背景色
|
||||
// SelectionForeColor = Color.White, // 选中时的文字颜色
|
||||
// Font = new Font("微软雅黑", 9F) // 字体设置
|
||||
// }
|
||||
//},
|
||||
//new DataGridViewComboBoxColumn
|
||||
//{
|
||||
// Name = "NGLD7Type",
|
||||
// HeaderText = "NG拉带类型7",
|
||||
// DataPropertyName = "NGLD7Type",//NG拉带
|
||||
// DataSource = new List<string>(NGLDTypes3), // 使用新列表避免引用问题
|
||||
// Width = 160,
|
||||
// ValueType = typeof(string),
|
||||
// FlatStyle = FlatStyle.Flat,
|
||||
// DefaultCellStyle = new DataGridViewCellStyle
|
||||
// {
|
||||
// BackColor = Color.FromArgb(14, 23, 38), // 深色背景
|
||||
// ForeColor = Color.White, // 白色文字
|
||||
// SelectionBackColor = Color.FromArgb(0, 122, 204), // 选中时的背景色
|
||||
// SelectionForeColor = Color.White, // 选中时的文字颜色
|
||||
// Font = new Font("微软雅黑", 9F) // 字体设置
|
||||
// }
|
||||
//},
|
||||
#endregion
|
||||
#region 开启分档
|
||||
new DataGridViewCheckBoxColumn
|
||||
@@ -784,9 +809,11 @@ namespace LargeSquareOne
|
||||
config.OKLD2Type = row.Cells["OKLD2Type"].Value?.ToString() ?? "";
|
||||
config.OKLD3Type = row.Cells["OKLD3Type"].Value?.ToString() ?? "";
|
||||
config.OKLD4Type = row.Cells["OKLD4Type"].Value?.ToString() ?? "";
|
||||
config.NGLD5Type = row.Cells["NGLD5Type"].Value?.ToString() ?? "";
|
||||
config.NGLD6Type = row.Cells["NGLD6Type"].Value?.ToString() ?? "";
|
||||
config.NGLD7Type = row.Cells["NGLD7Type"].Value?.ToString() ?? "";
|
||||
config.OKLD5Type = row.Cells["OKLD5Type"].Value?.ToString() ?? "";
|
||||
config.OKLD6Type = row.Cells["OKLD6Type"].Value?.ToString() ?? "";
|
||||
//config.NGLD5Type = row.Cells["NGLD5Type"].Value?.ToString() ?? "";
|
||||
//config.NGLD6Type = row.Cells["NGLD6Type"].Value?.ToString() ?? "";
|
||||
//config.NGLD7Type = row.Cells["NGLD7Type"].Value?.ToString() ?? "";
|
||||
|
||||
config.IsFDActive = row.Cells["IsFDActive"].Value != null &&
|
||||
Convert.ToBoolean(row.Cells["IsFDActive"].Value);
|
||||
@@ -833,7 +860,14 @@ namespace LargeSquareOne
|
||||
string backupFile = $"{FdConfigFilePath}.bak";
|
||||
File.Copy(FdConfigFilePath, backupFile, true);
|
||||
}
|
||||
|
||||
//
|
||||
Grading1 = fdConfigs[0].OKLD1Type;
|
||||
Grading2 = fdConfigs[0].OKLD2Type;
|
||||
Grading3 = fdConfigs[0].OKLD3Type;
|
||||
Grading4 = fdConfigs[0].OKLD4Type;
|
||||
Grading5 = fdConfigs[0].OKLD5Type;
|
||||
Grading6 = fdConfigs[0].OKLD6Type;
|
||||
SaveFD2xml();
|
||||
// 直接保存到目标文件
|
||||
MiniExcel.SaveAs(FdConfigFilePath, fdConfigs, overwriteFile: true);
|
||||
}
|
||||
@@ -860,6 +894,25 @@ namespace LargeSquareOne
|
||||
{
|
||||
dgvFdConfigs.DataSource = null;
|
||||
dgvFdConfigs.DataSource = new BindingList<FDConfig>(fdConfigs);
|
||||
}
|
||||
private void SaveFD2xml()
|
||||
{
|
||||
CommonMethods.mesConfig.Grading1 = Grading1;
|
||||
CommonMethods.mesConfig.Grading2 = Grading2;
|
||||
CommonMethods.mesConfig.Grading3 = Grading3;
|
||||
CommonMethods.mesConfig.Grading4 = Grading4;
|
||||
CommonMethods.mesConfig.Grading5 = Grading5;
|
||||
CommonMethods.mesConfig.Grading6 = Grading6;
|
||||
//档位
|
||||
IniConfigHelper.WriteIniData("MES配置", "Grading1", Grading1);
|
||||
IniConfigHelper.WriteIniData("MES配置", "Grading2", Grading2);
|
||||
IniConfigHelper.WriteIniData("MES配置", "Grading3", Grading3);
|
||||
IniConfigHelper.WriteIniData("MES配置", "Grading4", Grading4);
|
||||
IniConfigHelper.WriteIniData("MES配置", "Grading5", Grading5);
|
||||
IniConfigHelper.WriteIniData("MES配置", "Grading6", Grading6);
|
||||
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user