diff --git a/Rs.SkyLine/Commom/GlobalVar.cs b/Rs.SkyLine/Commom/GlobalVar.cs index 0bab040..2c4591d 100644 --- a/Rs.SkyLine/Commom/GlobalVar.cs +++ b/Rs.SkyLine/Commom/GlobalVar.cs @@ -1011,5 +1011,27 @@ namespace Rs.Framework return SysConfigParam.GetValue(nameof(TakeTrayFromNg2InputSpeed)); } } + + /// + /// Socket9-16异常处理位X + /// + public static double Socket9_16ExceptionX + { + get + { + return SysConfigParam.GetValue(nameof(Socket9_16ExceptionX)); + } + } + + /// + /// Socket9-16异常处理位Y + /// + public static double Socket9_16ExceptionY + { + get + { + return SysConfigParam.GetValue(nameof(Socket9_16ExceptionY)); + } + } } } diff --git a/Rs.SkyLine/Commom/Ops.cs b/Rs.SkyLine/Commom/Ops.cs index cc5c514..c451c08 100644 --- a/Rs.SkyLine/Commom/Ops.cs +++ b/Rs.SkyLine/Commom/Ops.cs @@ -181,6 +181,20 @@ namespace Rs.MotionPlat.Commom insertSql = $"insert into SysParameter(fieldname,fieldtype,fieldvalue,Desc,category,enable) values('TakeTrayFromNg2InputSpeed','int','2','搬运带料料盘速度','system',1)"; db.ExecuteNonQuery(insertSql); } + querySql = "select * from SysParameter where fieldname='Socket9_16ExceptionX'"; + dt = db.GetDataTable(querySql); + if (dt == null || dt.Rows.Count == 0) + { + insertSql = $"insert into SysParameter(fieldname,fieldtype,fieldvalue,Desc,category,enable) values('Socket9_16ExceptionX','double','0','Socket9-16异常处理位X','system',1)"; + db.ExecuteNonQuery(insertSql); + } + querySql = "select * from SysParameter where fieldname='Socket9_16ExceptionY'"; + dt = db.GetDataTable(querySql); + if (dt == null || dt.Rows.Count == 0) + { + insertSql = $"insert into SysParameter(fieldname,fieldtype,fieldvalue,Desc,category,enable) values('Socket9_16ExceptionY','double','0','Socket9-16异常处理位Y','system',1)"; + db.ExecuteNonQuery(insertSql); + } } @@ -410,45 +424,59 @@ namespace Rs.MotionPlat.Commom IoManager.Instance.WriteOut(ioName, 0); } - public static bool IsOn(string ioName) + public static bool IsOn(string ioName,bool needRecheck=true) { int num = 0; short val = 0; - while (num<3) + if (needRecheck) { - val = IoManager.Instance.ReadIn(ioName); - if(val==0) - { - num++; - Thread.Sleep(20); - } - else + while (num < 3) { - num = 0; - break; + val = IoManager.Instance.ReadIn(ioName); + if (val == 0) + { + num++; + Thread.Sleep(20); + } + else + { + num = 0; + break; + } } } + else + { + val = IoManager.Instance.ReadIn(ioName); + } return val == 1; } - public static bool IsOff(string ioName) + public static bool IsOff(string ioName,bool needRecheck = true) { int num = 0; short val = 0; - while (num < 3) + if(needRecheck) { - val = IoManager.Instance.ReadIn(ioName); - if (val == 1) - { - num++; - Thread.Sleep(20); - } - else + while (num < 3) { - num = 0; - break; + val = IoManager.Instance.ReadIn(ioName); + if (val == 1) + { + num++; + Thread.Sleep(20); + } + else + { + num = 0; + break; + } } } + else + { + val = IoManager.Instance.ReadIn(ioName); + } return val == 0; //return IoManager.Instance.ReadIn(ioName) == 0; } diff --git a/Rs.SkyLine/Flow/NormalFlow/StockTrayFlow.cs b/Rs.SkyLine/Flow/NormalFlow/StockTrayFlow.cs index adf4f94..81880e0 100644 --- a/Rs.SkyLine/Flow/NormalFlow/StockTrayFlow.cs +++ b/Rs.SkyLine/Flow/NormalFlow/StockTrayFlow.cs @@ -191,11 +191,11 @@ namespace Rs.AutoDischarge.V3.Flow public bool Load(EStockTrayLoadMode loadMode,Action loadFinishedEvent) { - if(HasTray()) - { - MessageQueue.Instance.Warn($"{GetTrayName()}工作位有料盘，不能重复上料盘"); - return false; - } + //if(HasTray()) + //{ + // MessageQueue.Instance.Warn($"{GetTrayName()}工作位有料盘，不能重复上料盘"); + // return false; + //} logInfo = GetClassName() + $"{GetTrayName()} 料仓收到上料任务"; LogHelper.Debug(logInfo); if (!isRunning) diff --git a/Rs.SkyLine/Flow/SafeControl.cs b/Rs.SkyLine/Flow/SafeControl.cs index 31005f2..0e8565d 100644 --- a/Rs.SkyLine/Flow/SafeControl.cs +++ b/Rs.SkyLine/Flow/SafeControl.cs @@ -85,7 +85,7 @@ namespace Rs.MotionPlat.Flow AxisControl.GetAxis($"NozzleZ{i}").GetOrgStatus(out bOnOrg); if (!bOnOrg) { - MessageQueue.Instance.Warn($"NozzleZ{i} is hasn't org signal"); + MessageQueue.Instance.Warn($"NozzleZ{i} hasn't org signal"); return false; } diff --git a/Rs.SkyLine/Properties/AssemblyInfo.cs b/Rs.SkyLine/Properties/AssemblyInfo.cs index 6d09bdc..a8d7b4f 100644 --- a/Rs.SkyLine/Properties/AssemblyInfo.cs +++ b/Rs.SkyLine/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ using System.Runtime.InteropServices; // //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //通过使用 "*"，如下所示: - [assembly: AssemblyVersion("2.20.24.21")] + [assembly: AssemblyVersion("2.20.24.24")] //[assembly: AssemblyVersion("1.0.0.0")] //[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Rs.SkyLine/SysConfig/CommonConfig.Designer.cs b/Rs.SkyLine/SysConfig/CommonConfig.Designer.cs index 52bebb2..a1b670d 100644 --- a/Rs.SkyLine/SysConfig/CommonConfig.Designer.cs +++ b/Rs.SkyLine/SysConfig/CommonConfig.Designer.cs @@ -52,12 +52,12 @@ this.label7 = new System.Windows.Forms.Label(); this.cboxUpCameraName = new System.Windows.Forms.ComboBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.txtQifuValue = new System.Windows.Forms.TextBox(); this.cboxLocationFailAutoSkip = new System.Windows.Forms.CheckBox(); this.groupBox2 = new System.Windows.Forms.GroupBox(); this.cboxMsgShowKo = new System.Windows.Forms.CheckBox(); this.cboxMsgShowEn = new System.Windows.Forms.CheckBox(); this.cboxMsgShowCn = new System.Windows.Forms.CheckBox(); - this.txtQifuValue = new System.Windows.Forms.TextBox(); this.label9 = new System.Windows.Forms.Label(); this.comboBox1 = new System.Windows.Forms.ComboBox(); this.panel1 = new System.Windows.Forms.Panel(); @@ -397,9 +397,9 @@ // // groupBox1 // + this.groupBox1.Controls.Add(this.txtQifuValue); this.groupBox1.Controls.Add(this.cboxLocationFailAutoSkip); this.groupBox1.Controls.Add(this.groupBox2); - this.groupBox1.Controls.Add(this.txtQifuValue); this.groupBox1.Controls.Add(this.label9); this.groupBox1.Controls.Add(this.comboBox1); this.groupBox1.Controls.Add(this.panel1); @@ -449,6 +449,19 @@ this.groupBox1.TabStop = false; this.groupBox1.Text = "系统配置"; // + // txtQifuValue + // + this.txtQifuValue.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(16)))), ((int)(((byte)(16)))), ((int)(((byte)(16))))); + this.txtQifuValue.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.txtQifuValue.ForeColor = System.Drawing.Color.White; + this.txtQifuValue.Location = new System.Drawing.Point(361, 323); + this.txtQifuValue.Name = "txtQifuValue"; + this.txtQifuValue.Size = new System.Drawing.Size(100, 21); + this.txtQifuValue.TabIndex = 54; + this.txtQifuValue.Text = "0.01"; + this.txtQifuValue.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.txtQifuValue.KeyUp += new System.Windows.Forms.KeyEventHandler(this.txtQifuValue_KeyUp); + // // cboxLocationFailAutoSkip // this.cboxLocationFailAutoSkip.AutoSize = true; @@ -502,21 +515,6 @@ this.cboxMsgShowCn.Text = "中文"; this.cboxMsgShowCn.UseVisualStyleBackColor = true; // - // txtQifuValue - // - this.txtQifuValue.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(16)))), ((int)(((byte)(16)))), ((int)(((byte)(16))))); - this.txtQifuValue.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.txtQifuValue.Font = new System.Drawing.Font("宋体", 9F); - this.txtQifuValue.ForeColor = System.Drawing.Color.White; - this.txtQifuValue.Location = new System.Drawing.Point(370, 325); - this.txtQifuValue.Name = "txtQifuValue"; - this.txtQifuValue.Size = new System.Drawing.Size(85, 21); - this.txtQifuValue.TabIndex = 51; - this.txtQifuValue.Tag = "PressZ"; - this.txtQifuValue.Text = "0.01"; - this.txtQifuValue.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.txtQifuValue.KeyUp += new System.Windows.Forms.KeyEventHandler(this.txtQifuValue_KeyUp); - // // label9 // this.label9.AutoSize = true; @@ -1064,7 +1062,6 @@ private System.Windows.Forms.Label label2; private System.Windows.Forms.CheckBox cboxEnableExceptionHandlingNozzle; private System.Windows.Forms.CheckBox cboxEnableScanBarCodeByDownCamera; - private System.Windows.Forms.TextBox txtQifuValue; private System.Windows.Forms.Label label9; private System.Windows.Forms.CheckBox cboxEnableTwoSpeed; private System.Windows.Forms.CheckBox cboxEnableTestFixtureFiberCheck; @@ -1086,5 +1083,6 @@ private System.Windows.Forms.Label lblTakeTrayFromNg2InputSpeed; private System.Windows.Forms.Label lblStockBeltSpeed; private System.Windows.Forms.Label label11; + private System.Windows.Forms.TextBox txtQifuValue; } } \ No newline at end of file diff --git a/Rs.SkyLine/SysConfig/CommonConfig.cs b/Rs.SkyLine/SysConfig/CommonConfig.cs index 61b97f3..2b8a139 100644 --- a/Rs.SkyLine/SysConfig/CommonConfig.cs +++ b/Rs.SkyLine/SysConfig/CommonConfig.cs @@ -91,11 +91,10 @@ namespace Rs.MotionPlat.SysConfig cbox.SelectedItem = SysConfigParam.GetValue(cbox.Name.Replace("cbox", "")); } } - - txtQifuValue.Text = SysConfigParam.GetValue(txtQifuValue.Name.Replace("txt", "")); - PositionHelper.BindPosition(groupBox9,"int"); + PositionHelper.BindPosition(groupBox9, "int"); PositionHelper.BindPosition(groupBox10, "int"); PositionHelper.BindPosition(groupBox8, "int"); + txtQifuValue.Text = SysConfigParam.GetValue(txtQifuValue.Name.Replace("txt", "")); } private void btnSaveSpeedParam_Click(object sender, EventArgs e)