From 0e343c28b097341f14921c1c97fec92c5ebb7606 Mon Sep 17 00:00:00 2001 From: lhiven <236881222@qq.com> Date: Wed, 20 Mar 2024 16:44:21 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E8=BF=90=E5=8A=A8?= =?UTF-8?q?=E5=86=99=E6=97=A5=E5=BF=97=202=E3=80=81=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E7=A6=81=E7=94=A8=E6=A3=80=E6=B5=8B=E6=B2=BB?= =?UTF-8?q?=E5=85=B7=E6=98=AF=E5=90=A6=E9=94=81=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rs.SkyLine/Commom/GlobalVar.cs | 11 + Rs.SkyLine/Commom/Ops.cs | 10 +- Rs.SkyLine/Flow/MonitorSystemButton.cs | 22 +- Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs | 2 +- Rs.SkyLine/Flow/NormalFlow/StockTrayFlow.cs | 33 +- Rs.SkyLine/Home.cs | 10 +- Rs.SkyLine/Home.designer.cs | 27 ++ Rs.SkyLine/SysConfig/CommonConfig.Designer.cs | 343 +++++++++--------- 8 files changed, 266 insertions(+), 192 deletions(-) diff --git a/Rs.SkyLine/Commom/GlobalVar.cs b/Rs.SkyLine/Commom/GlobalVar.cs index 31ecab3..161380a 100644 --- a/Rs.SkyLine/Commom/GlobalVar.cs +++ b/Rs.SkyLine/Commom/GlobalVar.cs @@ -1163,5 +1163,16 @@ namespace Rs.Framework return SysConfigParam.GetValue(nameof(ScanBarcodeFailAutoSkip)); } } + + /// + /// 屏蔽治具是否锁定 + /// + public static bool DisableCheckSocketLock + { + get + { + return SysConfigParam.GetValue(nameof(DisableCheckSocketLock)); + } + } } } diff --git a/Rs.SkyLine/Commom/Ops.cs b/Rs.SkyLine/Commom/Ops.cs index 359b70b..487b7b3 100644 --- a/Rs.SkyLine/Commom/Ops.cs +++ b/Rs.SkyLine/Commom/Ops.cs @@ -279,7 +279,7 @@ namespace Rs.MotionPlat.Commom insertSql = $"insert into SysParameter(fieldname,fieldtype,fieldvalue,Desc,category,enable) values('ScanBarcodeSpeed','int','40','扫码速度','system',1)"; db.ExecuteNonQuery(insertSql); } - + querySql = "select * from SysParameter where fieldname='ScanBarcodeFailAutoSkip'"; dt = db.GetDataTable(querySql); if (dt == null || dt.Rows.Count == 0) @@ -287,6 +287,14 @@ namespace Rs.MotionPlat.Commom insertSql = $"insert into SysParameter(fieldname,fieldtype,fieldvalue,Desc,category,enable) values('ScanBarcodeFailAutoSkip','bool','True','扫码失败自动跳过','system',1)"; db.ExecuteNonQuery(insertSql); } + + querySql = "select * from SysParameter where fieldname='DisableCheckSocketLock'"; + dt = db.GetDataTable(querySql); + if (dt == null || dt.Rows.Count == 0) + { + insertSql = $"insert into SysParameter(fieldname,fieldtype,fieldvalue,Desc,category,enable) values('DisableCheckSocketLock','bool','True','屏蔽治具是否锁定','system',1)"; + db.ExecuteNonQuery(insertSql); + } } diff --git a/Rs.SkyLine/Flow/MonitorSystemButton.cs b/Rs.SkyLine/Flow/MonitorSystemButton.cs index 3e6b1b6..ead3a4f 100644 --- a/Rs.SkyLine/Flow/MonitorSystemButton.cs +++ b/Rs.SkyLine/Flow/MonitorSystemButton.cs @@ -138,15 +138,18 @@ namespace Rs.MotionPlat.Flow break; } } - - if (IoManager.Instance.ReadIn("左前固定气缸动位") == 0 || - IoManager.Instance.ReadIn("左后固定气缸动位") == 0 || - IoManager.Instance.ReadIn("右前固定气缸动位") == 0 || - IoManager.Instance.ReadIn("右后固定气缸动位") == 0) + if(!GlobalVar.DisableCheckSocketLock) { - step = EMonitorButtonStep.SocketUnlock; - break; + if (IoManager.Instance.ReadIn("左前固定气缸动位") == 0 || + IoManager.Instance.ReadIn("左后固定气缸动位") == 0 || + IoManager.Instance.ReadIn("右前固定气缸动位") == 0 || + IoManager.Instance.ReadIn("右后固定气缸动位") == 0) + { + step = EMonitorButtonStep.SocketUnlock; + break; + } } + } signalValue = IoManager.Instance.ReadIn("照明"); if (signalValue == 1) @@ -406,5 +409,10 @@ namespace Rs.MotionPlat.Flow } Thread.Sleep(50); } + + public string GetStep() + { + return step.ToString(); + } } } diff --git a/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs b/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs index b78a7a9..1360b20 100644 --- a/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs +++ b/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs @@ -435,7 +435,7 @@ namespace Rs.MotionPlat.Flow { if (AxisArrived.LoadXYIsArrived(targetX, targetY)) { - logInfo = GetClassName() + $"已运动到{WitchTrayWitchSlot(curNozzle.FromType, curNozzle.FromIndex)}号穴位取料位下方,cx:{Ops.GetCurPosition(AxisControl.LoadX)},cy:{Ops.GetCurPosition(AxisControl.LoadY)},cz{curNozzle.NozzleIndex}:{Ops.GetCurPosition($"NozzleZ{curNozzle.NozzleName}")}"; + logInfo = GetClassName() + $"已运动到{WitchTrayWitchSlot(curNozzle.FromType, curNozzle.FromIndex)}号穴位取料位下方,cx:{Ops.GetCurPosition(AxisControl.LoadX)},cy:{Ops.GetCurPosition(AxisControl.LoadY)},cz{curNozzle.NozzleIndex}:{Ops.GetCurPosition($"NozzleZ{curNozzle.NozzleIndex}")}"; MessageQueue.Instance.Insert(logInfo); if (curTask.FromType == TurnoverType.Turnover) { diff --git a/Rs.SkyLine/Flow/NormalFlow/StockTrayFlow.cs b/Rs.SkyLine/Flow/NormalFlow/StockTrayFlow.cs index d373440..5fb85b5 100644 --- a/Rs.SkyLine/Flow/NormalFlow/StockTrayFlow.cs +++ b/Rs.SkyLine/Flow/NormalFlow/StockTrayFlow.cs @@ -211,12 +211,12 @@ namespace Rs.AutoDischarge.V3.Flow return false; } IAxis StockZ = AxisControl.GetAxis($"StockZ{(int)m_stockType}"); - if(StockZ.HomeStatus!= EHomeStatus.Finished && !GlobalVar.VirtualAxis) - { - MessageQueue.Instance.Warn($"not homed {StockZ.HomeStatus}"); - PromptMessageBox.ShowAxisAlarmDialog(StockZ, ErrorCode.AxisNotHome); - return false; - } + //if(StockZ.HomeStatus!= EHomeStatus.Finished && !GlobalVar.VirtualAxis) + //{ + // MessageQueue.Instance.Warn($"not homed {StockZ.HomeStatus}"); + // PromptMessageBox.ShowAxisAlarmDialog(StockZ, ErrorCode.AxisNotHome); + // return false; + //} if (!finished) { MessageQueue.Instance.Warn("stock is busy"); @@ -396,7 +396,7 @@ namespace Rs.AutoDischarge.V3.Flow } break; case EStockTrayLoadFlowStep.到上料终点位: - targetFlow = -1 * int.MaxValue; + targetFlow = -1 * 1000; errCode = StockFlow.MoveOffset(targetFlow, GlobalVar.StockBeltSpeed / 4); Thread.Sleep(30); if (errCode == ErrorCode.Ok || GlobalVar.VirtualAxis) @@ -436,6 +436,7 @@ namespace Rs.AutoDischarge.V3.Flow finished = true; isRunning = false; logInfo = GetClassName()+ $"{GetTrayName()} 料仓上料盘完成"; + StockFlow.Zero(0); MessageQueue.Instance.Insert(logInfo); } } @@ -443,6 +444,7 @@ namespace Rs.AutoDischarge.V3.Flow { StockFlow.Stop(); Thread.Sleep(200); + StockFlow.Zero(0); timer.Stop(); switch (m_stockType) { @@ -522,11 +524,11 @@ namespace Rs.AutoDischarge.V3.Flow return false; } IAxis StockZ = AxisControl.GetAxis($"StockZ{(int)m_stockType}"); - if (StockZ.HomeStatus != EHomeStatus.Finished && !GlobalVar.VirtualAxis) - { - PromptMessageBox.ShowAxisAlarmDialog(StockZ, ErrorCode.AxisNotHome); - return false; - } + //if (StockZ.HomeStatus != EHomeStatus.Finished && !GlobalVar.VirtualAxis) + //{ + // PromptMessageBox.ShowAxisAlarmDialog(StockZ, ErrorCode.AxisNotHome); + // return false; + //} if (!finished) { return false; @@ -601,7 +603,7 @@ namespace Rs.AutoDischarge.V3.Flow } break; case EStockTrayUnloadFlowStep.到下料降速位: - StockFlow.Zero(0); + errCode = StockFlow.MoveOffset(SysConfigParam.GetValue("HighSpeedDistance"), GlobalVar.StockBeltSpeed); Thread.Sleep(30); if (errCode == ErrorCode.Ok || GlobalVar.VirtualAxis) @@ -627,8 +629,8 @@ namespace Rs.AutoDischarge.V3.Flow } break; case EStockTrayUnloadFlowStep.到下料结束位: - - errCode = StockFlow.MoveOffset(short.MaxValue, GlobalVar.StockBeltSpeed / 4); + targetFlow = 1000; + errCode = StockFlow.MoveOffset(targetFlow, GlobalVar.StockBeltSpeed / 4); Thread.Sleep(30); if (errCode == ErrorCode.Ok || GlobalVar.VirtualAxis) { @@ -768,6 +770,7 @@ namespace Rs.AutoDischarge.V3.Flow } finished = true; isRunning = false; + StockFlow.Zero(0); //actionFinishedEvent.Set(); } break; diff --git a/Rs.SkyLine/Home.cs b/Rs.SkyLine/Home.cs index ffa67e8..2dd42d6 100644 --- a/Rs.SkyLine/Home.cs +++ b/Rs.SkyLine/Home.cs @@ -274,10 +274,14 @@ namespace Rs.MotionPlat if (TurnoverFlow.Instance.GetStep().ToString() != lblTurnoverFlow.Text.Replace("Turnover:", "")) { - if (TurnoverFlow.Instance.GetStep().ToString() != lblTurnoverFlow.Text.Replace("Turnover:", "")) - lblTurnoverFlow.Text = "Turnover:" + TurnoverFlow.Instance.GetStep().ToString(); + lblTurnoverFlow.Text = "Turnover:" + TurnoverFlow.Instance.GetStep().ToString(); + } + if (MonitorSystemButton.Instance.GetStep() != lblMonitorFlow.Text.Replace("Monitor:", "")) + { + lblMonitorFlow.Text = "Monitor:" + MonitorSystemButton.Instance.GetStep(); } - if(MachineManage.Instance.InitializeState.ToString()!= lblInitializeState.Text.Replace("InitializeState:", "")) + + if (MachineManage.Instance.InitializeState.ToString()!= lblInitializeState.Text.Replace("InitializeState:", "")) { lblInitializeState.Text = $"InitializeState:{MachineManage.Instance.InitializeState.ToString()}"; } diff --git a/Rs.SkyLine/Home.designer.cs b/Rs.SkyLine/Home.designer.cs index 5739732..b5de772 100644 --- a/Rs.SkyLine/Home.designer.cs +++ b/Rs.SkyLine/Home.designer.cs @@ -58,6 +58,8 @@ this.lblVersion = new System.Windows.Forms.Label(); this.timer1 = new System.Windows.Forms.Timer(this.components); this.timer2 = new System.Windows.Forms.Timer(this.components); + this.panel7 = new System.Windows.Forms.Panel(); + this.lblMonitorFlow = new System.Windows.Forms.Label(); this.tableLayoutPanel2.SuspendLayout(); this.panel1.SuspendLayout(); this.panel6.SuspendLayout(); @@ -68,6 +70,7 @@ this.tableLayoutPanel3.SuspendLayout(); this.panelEx1.SuspendLayout(); this.panel2.SuspendLayout(); + this.panel7.SuspendLayout(); this.SuspendLayout(); // // panel_main @@ -294,6 +297,7 @@ // panel1 // this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(46)))), ((int)(((byte)(46)))), ((int)(((byte)(46))))); + this.panel1.Controls.Add(this.panel7); this.panel1.Controls.Add(this.panel6); this.panel1.Controls.Add(this.panel5); this.panel1.Controls.Add(this.panel4); @@ -482,6 +486,26 @@ this.timer2.Interval = 60000; this.timer2.Tick += new System.EventHandler(this.timer2_Tick); // + // panel7 + // + this.panel7.Controls.Add(this.lblMonitorFlow); + this.panel7.Dock = System.Windows.Forms.DockStyle.Left; + this.panel7.Location = new System.Drawing.Point(1064, 0); + this.panel7.Name = "panel7"; + this.panel7.Size = new System.Drawing.Size(184, 33); + this.panel7.TabIndex = 7; + // + // lblMonitorFlow + // + this.lblMonitorFlow.Dock = System.Windows.Forms.DockStyle.Fill; + this.lblMonitorFlow.ForeColor = System.Drawing.Color.White; + this.lblMonitorFlow.Location = new System.Drawing.Point(0, 0); + this.lblMonitorFlow.Name = "lblMonitorFlow"; + this.lblMonitorFlow.Size = new System.Drawing.Size(184, 33); + this.lblMonitorFlow.TabIndex = 3; + this.lblMonitorFlow.Text = "Monitor:"; + this.lblMonitorFlow.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // // Home // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -508,6 +532,7 @@ this.tableLayoutPanel3.ResumeLayout(false); this.panelEx1.ResumeLayout(false); this.panel2.ResumeLayout(false); + this.panel7.ResumeLayout(false); this.ResumeLayout(false); } @@ -543,5 +568,7 @@ private System.Windows.Forms.Timer timer2; private System.Windows.Forms.Panel panel6; private System.Windows.Forms.Label lblInitializeState; + private System.Windows.Forms.Panel panel7; + private System.Windows.Forms.Label lblMonitorFlow; } } \ No newline at end of file diff --git a/Rs.SkyLine/SysConfig/CommonConfig.Designer.cs b/Rs.SkyLine/SysConfig/CommonConfig.Designer.cs index 91e2842..e372116 100644 --- a/Rs.SkyLine/SysConfig/CommonConfig.Designer.cs +++ b/Rs.SkyLine/SysConfig/CommonConfig.Designer.cs @@ -53,6 +53,7 @@ this.cboxUpCameraName = new System.Windows.Forms.ComboBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.txtQifuValue = new System.Windows.Forms.TextBox(); + this.cboxScanBarcodeFailAutoSkip = new System.Windows.Forms.CheckBox(); this.cboxLocationFailAutoSkip = new System.Windows.Forms.CheckBox(); this.groupBox2 = new System.Windows.Forms.GroupBox(); this.cboxMsgShowKo = new System.Windows.Forms.CheckBox(); @@ -60,20 +61,15 @@ this.cboxMsgShowCn = new System.Windows.Forms.CheckBox(); this.label9 = new System.Windows.Forms.Label(); this.comboBox1 = new System.Windows.Forms.ComboBox(); - this.panel1 = new System.Windows.Forms.Panel(); - this.radioButton4 = new System.Windows.Forms.RadioButton(); - this.radioButton3 = new System.Windows.Forms.RadioButton(); this.label2 = new System.Windows.Forms.Label(); - this.label6 = new System.Windows.Forms.Label(); this.cboxVirtualAxis = new System.Windows.Forms.CheckBox(); this.cboxCheckSafeEnable = new System.Windows.Forms.CheckBox(); this.cboxDisableDoor = new System.Windows.Forms.CheckBox(); + this.cboxInputTrayLoop = new System.Windows.Forms.CheckBox(); this.cboxEnableVirtuleBarCode = new System.Windows.Forms.CheckBox(); this.cboxGRR = new System.Windows.Forms.CheckBox(); this.cboxEnableTestFixtureFiberCheck = new System.Windows.Forms.CheckBox(); this.cboxEnableTwoSpeed = new System.Windows.Forms.CheckBox(); - this.cboxEnableScanBarCodeByDownCamera = new System.Windows.Forms.CheckBox(); - this.cboxEnableExceptionHandlingNozzle = new System.Windows.Forms.CheckBox(); this.cboxRunSpace = new System.Windows.Forms.CheckBox(); this.panelEx1 = new Rs.Controls.PanelEx(); this.btnSaveSpeedParam = new System.Windows.Forms.Button(); @@ -81,12 +77,14 @@ this.label4 = new System.Windows.Forms.Label(); this.tbarPressLowSpeed = new System.Windows.Forms.TrackBar(); this.tbarTakeTraySpeed = new System.Windows.Forms.TrackBar(); + this.tbarScanBarcodeSpeed = new System.Windows.Forms.TrackBar(); this.tbarFlyCameraSpeed = new System.Windows.Forms.TrackBar(); this.tbarTakeTrayFromNg2InputSpeed = new System.Windows.Forms.TrackBar(); this.tbarStockBeltSpeed = new System.Windows.Forms.TrackBar(); this.tbarWholeSpeed = new System.Windows.Forms.TrackBar(); this.lblPressLowSpeed = new System.Windows.Forms.Label(); this.lblTakeTraySpeed = new System.Windows.Forms.Label(); + this.lblScanBarcodeSpeed = new System.Windows.Forms.Label(); this.lblFlyCameraSpeed = new System.Windows.Forms.Label(); this.label20 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); @@ -95,18 +93,21 @@ this.lblStockBeltSpeed = new System.Windows.Forms.Label(); this.lblWholeSpeed = new System.Windows.Forms.Label(); this.label11 = new System.Windows.Forms.Label(); + this.label16 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); - this.txtControlCenterPort = new System.Windows.Forms.TextBox(); - this.label27 = new System.Windows.Forms.Label(); + this.groupBox4 = new System.Windows.Forms.GroupBox(); + this.label6 = new System.Windows.Forms.Label(); + this.panel1 = new System.Windows.Forms.Panel(); + this.radioButton4 = new System.Windows.Forms.RadioButton(); + this.radioButton3 = new System.Windows.Forms.RadioButton(); this.txtControlCenterIP = new System.Windows.Forms.TextBox(); this.label26 = new System.Windows.Forms.Label(); - this.cboxInputTrayLoop = new System.Windows.Forms.CheckBox(); - this.label16 = new System.Windows.Forms.Label(); - this.lblScanBarcodeSpeed = new System.Windows.Forms.Label(); - this.tbarScanBarcodeSpeed = new System.Windows.Forms.TrackBar(); - this.cboxScanBarcodeFailAutoSkip = new System.Windows.Forms.CheckBox(); - this.groupBox4 = new System.Windows.Forms.GroupBox(); + this.label27 = new System.Windows.Forms.Label(); + this.txtControlCenterPort = new System.Windows.Forms.TextBox(); + this.cboxEnableExceptionHandlingNozzle = new System.Windows.Forms.CheckBox(); + this.cboxEnableScanBarCodeByDownCamera = new System.Windows.Forms.CheckBox(); + this.cboxDisableCheckSocketLock = new System.Windows.Forms.CheckBox(); this.tableLayoutPanel1.SuspendLayout(); this.groupBox8.SuspendLayout(); this.groupBox3.SuspendLayout(); @@ -114,16 +115,16 @@ this.groupBox9.SuspendLayout(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); - this.panel1.SuspendLayout(); this.panelEx1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.tbarPressLowSpeed)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tbarTakeTraySpeed)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.tbarScanBarcodeSpeed)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tbarFlyCameraSpeed)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tbarTakeTrayFromNg2InputSpeed)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tbarStockBeltSpeed)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tbarWholeSpeed)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.tbarScanBarcodeSpeed)).BeginInit(); this.groupBox4.SuspendLayout(); + this.panel1.SuspendLayout(); this.SuspendLayout(); // // tableLayoutPanel1 @@ -415,6 +416,7 @@ this.groupBox1.Controls.Add(this.label2); this.groupBox1.Controls.Add(this.cboxVirtualAxis); this.groupBox1.Controls.Add(this.cboxCheckSafeEnable); + this.groupBox1.Controls.Add(this.cboxDisableCheckSocketLock); this.groupBox1.Controls.Add(this.cboxDisableDoor); this.groupBox1.Controls.Add(this.cboxInputTrayLoop); this.groupBox1.Controls.Add(this.cboxEnableVirtuleBarCode); @@ -468,6 +470,16 @@ this.txtQifuValue.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.txtQifuValue.KeyUp += new System.Windows.Forms.KeyEventHandler(this.txtQifuValue_KeyUp); // + // cboxScanBarcodeFailAutoSkip + // + this.cboxScanBarcodeFailAutoSkip.AutoSize = true; + this.cboxScanBarcodeFailAutoSkip.Location = new System.Drawing.Point(507, 154); + this.cboxScanBarcodeFailAutoSkip.Name = "cboxScanBarcodeFailAutoSkip"; + this.cboxScanBarcodeFailAutoSkip.Size = new System.Drawing.Size(120, 16); + this.cboxScanBarcodeFailAutoSkip.TabIndex = 53; + this.cboxScanBarcodeFailAutoSkip.Text = "扫码失败自动跳过"; + this.cboxScanBarcodeFailAutoSkip.UseVisualStyleBackColor = true; + // // cboxLocationFailAutoSkip // this.cboxLocationFailAutoSkip.AutoSize = true; @@ -541,40 +553,6 @@ this.comboBox1.Size = new System.Drawing.Size(121, 20); this.comboBox1.TabIndex = 43; // - // panel1 - // - this.panel1.Controls.Add(this.radioButton4); - this.panel1.Controls.Add(this.radioButton3); - this.panel1.Location = new System.Drawing.Point(36, 56); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(190, 33); - this.panel1.TabIndex = 2; - this.panel1.Visible = false; - // - // radioButton4 - // - this.radioButton4.AutoSize = true; - this.radioButton4.FlatAppearance.CheckedBackColor = System.Drawing.Color.Lime; - this.radioButton4.Location = new System.Drawing.Point(90, 6); - this.radioButton4.Name = "radioButton4"; - this.radioButton4.Size = new System.Drawing.Size(71, 16); - this.radioButton4.TabIndex = 1; - this.radioButton4.Text = "从右到左"; - this.radioButton4.UseVisualStyleBackColor = true; - // - // radioButton3 - // - this.radioButton3.AutoSize = true; - this.radioButton3.Checked = true; - this.radioButton3.FlatAppearance.CheckedBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0))))); - this.radioButton3.Location = new System.Drawing.Point(12, 6); - this.radioButton3.Name = "radioButton3"; - this.radioButton3.Size = new System.Drawing.Size(71, 16); - this.radioButton3.TabIndex = 1; - this.radioButton3.TabStop = true; - this.radioButton3.Text = "从左到右"; - this.radioButton3.UseVisualStyleBackColor = true; - // // label2 // this.label2.AutoSize = true; @@ -585,16 +563,6 @@ this.label2.TabIndex = 0; this.label2.Text = "语言:"; // - // label6 - // - this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(46, 38); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(71, 12); - this.label6.TabIndex = 0; - this.label6.Text = "取放料方式:"; - this.label6.Visible = false; - // // cboxVirtualAxis // this.cboxVirtualAxis.AutoSize = true; @@ -625,6 +593,16 @@ this.cboxDisableDoor.Text = "禁用门禁"; this.cboxDisableDoor.UseVisualStyleBackColor = true; // + // cboxInputTrayLoop + // + this.cboxInputTrayLoop.AutoSize = true; + this.cboxInputTrayLoop.Location = new System.Drawing.Point(425, 295); + this.cboxInputTrayLoop.Name = "cboxInputTrayLoop"; + this.cboxInputTrayLoop.Size = new System.Drawing.Size(60, 16); + this.cboxInputTrayLoop.TabIndex = 8; + this.cboxInputTrayLoop.Text = "循环跑"; + this.cboxInputTrayLoop.UseVisualStyleBackColor = true; + // // cboxEnableVirtuleBarCode // this.cboxEnableVirtuleBarCode.AutoSize = true; @@ -665,28 +643,6 @@ this.cboxEnableTwoSpeed.Text = "启用二段速"; this.cboxEnableTwoSpeed.UseVisualStyleBackColor = true; // - // cboxEnableScanBarCodeByDownCamera - // - this.cboxEnableScanBarCodeByDownCamera.AutoSize = true; - this.cboxEnableScanBarCodeByDownCamera.Location = new System.Drawing.Point(37, 167); - this.cboxEnableScanBarCodeByDownCamera.Name = "cboxEnableScanBarCodeByDownCamera"; - this.cboxEnableScanBarCodeByDownCamera.Size = new System.Drawing.Size(84, 16); - this.cboxEnableScanBarCodeByDownCamera.TabIndex = 8; - this.cboxEnableScanBarCodeByDownCamera.Text = "下相机扫码"; - this.cboxEnableScanBarCodeByDownCamera.UseVisualStyleBackColor = true; - this.cboxEnableScanBarCodeByDownCamera.Visible = false; - // - // cboxEnableExceptionHandlingNozzle - // - this.cboxEnableExceptionHandlingNozzle.AutoSize = true; - this.cboxEnableExceptionHandlingNozzle.Location = new System.Drawing.Point(37, 145); - this.cboxEnableExceptionHandlingNozzle.Name = "cboxEnableExceptionHandlingNozzle"; - this.cboxEnableExceptionHandlingNozzle.Size = new System.Drawing.Size(96, 16); - this.cboxEnableExceptionHandlingNozzle.TabIndex = 8; - this.cboxEnableExceptionHandlingNozzle.Text = "启用强力吸嘴"; - this.cboxEnableExceptionHandlingNozzle.UseVisualStyleBackColor = true; - this.cboxEnableExceptionHandlingNozzle.Visible = false; - // // cboxRunSpace // this.cboxRunSpace.AutoSize = true; @@ -768,6 +724,20 @@ this.tbarTakeTraySpeed.Value = 1; this.tbarTakeTraySpeed.ValueChanged += new System.EventHandler(this.tbarTakeTraySpeed_ValueChanged); // + // tbarScanBarcodeSpeed + // + this.tbarScanBarcodeSpeed.AutoSize = false; + this.tbarScanBarcodeSpeed.LargeChange = 1; + this.tbarScanBarcodeSpeed.Location = new System.Drawing.Point(155, 64); + this.tbarScanBarcodeSpeed.Maximum = 100; + this.tbarScanBarcodeSpeed.Minimum = 1; + this.tbarScanBarcodeSpeed.Name = "tbarScanBarcodeSpeed"; + this.tbarScanBarcodeSpeed.Size = new System.Drawing.Size(300, 20); + this.tbarScanBarcodeSpeed.TabIndex = 1; + this.tbarScanBarcodeSpeed.TickStyle = System.Windows.Forms.TickStyle.None; + this.tbarScanBarcodeSpeed.Value = 1; + this.tbarScanBarcodeSpeed.ValueChanged += new System.EventHandler(this.tbarScanBarcodeSpeed_ValueChanged); + // // tbarFlyCameraSpeed // this.tbarFlyCameraSpeed.AutoSize = false; @@ -842,6 +812,15 @@ this.lblTakeTraySpeed.TabIndex = 0; this.lblTakeTraySpeed.Text = "5%"; // + // lblScanBarcodeSpeed + // + this.lblScanBarcodeSpeed.AutoSize = true; + this.lblScanBarcodeSpeed.Location = new System.Drawing.Point(458, 69); + this.lblScanBarcodeSpeed.Name = "lblScanBarcodeSpeed"; + this.lblScanBarcodeSpeed.Size = new System.Drawing.Size(17, 12); + this.lblScanBarcodeSpeed.TabIndex = 0; + this.lblScanBarcodeSpeed.Text = "5%"; + // // lblFlyCameraSpeed // this.lblFlyCameraSpeed.AutoSize = true; @@ -914,6 +893,15 @@ this.label11.TabIndex = 0; this.label11.Text = "皮带速度:"; // + // label16 + // + this.label16.AutoSize = true; + this.label16.Location = new System.Drawing.Point(74, 67); + this.label16.Name = "label16"; + this.label16.Size = new System.Drawing.Size(59, 12); + this.label16.TabIndex = 0; + this.label16.Text = "扫码速度:"; + // // label3 // this.label3.AutoSize = true; @@ -932,29 +920,67 @@ this.label1.TabIndex = 0; this.label1.Text = "整体速度:"; // - // txtControlCenterPort + // groupBox4 // - this.txtControlCenterPort.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(16)))), ((int)(((byte)(16)))), ((int)(((byte)(16))))); - this.txtControlCenterPort.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.txtControlCenterPort.Font = new System.Drawing.Font("宋体", 9F); - this.txtControlCenterPort.ForeColor = System.Drawing.Color.White; - this.txtControlCenterPort.Location = new System.Drawing.Point(206, 168); - this.txtControlCenterPort.Name = "txtControlCenterPort"; - this.txtControlCenterPort.Size = new System.Drawing.Size(93, 21); - this.txtControlCenterPort.TabIndex = 42; - this.txtControlCenterPort.Text = "2048"; - this.txtControlCenterPort.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.txtControlCenterPort.Visible = false; + this.groupBox4.Controls.Add(this.label6); + this.groupBox4.Controls.Add(this.panel1); + this.groupBox4.Controls.Add(this.txtControlCenterIP); + this.groupBox4.Controls.Add(this.label26); + this.groupBox4.Controls.Add(this.label27); + this.groupBox4.Controls.Add(this.txtControlCenterPort); + this.groupBox4.Controls.Add(this.cboxEnableExceptionHandlingNozzle); + this.groupBox4.Controls.Add(this.cboxEnableScanBarCodeByDownCamera); + this.groupBox4.Dock = System.Windows.Forms.DockStyle.Fill; + this.groupBox4.Location = new System.Drawing.Point(787, 441); + this.groupBox4.Name = "groupBox4"; + this.groupBox4.Size = new System.Drawing.Size(778, 433); + this.groupBox4.TabIndex = 4; + this.groupBox4.TabStop = false; + this.groupBox4.Text = "groupBox4"; // - // label27 + // label6 // - this.label27.AutoSize = true; - this.label27.Location = new System.Drawing.Point(137, 170); - this.label27.Name = "label27"; - this.label27.Size = new System.Drawing.Size(59, 12); - this.label27.TabIndex = 0; - this.label27.Text = "中控端口:"; - this.label27.Visible = false; + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(46, 38); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(71, 12); + this.label6.TabIndex = 0; + this.label6.Text = "取放料方式:"; + this.label6.Visible = false; + // + // panel1 + // + this.panel1.Controls.Add(this.radioButton4); + this.panel1.Controls.Add(this.radioButton3); + this.panel1.Location = new System.Drawing.Point(36, 56); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(190, 33); + this.panel1.TabIndex = 2; + this.panel1.Visible = false; + // + // radioButton4 + // + this.radioButton4.AutoSize = true; + this.radioButton4.FlatAppearance.CheckedBackColor = System.Drawing.Color.Lime; + this.radioButton4.Location = new System.Drawing.Point(90, 6); + this.radioButton4.Name = "radioButton4"; + this.radioButton4.Size = new System.Drawing.Size(71, 16); + this.radioButton4.TabIndex = 1; + this.radioButton4.Text = "从右到左"; + this.radioButton4.UseVisualStyleBackColor = true; + // + // radioButton3 + // + this.radioButton3.AutoSize = true; + this.radioButton3.Checked = true; + this.radioButton3.FlatAppearance.CheckedBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0))))); + this.radioButton3.Location = new System.Drawing.Point(12, 6); + this.radioButton3.Name = "radioButton3"; + this.radioButton3.Size = new System.Drawing.Size(71, 16); + this.radioButton3.TabIndex = 1; + this.radioButton3.TabStop = true; + this.radioButton3.Text = "从左到右"; + this.radioButton3.UseVisualStyleBackColor = true; // // txtControlCenterIP // @@ -980,75 +1006,61 @@ this.label26.Text = "中控IP:"; this.label26.Visible = false; // - // cboxInputTrayLoop - // - this.cboxInputTrayLoop.AutoSize = true; - this.cboxInputTrayLoop.Location = new System.Drawing.Point(425, 295); - this.cboxInputTrayLoop.Name = "cboxInputTrayLoop"; - this.cboxInputTrayLoop.Size = new System.Drawing.Size(60, 16); - this.cboxInputTrayLoop.TabIndex = 8; - this.cboxInputTrayLoop.Text = "循环跑"; - this.cboxInputTrayLoop.UseVisualStyleBackColor = true; - // - // label16 + // label27 // - this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(74, 67); - this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(59, 12); - this.label16.TabIndex = 0; - this.label16.Text = "扫码速度:"; + this.label27.AutoSize = true; + this.label27.Location = new System.Drawing.Point(137, 170); + this.label27.Name = "label27"; + this.label27.Size = new System.Drawing.Size(59, 12); + this.label27.TabIndex = 0; + this.label27.Text = "中控端口:"; + this.label27.Visible = false; // - // lblScanBarcodeSpeed + // txtControlCenterPort // - this.lblScanBarcodeSpeed.AutoSize = true; - this.lblScanBarcodeSpeed.Location = new System.Drawing.Point(458, 69); - this.lblScanBarcodeSpeed.Name = "lblScanBarcodeSpeed"; - this.lblScanBarcodeSpeed.Size = new System.Drawing.Size(17, 12); - this.lblScanBarcodeSpeed.TabIndex = 0; - this.lblScanBarcodeSpeed.Text = "5%"; + this.txtControlCenterPort.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(16)))), ((int)(((byte)(16)))), ((int)(((byte)(16))))); + this.txtControlCenterPort.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.txtControlCenterPort.Font = new System.Drawing.Font("宋体", 9F); + this.txtControlCenterPort.ForeColor = System.Drawing.Color.White; + this.txtControlCenterPort.Location = new System.Drawing.Point(206, 168); + this.txtControlCenterPort.Name = "txtControlCenterPort"; + this.txtControlCenterPort.Size = new System.Drawing.Size(93, 21); + this.txtControlCenterPort.TabIndex = 42; + this.txtControlCenterPort.Text = "2048"; + this.txtControlCenterPort.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.txtControlCenterPort.Visible = false; // - // tbarScanBarcodeSpeed + // cboxEnableExceptionHandlingNozzle // - this.tbarScanBarcodeSpeed.AutoSize = false; - this.tbarScanBarcodeSpeed.LargeChange = 1; - this.tbarScanBarcodeSpeed.Location = new System.Drawing.Point(155, 64); - this.tbarScanBarcodeSpeed.Maximum = 100; - this.tbarScanBarcodeSpeed.Minimum = 1; - this.tbarScanBarcodeSpeed.Name = "tbarScanBarcodeSpeed"; - this.tbarScanBarcodeSpeed.Size = new System.Drawing.Size(300, 20); - this.tbarScanBarcodeSpeed.TabIndex = 1; - this.tbarScanBarcodeSpeed.TickStyle = System.Windows.Forms.TickStyle.None; - this.tbarScanBarcodeSpeed.Value = 1; - this.tbarScanBarcodeSpeed.ValueChanged += new System.EventHandler(this.tbarScanBarcodeSpeed_ValueChanged); + this.cboxEnableExceptionHandlingNozzle.AutoSize = true; + this.cboxEnableExceptionHandlingNozzle.Location = new System.Drawing.Point(37, 145); + this.cboxEnableExceptionHandlingNozzle.Name = "cboxEnableExceptionHandlingNozzle"; + this.cboxEnableExceptionHandlingNozzle.Size = new System.Drawing.Size(96, 16); + this.cboxEnableExceptionHandlingNozzle.TabIndex = 8; + this.cboxEnableExceptionHandlingNozzle.Text = "启用强力吸嘴"; + this.cboxEnableExceptionHandlingNozzle.UseVisualStyleBackColor = true; + this.cboxEnableExceptionHandlingNozzle.Visible = false; // - // cboxScanBarcodeFailAutoSkip + // cboxEnableScanBarCodeByDownCamera // - this.cboxScanBarcodeFailAutoSkip.AutoSize = true; - this.cboxScanBarcodeFailAutoSkip.Location = new System.Drawing.Point(507, 154); - this.cboxScanBarcodeFailAutoSkip.Name = "cboxScanBarcodeFailAutoSkip"; - this.cboxScanBarcodeFailAutoSkip.Size = new System.Drawing.Size(120, 16); - this.cboxScanBarcodeFailAutoSkip.TabIndex = 53; - this.cboxScanBarcodeFailAutoSkip.Text = "扫码失败自动跳过"; - this.cboxScanBarcodeFailAutoSkip.UseVisualStyleBackColor = true; + this.cboxEnableScanBarCodeByDownCamera.AutoSize = true; + this.cboxEnableScanBarCodeByDownCamera.Location = new System.Drawing.Point(37, 167); + this.cboxEnableScanBarCodeByDownCamera.Name = "cboxEnableScanBarCodeByDownCamera"; + this.cboxEnableScanBarCodeByDownCamera.Size = new System.Drawing.Size(84, 16); + this.cboxEnableScanBarCodeByDownCamera.TabIndex = 8; + this.cboxEnableScanBarCodeByDownCamera.Text = "下相机扫码"; + this.cboxEnableScanBarCodeByDownCamera.UseVisualStyleBackColor = true; + this.cboxEnableScanBarCodeByDownCamera.Visible = false; // - // groupBox4 + // cboxDisableCheckSocketLock // - this.groupBox4.Controls.Add(this.label6); - this.groupBox4.Controls.Add(this.panel1); - this.groupBox4.Controls.Add(this.txtControlCenterIP); - this.groupBox4.Controls.Add(this.label26); - this.groupBox4.Controls.Add(this.label27); - this.groupBox4.Controls.Add(this.txtControlCenterPort); - this.groupBox4.Controls.Add(this.cboxEnableExceptionHandlingNozzle); - this.groupBox4.Controls.Add(this.cboxEnableScanBarCodeByDownCamera); - this.groupBox4.Dock = System.Windows.Forms.DockStyle.Fill; - this.groupBox4.Location = new System.Drawing.Point(787, 441); - this.groupBox4.Name = "groupBox4"; - this.groupBox4.Size = new System.Drawing.Size(778, 433); - this.groupBox4.TabIndex = 4; - this.groupBox4.TabStop = false; - this.groupBox4.Text = "groupBox4"; + this.cboxDisableCheckSocketLock.AutoSize = true; + this.cboxDisableCheckSocketLock.Location = new System.Drawing.Point(507, 185); + this.cboxDisableCheckSocketLock.Name = "cboxDisableCheckSocketLock"; + this.cboxDisableCheckSocketLock.Size = new System.Drawing.Size(144, 16); + this.cboxDisableCheckSocketLock.TabIndex = 8; + this.cboxDisableCheckSocketLock.Text = "禁用检测治具是否锁定"; + this.cboxDisableCheckSocketLock.UseVisualStyleBackColor = true; // // CommonConfig // @@ -1072,18 +1084,18 @@ this.groupBox1.PerformLayout(); this.groupBox2.ResumeLayout(false); this.groupBox2.PerformLayout(); - this.panel1.ResumeLayout(false); - this.panel1.PerformLayout(); this.panelEx1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.tbarPressLowSpeed)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tbarTakeTraySpeed)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.tbarScanBarcodeSpeed)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tbarFlyCameraSpeed)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tbarTakeTrayFromNg2InputSpeed)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tbarStockBeltSpeed)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tbarWholeSpeed)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.tbarScanBarcodeSpeed)).EndInit(); this.groupBox4.ResumeLayout(false); this.groupBox4.PerformLayout(); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); this.ResumeLayout(false); } @@ -1169,5 +1181,6 @@ private System.Windows.Forms.Label label16; private System.Windows.Forms.CheckBox cboxScanBarcodeFailAutoSkip; private System.Windows.Forms.GroupBox groupBox4; + private System.Windows.Forms.CheckBox cboxDisableCheckSocketLock; } } \ No newline at end of file