diff --git a/JY.Inspection/Config/Configure.ini b/JY.Inspection/Config/Configure.ini index d55fbf5..bfe3741 100644 --- a/JY.Inspection/Config/Configure.ini +++ b/JY.Inspection/Config/Configure.ini @@ -23,6 +23,7 @@ ResultProcessMesUrl=http://10.22.167.2/core/api/public/product/process/param/new StationArrivalUrl=http://10.22.167.2/core/api/public/formation/section/arrival/bz StationExitUrl=http://10.22.167.2/core/api/public/eve/pm/formation-section/bz LoginMesUrl=http://10.22.167.2/core/api/public/equipment/base/user/permission/verify +EquipAlarmUrl=http://127.0.0.1 NGMessage=不分类,正面(2D/3D),反面(2D/3D),左侧面(2D/3D),右侧面(2D/3D),顶面(2D/3D),底面(2D/3D),底WE2,底WE2,底WE3,底WE4,中ME1,中ME2,中ME3,中ME1,极柱(POS/NEG),防爆阀(PRO),扫码NG,分档NG,其他 CCDResultMessage=不分类,NG,OK Grading1=K77 @@ -39,7 +40,7 @@ TensionStrapCCDReslut2=1 TensionStrapCCDReslut3=1 TensionStrapCCDReslut4=1 StartNGFL=0 -Grading=1 +Grading=0 MesRequestTime=2 LoginTime=10 diff --git a/JY.Inspection/Frm/FormMesDataSet.cs b/JY.Inspection/Frm/FormMesDataSet.cs index 6d37df9..6387ae3 100644 --- a/JY.Inspection/Frm/FormMesDataSet.cs +++ b/JY.Inspection/Frm/FormMesDataSet.cs @@ -36,6 +36,7 @@ namespace JY.Inspection.Frm tb_StationArrival.DataBindings.Add(new Binding("Text", bindingSource1, "StationArrivalUrl", true, DataSourceUpdateMode.OnPropertyChanged)); tb_stationExit.DataBindings.Add(new Binding("Text", bindingSource1, "StationExitUrl", true, DataSourceUpdateMode.OnPropertyChanged)); tb_loginMes.DataBindings.Add(new Binding("Text", bindingSource1, "LoginMesUrl", true, DataSourceUpdateMode.OnPropertyChanged)); + tb_euipAlarm.DataBindings.Add(new Binding("Text", bindingSource1, "EquipAlarmUrl", true, DataSourceUpdateMode.OnPropertyChanged)); } #endregion @@ -58,6 +59,7 @@ namespace JY.Inspection.Frm _viewModel.StationArrivalUrl = IniFileHelper.ReadIniData("MES閰嶇疆", "StationArrivalUrl"); _viewModel.StationExitUrl = IniFileHelper.ReadIniData("MES閰嶇疆", "StationExitUrl"); _viewModel.LoginMesUrl = IniFileHelper.ReadIniData("MES閰嶇疆", "LoginMesUrl"); + _viewModel.EquipAlarmUrl = IniFileHelper.ReadIniData("MES閰嶇疆", "EquipAlarmUrl"); LoginTime.Text = IniFileHelper.ReadIniData("MES閰嶇疆", "LoginTime"); txtMesRequestTime.Text = IniFileHelper.ReadIniData("MES閰嶇疆", "MesRequestTime"); @@ -84,6 +86,7 @@ namespace JY.Inspection.Frm IniFileHelper.WriteIniData("MES閰嶇疆", "StationArrivalUrl", _viewModel.StationArrivalUrl.Trim()); IniFileHelper.WriteIniData("MES閰嶇疆", "StationExitUrl", _viewModel.StationExitUrl.Trim()); IniFileHelper.WriteIniData("MES閰嶇疆", "LoginMesUrl", _viewModel.LoginMesUrl.Trim()); + IniFileHelper.WriteIniData("MES閰嶇疆", "EquipAlarmUrl", _viewModel.EquipAlarmUrl.Trim()); IniFileHelper.WriteIniData("MES閰嶇疆", "LoginTime", LoginTime.Text.Trim()); LogManagerControl.AddLog($"鐢ㄦ埛[{Global.systemConfig.userName}]璁剧疆鏉冮檺瓒呮椂鏃堕棿[{LoginTime.Text.Trim()}]", LogAddtype.local, Logtype.Warning); diff --git a/JY.Inspection/Frm/FormMesDataSet.designer.cs b/JY.Inspection/Frm/FormMesDataSet.designer.cs index 9374c18..f8d1d86 100644 --- a/JY.Inspection/Frm/FormMesDataSet.designer.cs +++ b/JY.Inspection/Frm/FormMesDataSet.designer.cs @@ -47,6 +47,15 @@ namespace JY.Inspection.Frm this.txtResultProcessMesUrl = new MetroFramework.Controls.MetroTextBox(); this.metroLabel6 = new MetroFramework.Controls.MetroLabel(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.metroPanel_mid = new MetroFramework.Controls.MetroPanel(); + this.tb_euipAlarm = new MetroFramework.Controls.MetroTextBox(); + this.metroLabel11 = new MetroFramework.Controls.MetroLabel(); + this.tb_loginMes = new MetroFramework.Controls.MetroTextBox(); + this.metroLabel10 = new MetroFramework.Controls.MetroLabel(); + this.tb_stationExit = new MetroFramework.Controls.MetroTextBox(); + this.metroLabel9 = new MetroFramework.Controls.MetroLabel(); + this.tb_StationArrival = new MetroFramework.Controls.MetroTextBox(); + this.metroLabel8 = new MetroFramework.Controls.MetroLabel(); this.metroPanel_top = new MetroFramework.Controls.MetroPanel(); this.tb_productType = new MetroFramework.Controls.MetroTextBox(); this.metroLabel18 = new MetroFramework.Controls.MetroLabel(); @@ -56,31 +65,25 @@ namespace JY.Inspection.Frm this.txtMesRequestTime = new System.Windows.Forms.NumericUpDown(); this.metroLabel22 = new MetroFramework.Controls.MetroLabel(); this.metroLabel20 = new MetroFramework.Controls.MetroLabel(); - this.metroPanel_mid = new MetroFramework.Controls.MetroPanel(); - this.tb_stationExit = new MetroFramework.Controls.MetroTextBox(); - this.metroLabel9 = new MetroFramework.Controls.MetroLabel(); - this.tb_StationArrival = new MetroFramework.Controls.MetroTextBox(); - this.metroLabel8 = new MetroFramework.Controls.MetroLabel(); this.metroPanel_bottom = new MetroFramework.Controls.MetroPanel(); this.linkLabel_editCollectItemCfg = new System.Windows.Forms.LinkLabel(); this.chkIsMesUP = new System.Windows.Forms.CheckBox(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); - this.metroLabel10 = new MetroFramework.Controls.MetroLabel(); - this.tb_loginMes = new MetroFramework.Controls.MetroTextBox(); this.groupBox1.SuspendLayout(); + this.metroPanel_mid.SuspendLayout(); this.metroPanel_top.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.LoginTime)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtMesRequestTime)).BeginInit(); - this.metroPanel_mid.SuspendLayout(); this.metroPanel_bottom.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); this.SuspendLayout(); // // btnExit // - this.btnExit.Location = new System.Drawing.Point(484, 40); + this.btnExit.Location = new System.Drawing.Point(645, 50); + this.btnExit.Margin = new System.Windows.Forms.Padding(4); this.btnExit.Name = "btnExit"; - this.btnExit.Size = new System.Drawing.Size(103, 37); + this.btnExit.Size = new System.Drawing.Size(137, 46); this.btnExit.TabIndex = 13; this.btnExit.Text = "閫鍑"; this.btnExit.UseSelectable = true; @@ -89,9 +92,10 @@ namespace JY.Inspection.Frm // metroLabel1 // this.metroLabel1.AutoSize = true; - this.metroLabel1.Location = new System.Drawing.Point(33, 53); + this.metroLabel1.Location = new System.Drawing.Point(44, 66); + this.metroLabel1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.metroLabel1.Name = "metroLabel1"; - this.metroLabel1.Size = new System.Drawing.Size(79, 19); + this.metroLabel1.Size = new System.Drawing.Size(84, 20); this.metroLabel1.TabIndex = 12; this.metroLabel1.Text = "浜х嚎鍚嶇О锛"; // @@ -101,16 +105,18 @@ namespace JY.Inspection.Frm // // this.txtlineCode.CustomButton.Image = null; - this.txtlineCode.CustomButton.Location = new System.Drawing.Point(164, 1); + this.txtlineCode.CustomButton.Location = new System.Drawing.Point(220, 1); + this.txtlineCode.CustomButton.Margin = new System.Windows.Forms.Padding(4); this.txtlineCode.CustomButton.Name = ""; - this.txtlineCode.CustomButton.Size = new System.Drawing.Size(21, 21); + this.txtlineCode.CustomButton.Size = new System.Drawing.Size(27, 27); this.txtlineCode.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; this.txtlineCode.CustomButton.TabIndex = 1; this.txtlineCode.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light; this.txtlineCode.CustomButton.UseSelectable = true; this.txtlineCode.CustomButton.Visible = false; this.txtlineCode.Lines = new string[0]; - this.txtlineCode.Location = new System.Drawing.Point(118, 53); + this.txtlineCode.Location = new System.Drawing.Point(157, 66); + this.txtlineCode.Margin = new System.Windows.Forms.Padding(4); this.txtlineCode.MaxLength = 32767; this.txtlineCode.Name = "txtlineCode"; this.txtlineCode.PasswordChar = '\0'; @@ -119,7 +125,7 @@ namespace JY.Inspection.Frm this.txtlineCode.SelectionLength = 0; this.txtlineCode.SelectionStart = 0; this.txtlineCode.ShortcutsEnabled = true; - this.txtlineCode.Size = new System.Drawing.Size(186, 23); + this.txtlineCode.Size = new System.Drawing.Size(248, 29); this.txtlineCode.TabIndex = 11; this.txtlineCode.UseSelectable = true; this.txtlineCode.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); @@ -127,9 +133,10 @@ namespace JY.Inspection.Frm // // btnSave // - this.btnSave.Location = new System.Drawing.Point(68, 40); + this.btnSave.Location = new System.Drawing.Point(91, 50); + this.btnSave.Margin = new System.Windows.Forms.Padding(4); this.btnSave.Name = "btnSave"; - this.btnSave.Size = new System.Drawing.Size(112, 37); + this.btnSave.Size = new System.Drawing.Size(149, 46); this.btnSave.TabIndex = 10; this.btnSave.Text = "淇濆瓨"; this.btnSave.UseSelectable = true; @@ -138,9 +145,10 @@ namespace JY.Inspection.Frm // metroLabel3 // this.metroLabel3.AutoSize = true; - this.metroLabel3.Location = new System.Drawing.Point(33, 92); + this.metroLabel3.Location = new System.Drawing.Point(44, 115); + this.metroLabel3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.metroLabel3.Name = "metroLabel3"; - this.metroLabel3.Size = new System.Drawing.Size(79, 19); + this.metroLabel3.Size = new System.Drawing.Size(84, 20); this.metroLabel3.TabIndex = 25; this.metroLabel3.Text = "璁惧缂栫爜锛"; // @@ -150,16 +158,18 @@ namespace JY.Inspection.Frm // // this.txtequipCode.CustomButton.Image = null; - this.txtequipCode.CustomButton.Location = new System.Drawing.Point(164, 1); + this.txtequipCode.CustomButton.Location = new System.Drawing.Point(220, 1); + this.txtequipCode.CustomButton.Margin = new System.Windows.Forms.Padding(4); this.txtequipCode.CustomButton.Name = ""; - this.txtequipCode.CustomButton.Size = new System.Drawing.Size(21, 21); + this.txtequipCode.CustomButton.Size = new System.Drawing.Size(27, 27); this.txtequipCode.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; this.txtequipCode.CustomButton.TabIndex = 1; this.txtequipCode.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light; this.txtequipCode.CustomButton.UseSelectable = true; this.txtequipCode.CustomButton.Visible = false; this.txtequipCode.Lines = new string[0]; - this.txtequipCode.Location = new System.Drawing.Point(118, 88); + this.txtequipCode.Location = new System.Drawing.Point(157, 110); + this.txtequipCode.Margin = new System.Windows.Forms.Padding(4); this.txtequipCode.MaxLength = 32767; this.txtequipCode.Name = "txtequipCode"; this.txtequipCode.PasswordChar = '\0'; @@ -168,7 +178,7 @@ namespace JY.Inspection.Frm this.txtequipCode.SelectionLength = 0; this.txtequipCode.SelectionStart = 0; this.txtequipCode.ShortcutsEnabled = true; - this.txtequipCode.Size = new System.Drawing.Size(186, 23); + this.txtequipCode.Size = new System.Drawing.Size(248, 29); this.txtequipCode.TabIndex = 26; this.txtequipCode.UseSelectable = true; this.txtequipCode.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); @@ -180,16 +190,18 @@ namespace JY.Inspection.Frm // // this.txtsiteCode.CustomButton.Image = null; - this.txtsiteCode.CustomButton.Location = new System.Drawing.Point(164, 1); + this.txtsiteCode.CustomButton.Location = new System.Drawing.Point(220, 1); + this.txtsiteCode.CustomButton.Margin = new System.Windows.Forms.Padding(4); this.txtsiteCode.CustomButton.Name = ""; - this.txtsiteCode.CustomButton.Size = new System.Drawing.Size(21, 21); + this.txtsiteCode.CustomButton.Size = new System.Drawing.Size(27, 27); this.txtsiteCode.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; this.txtsiteCode.CustomButton.TabIndex = 1; this.txtsiteCode.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light; this.txtsiteCode.CustomButton.UseSelectable = true; this.txtsiteCode.CustomButton.Visible = false; this.txtsiteCode.Lines = new string[0]; - this.txtsiteCode.Location = new System.Drawing.Point(118, 15); + this.txtsiteCode.Location = new System.Drawing.Point(157, 19); + this.txtsiteCode.Margin = new System.Windows.Forms.Padding(4); this.txtsiteCode.MaxLength = 32767; this.txtsiteCode.Name = "txtsiteCode"; this.txtsiteCode.PasswordChar = '\0'; @@ -198,7 +210,7 @@ namespace JY.Inspection.Frm this.txtsiteCode.SelectionLength = 0; this.txtsiteCode.SelectionStart = 0; this.txtsiteCode.ShortcutsEnabled = true; - this.txtsiteCode.Size = new System.Drawing.Size(186, 23); + this.txtsiteCode.Size = new System.Drawing.Size(248, 29); this.txtsiteCode.TabIndex = 28; this.txtsiteCode.UseSelectable = true; this.txtsiteCode.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); @@ -207,18 +219,20 @@ namespace JY.Inspection.Frm // metroLabel2 // this.metroLabel2.AutoSize = true; - this.metroLabel2.Location = new System.Drawing.Point(33, 15); + this.metroLabel2.Location = new System.Drawing.Point(44, 19); + this.metroLabel2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.metroLabel2.Name = "metroLabel2"; - this.metroLabel2.Size = new System.Drawing.Size(79, 19); + this.metroLabel2.Size = new System.Drawing.Size(84, 20); this.metroLabel2.TabIndex = 27; this.metroLabel2.Text = "宸ュ巶浠ｇ爜锛"; // // ckStartZNDB // this.ckStartZNDB.AutoSize = true; - this.ckStartZNDB.Location = new System.Drawing.Point(68, 6); + this.ckStartZNDB.Location = new System.Drawing.Point(91, 8); + this.ckStartZNDB.Margin = new System.Windows.Forms.Padding(4); this.ckStartZNDB.Name = "ckStartZNDB"; - this.ckStartZNDB.Size = new System.Drawing.Size(96, 16); + this.ckStartZNDB.Size = new System.Drawing.Size(119, 19); this.ckStartZNDB.TabIndex = 29; this.ckStartZNDB.Text = "寮鍚櫤鑳界數琛"; this.ckStartZNDB.UseVisualStyleBackColor = true; @@ -229,16 +243,18 @@ namespace JY.Inspection.Frm // // this.txtmaterialCode.CustomButton.Image = null; - this.txtmaterialCode.CustomButton.Location = new System.Drawing.Point(164, 1); + this.txtmaterialCode.CustomButton.Location = new System.Drawing.Point(220, 1); + this.txtmaterialCode.CustomButton.Margin = new System.Windows.Forms.Padding(4); this.txtmaterialCode.CustomButton.Name = ""; - this.txtmaterialCode.CustomButton.Size = new System.Drawing.Size(21, 21); + this.txtmaterialCode.CustomButton.Size = new System.Drawing.Size(27, 27); this.txtmaterialCode.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; this.txtmaterialCode.CustomButton.TabIndex = 1; this.txtmaterialCode.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light; this.txtmaterialCode.CustomButton.UseSelectable = true; this.txtmaterialCode.CustomButton.Visible = false; this.txtmaterialCode.Lines = new string[0]; - this.txtmaterialCode.Location = new System.Drawing.Point(118, 129); + this.txtmaterialCode.Location = new System.Drawing.Point(157, 161); + this.txtmaterialCode.Margin = new System.Windows.Forms.Padding(4); this.txtmaterialCode.MaxLength = 32767; this.txtmaterialCode.Name = "txtmaterialCode"; this.txtmaterialCode.PasswordChar = '\0'; @@ -247,7 +263,7 @@ namespace JY.Inspection.Frm this.txtmaterialCode.SelectionLength = 0; this.txtmaterialCode.SelectionStart = 0; this.txtmaterialCode.ShortcutsEnabled = true; - this.txtmaterialCode.Size = new System.Drawing.Size(186, 23); + this.txtmaterialCode.Size = new System.Drawing.Size(248, 29); this.txtmaterialCode.TabIndex = 31; this.txtmaterialCode.UseSelectable = true; this.txtmaterialCode.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); @@ -256,9 +272,10 @@ namespace JY.Inspection.Frm // metroLabel4 // this.metroLabel4.AutoSize = true; - this.metroLabel4.Location = new System.Drawing.Point(33, 127); + this.metroLabel4.Location = new System.Drawing.Point(44, 159); + this.metroLabel4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.metroLabel4.Name = "metroLabel4"; - this.metroLabel4.Size = new System.Drawing.Size(79, 19); + this.metroLabel4.Size = new System.Drawing.Size(84, 20); this.metroLabel4.TabIndex = 30; this.metroLabel4.Text = "鐗╂枡缂栫爜锛"; // @@ -268,16 +285,18 @@ namespace JY.Inspection.Frm // // this.txtGradingMesUrl.CustomButton.Image = null; - this.txtGradingMesUrl.CustomButton.Location = new System.Drawing.Point(502, 1); + this.txtGradingMesUrl.CustomButton.Location = new System.Drawing.Point(671, 1); + this.txtGradingMesUrl.CustomButton.Margin = new System.Windows.Forms.Padding(4); this.txtGradingMesUrl.CustomButton.Name = ""; - this.txtGradingMesUrl.CustomButton.Size = new System.Drawing.Size(21, 21); + this.txtGradingMesUrl.CustomButton.Size = new System.Drawing.Size(27, 27); this.txtGradingMesUrl.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; this.txtGradingMesUrl.CustomButton.TabIndex = 1; this.txtGradingMesUrl.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light; this.txtGradingMesUrl.CustomButton.UseSelectable = true; this.txtGradingMesUrl.CustomButton.Visible = false; this.txtGradingMesUrl.Lines = new string[0]; - this.txtGradingMesUrl.Location = new System.Drawing.Point(176, 6); + this.txtGradingMesUrl.Location = new System.Drawing.Point(235, 8); + this.txtGradingMesUrl.Margin = new System.Windows.Forms.Padding(4); this.txtGradingMesUrl.MaxLength = 32767; this.txtGradingMesUrl.Name = "txtGradingMesUrl"; this.txtGradingMesUrl.PasswordChar = '\0'; @@ -286,7 +305,7 @@ namespace JY.Inspection.Frm this.txtGradingMesUrl.SelectionLength = 0; this.txtGradingMesUrl.SelectionStart = 0; this.txtGradingMesUrl.ShortcutsEnabled = true; - this.txtGradingMesUrl.Size = new System.Drawing.Size(524, 23); + this.txtGradingMesUrl.Size = new System.Drawing.Size(699, 29); this.txtGradingMesUrl.TabIndex = 33; this.txtGradingMesUrl.UseSelectable = true; this.txtGradingMesUrl.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); @@ -295,9 +314,10 @@ namespace JY.Inspection.Frm // metroLabel5 // this.metroLabel5.AutoSize = true; - this.metroLabel5.Location = new System.Drawing.Point(31, 6); + this.metroLabel5.Location = new System.Drawing.Point(41, 8); + this.metroLabel5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.metroLabel5.Name = "metroLabel5"; - this.metroLabel5.Size = new System.Drawing.Size(135, 19); + this.metroLabel5.Size = new System.Drawing.Size(144, 20); this.metroLabel5.TabIndex = 32; this.metroLabel5.Text = "鍒嗘。鏌ヨ鎺ュ彛鍦板潃锛"; // @@ -307,16 +327,18 @@ namespace JY.Inspection.Frm // // this.txtResultProcessMesUrl.CustomButton.Image = null; - this.txtResultProcessMesUrl.CustomButton.Location = new System.Drawing.Point(502, 1); + this.txtResultProcessMesUrl.CustomButton.Location = new System.Drawing.Point(671, 1); + this.txtResultProcessMesUrl.CustomButton.Margin = new System.Windows.Forms.Padding(4); this.txtResultProcessMesUrl.CustomButton.Name = ""; - this.txtResultProcessMesUrl.CustomButton.Size = new System.Drawing.Size(21, 21); + this.txtResultProcessMesUrl.CustomButton.Size = new System.Drawing.Size(27, 27); this.txtResultProcessMesUrl.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; this.txtResultProcessMesUrl.CustomButton.TabIndex = 1; this.txtResultProcessMesUrl.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light; this.txtResultProcessMesUrl.CustomButton.UseSelectable = true; this.txtResultProcessMesUrl.CustomButton.Visible = false; this.txtResultProcessMesUrl.Lines = new string[0]; - this.txtResultProcessMesUrl.Location = new System.Drawing.Point(176, 40); + this.txtResultProcessMesUrl.Location = new System.Drawing.Point(235, 50); + this.txtResultProcessMesUrl.Margin = new System.Windows.Forms.Padding(4); this.txtResultProcessMesUrl.MaxLength = 32767; this.txtResultProcessMesUrl.Name = "txtResultProcessMesUrl"; this.txtResultProcessMesUrl.PasswordChar = '\0'; @@ -325,7 +347,7 @@ namespace JY.Inspection.Frm this.txtResultProcessMesUrl.SelectionLength = 0; this.txtResultProcessMesUrl.SelectionStart = 0; this.txtResultProcessMesUrl.ShortcutsEnabled = true; - this.txtResultProcessMesUrl.Size = new System.Drawing.Size(524, 23); + this.txtResultProcessMesUrl.Size = new System.Drawing.Size(699, 29); this.txtResultProcessMesUrl.TabIndex = 35; this.txtResultProcessMesUrl.UseSelectable = true; this.txtResultProcessMesUrl.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); @@ -334,9 +356,10 @@ namespace JY.Inspection.Frm // metroLabel6 // this.metroLabel6.AutoSize = true; - this.metroLabel6.Location = new System.Drawing.Point(7, 44); + this.metroLabel6.Location = new System.Drawing.Point(9, 55); + this.metroLabel6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.metroLabel6.Name = "metroLabel6"; - this.metroLabel6.Size = new System.Drawing.Size(163, 19); + this.metroLabel6.Size = new System.Drawing.Size(174, 20); this.metroLabel6.TabIndex = 34; this.metroLabel6.Text = "缁撴灉鍔犲伐鍙傛暟鎺ュ彛鍦板潃锛"; // @@ -345,13 +368,211 @@ namespace JY.Inspection.Frm this.groupBox1.Controls.Add(this.metroPanel_mid); this.groupBox1.Controls.Add(this.metroPanel_top); this.groupBox1.Controls.Add(this.metroPanel_bottom); - this.groupBox1.Location = new System.Drawing.Point(23, 63); + this.groupBox1.Location = new System.Drawing.Point(31, 79); + this.groupBox1.Margin = new System.Windows.Forms.Padding(4); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(719, 492); + this.groupBox1.Padding = new System.Windows.Forms.Padding(4); + this.groupBox1.Size = new System.Drawing.Size(959, 615); this.groupBox1.TabIndex = 36; this.groupBox1.TabStop = false; this.groupBox1.Text = "MES閰嶇疆"; // + // metroPanel_mid + // + this.metroPanel_mid.Controls.Add(this.tb_euipAlarm); + this.metroPanel_mid.Controls.Add(this.metroLabel11); + this.metroPanel_mid.Controls.Add(this.tb_loginMes); + this.metroPanel_mid.Controls.Add(this.metroLabel10); + this.metroPanel_mid.Controls.Add(this.tb_stationExit); + this.metroPanel_mid.Controls.Add(this.metroLabel9); + this.metroPanel_mid.Controls.Add(this.tb_StationArrival); + this.metroPanel_mid.Controls.Add(this.metroLabel8); + this.metroPanel_mid.Controls.Add(this.txtResultProcessMesUrl); + this.metroPanel_mid.Controls.Add(this.txtGradingMesUrl); + this.metroPanel_mid.Controls.Add(this.metroLabel6); + this.metroPanel_mid.Controls.Add(this.metroLabel5); + this.metroPanel_mid.Dock = System.Windows.Forms.DockStyle.Fill; + this.metroPanel_mid.HorizontalScrollbarBarColor = true; + this.metroPanel_mid.HorizontalScrollbarHighlightOnWheel = false; + this.metroPanel_mid.HorizontalScrollbarSize = 12; + this.metroPanel_mid.Location = new System.Drawing.Point(4, 226); + this.metroPanel_mid.Margin = new System.Windows.Forms.Padding(4); + this.metroPanel_mid.Name = "metroPanel_mid"; + this.metroPanel_mid.Size = new System.Drawing.Size(951, 269); + this.metroPanel_mid.TabIndex = 186; + this.metroPanel_mid.VerticalScrollbar = true; + this.metroPanel_mid.VerticalScrollbarBarColor = true; + this.metroPanel_mid.VerticalScrollbarHighlightOnWheel = false; + this.metroPanel_mid.VerticalScrollbarSize = 13; + // + // tb_euipAlarm + // + // + // + // + this.tb_euipAlarm.CustomButton.Image = null; + this.tb_euipAlarm.CustomButton.Location = new System.Drawing.Point(671, 1); + this.tb_euipAlarm.CustomButton.Margin = new System.Windows.Forms.Padding(4); + this.tb_euipAlarm.CustomButton.Name = ""; + this.tb_euipAlarm.CustomButton.Size = new System.Drawing.Size(27, 27); + this.tb_euipAlarm.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; + this.tb_euipAlarm.CustomButton.TabIndex = 1; + this.tb_euipAlarm.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light; + this.tb_euipAlarm.CustomButton.UseSelectable = true; + this.tb_euipAlarm.CustomButton.Visible = false; + this.tb_euipAlarm.Lines = new string[0]; + this.tb_euipAlarm.Location = new System.Drawing.Point(235, 218); + this.tb_euipAlarm.Margin = new System.Windows.Forms.Padding(4); + this.tb_euipAlarm.MaxLength = 32767; + this.tb_euipAlarm.Name = "tb_euipAlarm"; + this.tb_euipAlarm.PasswordChar = '\0'; + this.tb_euipAlarm.ScrollBars = System.Windows.Forms.ScrollBars.None; + this.tb_euipAlarm.SelectedText = ""; + this.tb_euipAlarm.SelectionLength = 0; + this.tb_euipAlarm.SelectionStart = 0; + this.tb_euipAlarm.ShortcutsEnabled = true; + this.tb_euipAlarm.Size = new System.Drawing.Size(699, 29); + this.tb_euipAlarm.TabIndex = 43; + this.tb_euipAlarm.UseSelectable = true; + this.tb_euipAlarm.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + this.tb_euipAlarm.WaterMarkFont = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel); + // + // metroLabel11 + // + this.metroLabel11.AutoSize = true; + this.metroLabel11.Location = new System.Drawing.Point(39, 218); + this.metroLabel11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.metroLabel11.Name = "metroLabel11"; + this.metroLabel11.Size = new System.Drawing.Size(144, 20); + this.metroLabel11.TabIndex = 42; + this.metroLabel11.Text = "璁惧鎶ヨ鎺ュ彛鍦板潃锛"; + // + // tb_loginMes + // + // + // + // + this.tb_loginMes.CustomButton.Image = null; + this.tb_loginMes.CustomButton.Location = new System.Drawing.Point(671, 1); + this.tb_loginMes.CustomButton.Margin = new System.Windows.Forms.Padding(4); + this.tb_loginMes.CustomButton.Name = ""; + this.tb_loginMes.CustomButton.Size = new System.Drawing.Size(27, 27); + this.tb_loginMes.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; + this.tb_loginMes.CustomButton.TabIndex = 1; + this.tb_loginMes.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light; + this.tb_loginMes.CustomButton.UseSelectable = true; + this.tb_loginMes.CustomButton.Visible = false; + this.tb_loginMes.Lines = new string[0]; + this.tb_loginMes.Location = new System.Drawing.Point(235, 181); + this.tb_loginMes.Margin = new System.Windows.Forms.Padding(4); + this.tb_loginMes.MaxLength = 32767; + this.tb_loginMes.Name = "tb_loginMes"; + this.tb_loginMes.PasswordChar = '\0'; + this.tb_loginMes.ScrollBars = System.Windows.Forms.ScrollBars.None; + this.tb_loginMes.SelectedText = ""; + this.tb_loginMes.SelectionLength = 0; + this.tb_loginMes.SelectionStart = 0; + this.tb_loginMes.ShortcutsEnabled = true; + this.tb_loginMes.Size = new System.Drawing.Size(699, 29); + this.tb_loginMes.TabIndex = 41; + this.tb_loginMes.UseSelectable = true; + this.tb_loginMes.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + this.tb_loginMes.WaterMarkFont = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel); + // + // metroLabel10 + // + this.metroLabel10.AutoSize = true; + this.metroLabel10.Location = new System.Drawing.Point(41, 181); + this.metroLabel10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.metroLabel10.Name = "metroLabel10"; + this.metroLabel10.Size = new System.Drawing.Size(144, 20); + this.metroLabel10.TabIndex = 40; + this.metroLabel10.Text = "鍛樺伐鐧诲綍鎺ュ彛鍦板潃锛"; + // + // tb_stationExit + // + // + // + // + this.tb_stationExit.CustomButton.Image = null; + this.tb_stationExit.CustomButton.Location = new System.Drawing.Point(671, 1); + this.tb_stationExit.CustomButton.Margin = new System.Windows.Forms.Padding(4); + this.tb_stationExit.CustomButton.Name = ""; + this.tb_stationExit.CustomButton.Size = new System.Drawing.Size(27, 27); + this.tb_stationExit.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; + this.tb_stationExit.CustomButton.TabIndex = 1; + this.tb_stationExit.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light; + this.tb_stationExit.CustomButton.UseSelectable = true; + this.tb_stationExit.CustomButton.Visible = false; + this.tb_stationExit.Lines = new string[0]; + this.tb_stationExit.Location = new System.Drawing.Point(235, 138); + this.tb_stationExit.Margin = new System.Windows.Forms.Padding(4); + this.tb_stationExit.MaxLength = 32767; + this.tb_stationExit.Name = "tb_stationExit"; + this.tb_stationExit.PasswordChar = '\0'; + this.tb_stationExit.ScrollBars = System.Windows.Forms.ScrollBars.None; + this.tb_stationExit.SelectedText = ""; + this.tb_stationExit.SelectionLength = 0; + this.tb_stationExit.SelectionStart = 0; + this.tb_stationExit.ShortcutsEnabled = true; + this.tb_stationExit.Size = new System.Drawing.Size(699, 29); + this.tb_stationExit.TabIndex = 39; + this.tb_stationExit.UseSelectable = true; + this.tb_stationExit.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + this.tb_stationExit.WaterMarkFont = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel); + // + // metroLabel9 + // + this.metroLabel9.AutoSize = true; + this.metroLabel9.Location = new System.Drawing.Point(41, 138); + this.metroLabel9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.metroLabel9.Name = "metroLabel9"; + this.metroLabel9.Size = new System.Drawing.Size(144, 20); + this.metroLabel9.TabIndex = 38; + this.metroLabel9.Text = "浜у搧鍑虹珯鎺ュ彛鍦板潃锛"; + // + // tb_StationArrival + // + // + // + // + this.tb_StationArrival.CustomButton.Image = null; + this.tb_StationArrival.CustomButton.Location = new System.Drawing.Point(671, 1); + this.tb_StationArrival.CustomButton.Margin = new System.Windows.Forms.Padding(4); + this.tb_StationArrival.CustomButton.Name = ""; + this.tb_StationArrival.CustomButton.Size = new System.Drawing.Size(27, 27); + this.tb_StationArrival.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; + this.tb_StationArrival.CustomButton.TabIndex = 1; + this.tb_StationArrival.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light; + this.tb_StationArrival.CustomButton.UseSelectable = true; + this.tb_StationArrival.CustomButton.Visible = false; + this.tb_StationArrival.Lines = new string[0]; + this.tb_StationArrival.Location = new System.Drawing.Point(235, 96); + this.tb_StationArrival.Margin = new System.Windows.Forms.Padding(4); + this.tb_StationArrival.MaxLength = 32767; + this.tb_StationArrival.Name = "tb_StationArrival"; + this.tb_StationArrival.PasswordChar = '\0'; + this.tb_StationArrival.ScrollBars = System.Windows.Forms.ScrollBars.None; + this.tb_StationArrival.SelectedText = ""; + this.tb_StationArrival.SelectionLength = 0; + this.tb_StationArrival.SelectionStart = 0; + this.tb_StationArrival.ShortcutsEnabled = true; + this.tb_StationArrival.Size = new System.Drawing.Size(699, 29); + this.tb_StationArrival.TabIndex = 37; + this.tb_StationArrival.UseSelectable = true; + this.tb_StationArrival.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + this.tb_StationArrival.WaterMarkFont = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel); + // + // metroLabel8 + // + this.metroLabel8.AutoSize = true; + this.metroLabel8.Location = new System.Drawing.Point(44, 96); + this.metroLabel8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.metroLabel8.Name = "metroLabel8"; + this.metroLabel8.Size = new System.Drawing.Size(144, 20); + this.metroLabel8.TabIndex = 36; + this.metroLabel8.Text = "浜у搧杩涚珯鎺ュ彛鍦板潃锛"; + // // metroPanel_top // this.metroPanel_top.Controls.Add(this.tb_productType); @@ -373,14 +594,15 @@ namespace JY.Inspection.Frm this.metroPanel_top.Dock = System.Windows.Forms.DockStyle.Top; this.metroPanel_top.HorizontalScrollbarBarColor = true; this.metroPanel_top.HorizontalScrollbarHighlightOnWheel = false; - this.metroPanel_top.HorizontalScrollbarSize = 10; - this.metroPanel_top.Location = new System.Drawing.Point(3, 17); + this.metroPanel_top.HorizontalScrollbarSize = 12; + this.metroPanel_top.Location = new System.Drawing.Point(4, 22); + this.metroPanel_top.Margin = new System.Windows.Forms.Padding(4); this.metroPanel_top.Name = "metroPanel_top"; - this.metroPanel_top.Size = new System.Drawing.Size(713, 163); + this.metroPanel_top.Size = new System.Drawing.Size(951, 204); this.metroPanel_top.TabIndex = 185; this.metroPanel_top.VerticalScrollbarBarColor = true; this.metroPanel_top.VerticalScrollbarHighlightOnWheel = false; - this.metroPanel_top.VerticalScrollbarSize = 10; + this.metroPanel_top.VerticalScrollbarSize = 13; // // tb_productType // @@ -388,16 +610,18 @@ namespace JY.Inspection.Frm // // this.tb_productType.CustomButton.Image = null; - this.tb_productType.CustomButton.Location = new System.Drawing.Point(164, 1); + this.tb_productType.CustomButton.Location = new System.Drawing.Point(220, 1); + this.tb_productType.CustomButton.Margin = new System.Windows.Forms.Padding(4); this.tb_productType.CustomButton.Name = ""; - this.tb_productType.CustomButton.Size = new System.Drawing.Size(21, 21); + this.tb_productType.CustomButton.Size = new System.Drawing.Size(27, 27); this.tb_productType.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; this.tb_productType.CustomButton.TabIndex = 1; this.tb_productType.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light; this.tb_productType.CustomButton.UseSelectable = true; this.tb_productType.CustomButton.Visible = false; this.tb_productType.Lines = new string[0]; - this.tb_productType.Location = new System.Drawing.Point(491, 15); + this.tb_productType.Location = new System.Drawing.Point(655, 19); + this.tb_productType.Margin = new System.Windows.Forms.Padding(4); this.tb_productType.MaxLength = 32767; this.tb_productType.Name = "tb_productType"; this.tb_productType.PasswordChar = '\0'; @@ -406,7 +630,7 @@ namespace JY.Inspection.Frm this.tb_productType.SelectionLength = 0; this.tb_productType.SelectionStart = 0; this.tb_productType.ShortcutsEnabled = true; - this.tb_productType.Size = new System.Drawing.Size(186, 23); + this.tb_productType.Size = new System.Drawing.Size(248, 29); this.tb_productType.TabIndex = 184; this.tb_productType.UseSelectable = true; this.tb_productType.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); @@ -415,18 +639,20 @@ namespace JY.Inspection.Frm // metroLabel18 // this.metroLabel18.AutoSize = true; - this.metroLabel18.Location = new System.Drawing.Point(573, 53); + this.metroLabel18.Location = new System.Drawing.Point(764, 66); + this.metroLabel18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.metroLabel18.Name = "metroLabel18"; - this.metroLabel18.Size = new System.Drawing.Size(14, 19); + this.metroLabel18.Size = new System.Drawing.Size(15, 20); this.metroLabel18.TabIndex = 97; this.metroLabel18.Text = "s"; // // metroLabel21 // this.metroLabel21.AutoSize = true; - this.metroLabel21.Location = new System.Drawing.Point(573, 127); + this.metroLabel21.Location = new System.Drawing.Point(764, 159); + this.metroLabel21.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.metroLabel21.Name = "metroLabel21"; - this.metroLabel21.Size = new System.Drawing.Size(31, 19); + this.metroLabel21.Size = new System.Drawing.Size(32, 20); this.metroLabel21.TabIndex = 180; this.metroLabel21.Text = "min"; this.metroLabel21.Visible = false; @@ -434,22 +660,24 @@ namespace JY.Inspection.Frm // metroLabel7 // this.metroLabel7.AutoSize = true; - this.metroLabel7.Location = new System.Drawing.Point(406, 15); + this.metroLabel7.Location = new System.Drawing.Point(541, 19); + this.metroLabel7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.metroLabel7.Name = "metroLabel7"; - this.metroLabel7.Size = new System.Drawing.Size(79, 19); + this.metroLabel7.Size = new System.Drawing.Size(84, 20); this.metroLabel7.TabIndex = 183; this.metroLabel7.Text = "浜у搧绫诲瀷锛"; // // LoginTime // - this.LoginTime.Location = new System.Drawing.Point(491, 127); + this.LoginTime.Location = new System.Drawing.Point(655, 159); + this.LoginTime.Margin = new System.Windows.Forms.Padding(4); this.LoginTime.Maximum = new decimal(new int[] { 1000, 0, 0, 0}); this.LoginTime.Name = "LoginTime"; - this.LoginTime.Size = new System.Drawing.Size(76, 21); + this.LoginTime.Size = new System.Drawing.Size(101, 25); this.LoginTime.TabIndex = 179; this.LoginTime.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.LoginTime.Value = new decimal(new int[] { @@ -467,7 +695,8 @@ namespace JY.Inspection.Frm 0, 0, 65536}); - this.txtMesRequestTime.Location = new System.Drawing.Point(491, 53); + this.txtMesRequestTime.Location = new System.Drawing.Point(655, 66); + this.txtMesRequestTime.Margin = new System.Windows.Forms.Padding(4); this.txtMesRequestTime.Maximum = new decimal(new int[] { 1000, 0, @@ -479,7 +708,7 @@ namespace JY.Inspection.Frm 0, 65536}); this.txtMesRequestTime.Name = "txtMesRequestTime"; - this.txtMesRequestTime.Size = new System.Drawing.Size(76, 21); + this.txtMesRequestTime.Size = new System.Drawing.Size(101, 25); this.txtMesRequestTime.TabIndex = 96; this.txtMesRequestTime.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.txtMesRequestTime.Value = new decimal(new int[] { @@ -491,9 +720,10 @@ namespace JY.Inspection.Frm // metroLabel22 // this.metroLabel22.AutoSize = true; - this.metroLabel22.Location = new System.Drawing.Point(378, 127); + this.metroLabel22.Location = new System.Drawing.Point(504, 159); + this.metroLabel22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.metroLabel22.Name = "metroLabel22"; - this.metroLabel22.Size = new System.Drawing.Size(107, 19); + this.metroLabel22.Size = new System.Drawing.Size(114, 20); this.metroLabel22.TabIndex = 176; this.metroLabel22.Text = "鏉冮檺鐧诲綍鏃堕暱锛"; this.metroLabel22.Visible = false; @@ -501,115 +731,13 @@ namespace JY.Inspection.Frm // metroLabel20 // this.metroLabel20.AutoSize = true; - this.metroLabel20.Location = new System.Drawing.Point(352, 53); + this.metroLabel20.Location = new System.Drawing.Point(469, 66); + this.metroLabel20.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.metroLabel20.Name = "metroLabel20"; - this.metroLabel20.Size = new System.Drawing.Size(133, 19); + this.metroLabel20.Size = new System.Drawing.Size(141, 20); this.metroLabel20.TabIndex = 49; this.metroLabel20.Text = "璇锋眰MES瓒呮椂鏃堕暱锛"; // - // metroPanel_mid - // - this.metroPanel_mid.Controls.Add(this.tb_loginMes); - this.metroPanel_mid.Controls.Add(this.metroLabel10); - this.metroPanel_mid.Controls.Add(this.tb_stationExit); - this.metroPanel_mid.Controls.Add(this.metroLabel9); - this.metroPanel_mid.Controls.Add(this.tb_StationArrival); - this.metroPanel_mid.Controls.Add(this.metroLabel8); - this.metroPanel_mid.Controls.Add(this.txtResultProcessMesUrl); - this.metroPanel_mid.Controls.Add(this.txtGradingMesUrl); - this.metroPanel_mid.Controls.Add(this.metroLabel6); - this.metroPanel_mid.Controls.Add(this.metroLabel5); - this.metroPanel_mid.Dock = System.Windows.Forms.DockStyle.Fill; - this.metroPanel_mid.HorizontalScrollbarBarColor = true; - this.metroPanel_mid.HorizontalScrollbarHighlightOnWheel = false; - this.metroPanel_mid.HorizontalScrollbarSize = 10; - this.metroPanel_mid.Location = new System.Drawing.Point(3, 180); - this.metroPanel_mid.Name = "metroPanel_mid"; - this.metroPanel_mid.Size = new System.Drawing.Size(713, 216); - this.metroPanel_mid.TabIndex = 186; - this.metroPanel_mid.VerticalScrollbar = true; - this.metroPanel_mid.VerticalScrollbarBarColor = true; - this.metroPanel_mid.VerticalScrollbarHighlightOnWheel = false; - this.metroPanel_mid.VerticalScrollbarSize = 10; - // - // tb_stationExit - // - // - // - // - this.tb_stationExit.CustomButton.Image = null; - this.tb_stationExit.CustomButton.Location = new System.Drawing.Point(502, 1); - this.tb_stationExit.CustomButton.Name = ""; - this.tb_stationExit.CustomButton.Size = new System.Drawing.Size(21, 21); - this.tb_stationExit.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; - this.tb_stationExit.CustomButton.TabIndex = 1; - this.tb_stationExit.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light; - this.tb_stationExit.CustomButton.UseSelectable = true; - this.tb_stationExit.CustomButton.Visible = false; - this.tb_stationExit.Lines = new string[0]; - this.tb_stationExit.Location = new System.Drawing.Point(176, 110); - this.tb_stationExit.MaxLength = 32767; - this.tb_stationExit.Name = "tb_stationExit"; - this.tb_stationExit.PasswordChar = '\0'; - this.tb_stationExit.ScrollBars = System.Windows.Forms.ScrollBars.None; - this.tb_stationExit.SelectedText = ""; - this.tb_stationExit.SelectionLength = 0; - this.tb_stationExit.SelectionStart = 0; - this.tb_stationExit.ShortcutsEnabled = true; - this.tb_stationExit.Size = new System.Drawing.Size(524, 23); - this.tb_stationExit.TabIndex = 39; - this.tb_stationExit.UseSelectable = true; - this.tb_stationExit.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - this.tb_stationExit.WaterMarkFont = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel); - // - // metroLabel9 - // - this.metroLabel9.AutoSize = true; - this.metroLabel9.Location = new System.Drawing.Point(31, 110); - this.metroLabel9.Name = "metroLabel9"; - this.metroLabel9.Size = new System.Drawing.Size(135, 19); - this.metroLabel9.TabIndex = 38; - this.metroLabel9.Text = "浜у搧鍑虹珯鎺ュ彛鍦板潃锛"; - // - // tb_StationArrival - // - // - // - // - this.tb_StationArrival.CustomButton.Image = null; - this.tb_StationArrival.CustomButton.Location = new System.Drawing.Point(502, 1); - this.tb_StationArrival.CustomButton.Name = ""; - this.tb_StationArrival.CustomButton.Size = new System.Drawing.Size(21, 21); - this.tb_StationArrival.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; - this.tb_StationArrival.CustomButton.TabIndex = 1; - this.tb_StationArrival.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light; - this.tb_StationArrival.CustomButton.UseSelectable = true; - this.tb_StationArrival.CustomButton.Visible = false; - this.tb_StationArrival.Lines = new string[0]; - this.tb_StationArrival.Location = new System.Drawing.Point(176, 77); - this.tb_StationArrival.MaxLength = 32767; - this.tb_StationArrival.Name = "tb_StationArrival"; - this.tb_StationArrival.PasswordChar = '\0'; - this.tb_StationArrival.ScrollBars = System.Windows.Forms.ScrollBars.None; - this.tb_StationArrival.SelectedText = ""; - this.tb_StationArrival.SelectionLength = 0; - this.tb_StationArrival.SelectionStart = 0; - this.tb_StationArrival.ShortcutsEnabled = true; - this.tb_StationArrival.Size = new System.Drawing.Size(524, 23); - this.tb_StationArrival.TabIndex = 37; - this.tb_StationArrival.UseSelectable = true; - this.tb_StationArrival.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - this.tb_StationArrival.WaterMarkFont = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel); - // - // metroLabel8 - // - this.metroLabel8.AutoSize = true; - this.metroLabel8.Location = new System.Drawing.Point(33, 77); - this.metroLabel8.Name = "metroLabel8"; - this.metroLabel8.Size = new System.Drawing.Size(135, 19); - this.metroLabel8.TabIndex = 36; - this.metroLabel8.Text = "浜у搧杩涚珯鎺ュ彛鍦板潃锛"; - // // metroPanel_bottom // this.metroPanel_bottom.Controls.Add(this.linkLabel_editCollectItemCfg); @@ -620,22 +748,22 @@ namespace JY.Inspection.Frm this.metroPanel_bottom.Dock = System.Windows.Forms.DockStyle.Bottom; this.metroPanel_bottom.HorizontalScrollbarBarColor = true; this.metroPanel_bottom.HorizontalScrollbarHighlightOnWheel = false; - this.metroPanel_bottom.HorizontalScrollbarSize = 10; - this.metroPanel_bottom.Location = new System.Drawing.Point(3, 396); + this.metroPanel_bottom.HorizontalScrollbarSize = 12; + this.metroPanel_bottom.Location = new System.Drawing.Point(4, 495); + this.metroPanel_bottom.Margin = new System.Windows.Forms.Padding(4); this.metroPanel_bottom.Name = "metroPanel_bottom"; - this.metroPanel_bottom.Size = new System.Drawing.Size(713, 93); + this.metroPanel_bottom.Size = new System.Drawing.Size(951, 116); this.metroPanel_bottom.TabIndex = 187; this.metroPanel_bottom.VerticalScrollbarBarColor = true; this.metroPanel_bottom.VerticalScrollbarHighlightOnWheel = false; - this.metroPanel_bottom.VerticalScrollbarSize = 10; + this.metroPanel_bottom.VerticalScrollbarSize = 13; // // linkLabel_editCollectItemCfg // this.linkLabel_editCollectItemCfg.AutoSize = true; - this.linkLabel_editCollectItemCfg.Location = new System.Drawing.Point(482, 7); - this.linkLabel_editCollectItemCfg.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.linkLabel_editCollectItemCfg.Location = new System.Drawing.Point(643, 9); this.linkLabel_editCollectItemCfg.Name = "linkLabel_editCollectItemCfg"; - this.linkLabel_editCollectItemCfg.Size = new System.Drawing.Size(101, 12); + this.linkLabel_editCollectItemCfg.Size = new System.Drawing.Size(127, 15); this.linkLabel_editCollectItemCfg.TabIndex = 182; this.linkLabel_editCollectItemCfg.TabStop = true; this.linkLabel_editCollectItemCfg.Text = "閰嶇疆閲囬泦椤瑰弬鐓ц〃"; @@ -645,72 +773,36 @@ namespace JY.Inspection.Frm // this.chkIsMesUP.AutoSize = true; this.chkIsMesUP.Enabled = false; - this.chkIsMesUP.Location = new System.Drawing.Point(279, 6); + this.chkIsMesUP.Location = new System.Drawing.Point(372, 8); + this.chkIsMesUP.Margin = new System.Windows.Forms.Padding(4); this.chkIsMesUP.Name = "chkIsMesUP"; - this.chkIsMesUP.Size = new System.Drawing.Size(90, 16); + this.chkIsMesUP.Size = new System.Drawing.Size(113, 19); this.chkIsMesUP.TabIndex = 36; this.chkIsMesUP.Text = "寮鍚疢ES妯″紡"; this.chkIsMesUP.UseVisualStyleBackColor = true; // - // metroLabel10 - // - this.metroLabel10.AutoSize = true; - this.metroLabel10.Location = new System.Drawing.Point(31, 145); - this.metroLabel10.Name = "metroLabel10"; - this.metroLabel10.Size = new System.Drawing.Size(135, 19); - this.metroLabel10.TabIndex = 40; - this.metroLabel10.Text = "鍛樺伐鐧诲綍鎺ュ彛鍦板潃锛"; - // - // tb_loginMes - // - // - // - // - this.tb_loginMes.CustomButton.Image = null; - this.tb_loginMes.CustomButton.Location = new System.Drawing.Point(502, 1); - this.tb_loginMes.CustomButton.Name = ""; - this.tb_loginMes.CustomButton.Size = new System.Drawing.Size(21, 21); - this.tb_loginMes.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; - this.tb_loginMes.CustomButton.TabIndex = 1; - this.tb_loginMes.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light; - this.tb_loginMes.CustomButton.UseSelectable = true; - this.tb_loginMes.CustomButton.Visible = false; - this.tb_loginMes.Lines = new string[0]; - this.tb_loginMes.Location = new System.Drawing.Point(176, 145); - this.tb_loginMes.MaxLength = 32767; - this.tb_loginMes.Name = "tb_loginMes"; - this.tb_loginMes.PasswordChar = '\0'; - this.tb_loginMes.ScrollBars = System.Windows.Forms.ScrollBars.None; - this.tb_loginMes.SelectedText = ""; - this.tb_loginMes.SelectionLength = 0; - this.tb_loginMes.SelectionStart = 0; - this.tb_loginMes.ShortcutsEnabled = true; - this.tb_loginMes.Size = new System.Drawing.Size(524, 23); - this.tb_loginMes.TabIndex = 41; - this.tb_loginMes.UseSelectable = true; - this.tb_loginMes.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - this.tb_loginMes.WaterMarkFont = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel); - // // FormMesDataSet // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(763, 578); + this.ClientSize = new System.Drawing.Size(1017, 722); this.Controls.Add(this.groupBox1); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.Margin = new System.Windows.Forms.Padding(4); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FormMesDataSet"; + this.Padding = new System.Windows.Forms.Padding(27, 75, 27, 25); this.Resizable = false; this.Text = "绯荤粺鍙傛暟璁剧疆"; this.Load += new System.EventHandler(this.FormMesDataSet_Load); this.groupBox1.ResumeLayout(false); + this.metroPanel_mid.ResumeLayout(false); + this.metroPanel_mid.PerformLayout(); this.metroPanel_top.ResumeLayout(false); this.metroPanel_top.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.LoginTime)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtMesRequestTime)).EndInit(); - this.metroPanel_mid.ResumeLayout(false); - this.metroPanel_mid.PerformLayout(); this.metroPanel_bottom.ResumeLayout(false); this.metroPanel_bottom.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); @@ -755,5 +847,7 @@ namespace JY.Inspection.Frm private System.Windows.Forms.BindingSource bindingSource1; private MetroFramework.Controls.MetroLabel metroLabel10; private MetroFramework.Controls.MetroTextBox tb_loginMes; + private MetroFramework.Controls.MetroTextBox tb_euipAlarm; + private MetroFramework.Controls.MetroLabel metroLabel11; } } \ No newline at end of file diff --git a/JY.Inspection/HomeForm.cs b/JY.Inspection/HomeForm.cs index 678db00..ff0cc34 100644 --- a/JY.Inspection/HomeForm.cs +++ b/JY.Inspection/HomeForm.cs @@ -1830,27 +1830,27 @@ namespace JY.Inspection }); } break; - //case 3://3#鎶ヨ - // if (msg == "1" || msg == "2") - // { - // AlamCode = msg; - // omronPLCCom.lstMcUI[0].WriteDReg(omronPLCCom.lstMcUI[0].lstTrgUI[2].TrgParams.TriggerAddr, (short)3); - // mTaskA[2] = Task.Factory.StartNew(delegate - // { - // AlarmProcess(mctsA3, resByte); - // }); - // } - // break; - //case 4: //4#寮傚父鎾姤 - // if (omronPLCCom.lstMcUI[0].lstTrgUI[3].TrgParams.TriggerCmd == msg) - // { - // omronPLCCom.lstMcUI[0].WriteDReg(omronPLCCom.lstMcUI[0].lstTrgUI[3].TrgParams.TriggerAddr, (short)2); - // mTaskA[3] = Task.Factory.StartNew(delegate - // { - // processA3(mctsA4, resByte); - // }); - // } - // break; + case 3://3#鎶ヨ + if (msg == "1" || msg == "2") + { + AlamCode = msg; + omronPLCCom.lstMcUI[0].WriteDReg(omronPLCCom.lstMcUI[0].lstTrgUI[2].TrgParams.TriggerAddr, (short)3); + mTaskA[2] = Task.Factory.StartNew(delegate + { + AlarmProcess(mctsA3, resByte); + }); + } + break; + //case 4: //4#寮傚父鎾姤 + // if (omronPLCCom.lstMcUI[0].lstTrgUI[3].TrgParams.TriggerCmd == msg) + // { + // omronPLCCom.lstMcUI[0].WriteDReg(omronPLCCom.lstMcUI[0].lstTrgUI[3].TrgParams.TriggerAddr, (short)2); + // mTaskA[3] = Task.Factory.StartNew(delegate + // { + // processA3(mctsA4, resByte); + // }); + // } + // break; } } else @@ -3033,27 +3033,46 @@ namespace JY.Inspection // LogManagerControl.AddLog($"PC->FMS[MES_Alarm]锛歿strJosn}", LogAddtype.MES); //TxtHelper.WriteTxt($@"{Global.strMesLogspath}\{DateTime.Now.ToString("yyyyMMdd")}\璁惧鎶ヨ\{DateTime.Now.ToString("HH")}.txt", strJosn); + ReqAlarm req = new ReqAlarm() + { + SiteCode = Global.systemConfig.siteCode, + LineCode = Global.systemConfig.lineCode, + EquipNum = Global.systemConfig.equipCode, + MaterialCode = string.Empty, + UserName = Global.systemConfig.userName, + RecordDate = Alarm.recordDate, + SeatId = Alarm.seatId, + Guid = Alarm.guid, + AlarmLineList = new List() { + new AlarmLine() { + AlarmEndTime = Alarm.alarmEndTime, + AlarmType = Alarm.alarmType, + AlarmName = Alarm.alarmName, + AlarmStartTime = Alarm.alarmStartTime, + FaultCode = Alarm.faultCode, + } + } + }; + Stopwatch swTime1 = new Stopwatch(); swTime1.Start(); - var AlarmResult = JY.MES.FMS.MesHelper_EVE.MES_Alarm(Alarm); + //var AlarmResult = JY.MES.FMS.MesHelper_EVE.MES_Alarm(Alarm); + MesCallResult AlarmResult = new MESDataCombin().UpAlarmData(req); + swTime1.Stop(); LogManagerControl.AddLog($"澶勭悊鎶ヨ涓婃姤FMS鑰楁椂锛歿swTime1.ElapsedMilliseconds}ms", LogAddtype.local, Logtype.Message); if (result != null) - { - string strRes = "code" + "[" + AlarmResult.code + "]" + "success" + "[" + AlarmResult.success + "]" + "message" + "[" + AlarmResult.message + "]" + "category" + "[" + AlarmResult.category + "]"; + { + string strRes = "code" + "[" + AlarmResult?.OriResponse?.Code + "]" + "success" + "[" + AlarmResult?.OriResponse?.Success + "]" + "message" + "[" + AlarmResult?.OriResponse?.Message + "]" + "category" + "[" + AlarmResult?.OriResponse?.Category + "]"; LogManagerControl.AddLog($"FMS->PC[MES_Alarm]锛歿strRes}", LogAddtype.MES); } else { - LogManagerControl.AddLog($"鎶ヨ涓婃姤FMS鍑洪敊", LogAddtype.local, Logtype.Message); + LogManagerControl.AddLog($"鎶ヨ涓婃姤Mes鍑洪敊", LogAddtype.local, Logtype.Message); } } - - // } - - } } } diff --git a/JY.Inspection/Mes/MESDataCombin.cs b/JY.Inspection/Mes/MESDataCombin.cs index 771050f..9349ab6 100644 --- a/JY.Inspection/Mes/MESDataCombin.cs +++ b/JY.Inspection/Mes/MESDataCombin.cs @@ -55,6 +55,7 @@ namespace JY.Inspection.Mes // TODO 涓婁紶璁惧鐘舵佷俊鎭 // TODO 涓婁紶璁惧鎶ヨ淇℃伅 + MesCallResult UpAlarmData(ReqAlarm req); // TODO 鑳借 void UpEnergyDataMqtt(List dataList); @@ -424,5 +425,50 @@ namespace JY.Inspection.Mes MqttSingleton.Instance.SendAsync(topic, payload).ConfigureAwait(false); } + + public MesCallResult UpAlarmData(ReqAlarm req) + { + if (req == null) + { + throw new ArgumentNullException("MES鎶ヨ璇锋眰淇℃伅涓虹┖"); + } + + // MES鐧诲綍璇锋眰鍦板潃 + DateTime currentTime = DateTime.Now; + // 鎶ヨURL + string reqUrl = Global.systemConfig.EquipAlarmUrl; + MesCallResult resp = new MesCallResult(); + + try + { + string reqJsonStr = JsonHelper.Serialize(req); + var sw = new Stopwatch(); + sw.Start(); + string mesRes = MESApiHelper.HttpPostJsonAPI( + reqUrl, + reqJsonStr, + Global.systemConfig.MesRequestTime + ); + resp = MESApiHelper.HttpPostJsonAPI(reqUrl, reqJsonStr, Global.systemConfig.MesRequestTime); + sw.Stop(); + + if (resp?.OriResponse != null && resp?.OriResponse.Success != true) + { + resp.IsSuccess = false; + resp.ErrorType = MesErrorType.BusinessError; + resp.ErrorMessage = resp?.OriResponse?.Message ?? "MES涓氬姟澶勭悊澶辫触, 閿欒娑堟伅涓虹┖"; + } + + new MesLog().LogEqupAlarmInfo(currentTime, reqJsonStr, resp.OriRespJsonStr, sw.ElapsedMilliseconds); + } + catch (Exception ex) + { + resp.IsSuccess = false; + resp.ErrorType = MesErrorType.ClientError; + resp.ErrorMessage = "涓婁紶璁惧鎶ヨ淇℃伅寮傚父锛" + ex.Message; + } + + return resp; + } } } diff --git a/JY.Inspection/Mes/MesLog.cs b/JY.Inspection/Mes/MesLog.cs index 18cfb79..b47a049 100644 --- a/JY.Inspection/Mes/MesLog.cs +++ b/JY.Inspection/Mes/MesLog.cs @@ -17,6 +17,8 @@ namespace JY.Inspection.Mes void LogExitStation(DateTime curTime, string reqJsonStr, string respMes, long costTime); void LogLoginMes(DateTime curTime, string reqJsonStr, string respMes, long costTime); + + void LogEqupAlarmInfo(DateTime curTime, string reqJsonStr, string respMes, long costTime); } public class MesLog : IMesLog @@ -71,5 +73,12 @@ namespace JY.Inspection.Mes LogoutAction(actionName, curTime, reqJsonStr, respMes, costTime); } + + public void LogEqupAlarmInfo(DateTime curTime, string reqJsonStr, string respMes, long costTime) + { + string actionName = "璁惧鎶ヨ"; + + LogoutAction(actionName, curTime, reqJsonStr, respMes, costTime); + } } } diff --git a/JY.Inspection/ViewModel/FrmMesSettingVM.cs b/JY.Inspection/ViewModel/FrmMesSettingVM.cs index 182e4d3..252cfed 100644 --- a/JY.Inspection/ViewModel/FrmMesSettingVM.cs +++ b/JY.Inspection/ViewModel/FrmMesSettingVM.cs @@ -57,6 +57,18 @@ namespace JY.Inspection.ViewModel set { loginMesUrl = value; OnPropertyChanged(); } } + private string equipAlarmUrl; + + /// + /// 璁惧鎶ヨ鎺ュ彛鍦板潃 + /// + public string EquipAlarmUrl + { + get { return equipAlarmUrl; } + set { equipAlarmUrl = value; OnPropertyChanged(); } + } + + private string productType; diff --git a/JY.MES/JY.MES.csproj b/JY.MES/JY.MES.csproj index 09ea711..66dde2b 100644 --- a/JY.MES/JY.MES.csproj +++ b/JY.MES/JY.MES.csproj @@ -72,9 +72,11 @@ + + diff --git a/JY.MES/MES/ReqAlarm.cs b/JY.MES/MES/ReqAlarm.cs new file mode 100644 index 0000000..a8196b3 --- /dev/null +++ b/JY.MES/MES/ReqAlarm.cs @@ -0,0 +1,87 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace JY.MES.MES +{ + /// + /// 璁惧鎶ヨ璇锋眰淇℃伅 + /// + public class ReqAlarm + { + /// + /// 宸ュ巶浠ｇ爜 + /// + public string SiteCode { get; set; } + + /// + /// 浜х嚎缂栧彿 + /// + public string LineCode { get; set; } + + /// + /// 璁惧缂栧彿 + /// + public string EquipNum { get; set; } + + /// + /// 宸ュ崟浜ф垚鍝佺墿鏂欏彿 + /// + public string MaterialCode { get; set; } + + /// + /// 鍛樺伐璐﹀彿 + /// + public string UserName { get; set; } + + /// + /// 閲囬泦鏃堕棿 + /// + public string RecordDate { get; set; } + + /// + /// 搴撲綅ID锛屽寲鎴愭鐢 + /// + public string SeatId { get; set; } + + /// + /// 鍞竴鏍囪瘑绗﹀彿 + /// + public string Guid { get; set; } + + /// + /// 鎶ヨ鏁扮粍 + /// + public List AlarmLineList { get; set; } + } + + public class AlarmLine + { + /// + /// 鎶ヨ娑堥櫎鏃堕棿 + /// + public string AlarmEndTime { get; set; } + + /// + /// 鎶ヨ绫诲瀷锛堝仠鏈烘姤璀︺侀潪鍋滄満鎶ヨ锛 + /// + public string AlarmType { get; set; } + + /// + /// 鎶ヨ鍚嶇О + /// + public string AlarmName { get; set; } + + /// + /// 鎶ヨ寮濮嬫椂闂 + /// + public string AlarmStartTime { get; set; } + + /// + /// 璁惧鏁呴殰浠ｇ爜 + /// + public string FaultCode { get; set; } + } +} diff --git a/JY.MES/MES/RespAlarm.cs b/JY.MES/MES/RespAlarm.cs new file mode 100644 index 0000000..7527a52 --- /dev/null +++ b/JY.MES/MES/RespAlarm.cs @@ -0,0 +1,12 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace JY.MES.MES +{ + public class RespAlarm : RespBase + { + } +} diff --git a/JY.Model/DB.Entity/SystemConfig.cs b/JY.Model/DB.Entity/SystemConfig.cs index 8584e82..ec3514a 100644 --- a/JY.Model/DB.Entity/SystemConfig.cs +++ b/JY.Model/DB.Entity/SystemConfig.cs @@ -57,6 +57,11 @@ namespace JY.Model /// public string LoginMesUrl = "http://127.0.0.1"; + /// + /// 璁惧鎶ヨ鎺ュ彛鍦板潃 + /// + public string EquipAlarmUrl = "http://127.0.0.1"; + public List CollectItemCfgList { get; set; } = new List(); #endregion