From a83d627b4b37bc667467f76a5c712530e4f8680c Mon Sep 17 00:00:00 2001 From: lhiven <236881222@qq.com> Date: Wed, 20 Dec 2023 14:58:58 +0900 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=B3=BB=E7=BB=9F=E7=81=AF?= =?UTF-8?q?=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rs.SkyLine/Commom/Ops.cs | 9 +++++- .../StockTrayLocationRecipe.Designer.cs | 30 +++++++++++-------- Rs.SkyLine/Recipe/StockTrayLocationRecipe.cs | 10 ++++--- Rs.SkyLine/Recipe/TurnoverLocationRecipe.cs | 11 +++---- 4 files changed, 38 insertions(+), 22 deletions(-) diff --git a/Rs.SkyLine/Commom/Ops.cs b/Rs.SkyLine/Commom/Ops.cs index c00c9e3..396efe8 100644 --- a/Rs.SkyLine/Commom/Ops.cs +++ b/Rs.SkyLine/Commom/Ops.cs @@ -133,6 +133,7 @@ namespace Rs.MotionPlat.Commom DeviceFactory.Init(); QifuManager.Instance.Init(); QifuManager.Instance.Write(SysConfigParam.GetValue("QifuValue")); + LightManger.Instance.SetStatus(ELightStatus.YellowBlink); } @@ -141,6 +142,9 @@ namespace Rs.MotionPlat.Commom Task.Run(() => { if(MachineManage.Instance.MachineStatus== EMachineStatus.Homed || MachineManage.Instance.MachineStatus== EMachineStatus.Stop) { + MachineManage.Instance.SetLocalMachineStatus(EMachineStatus.Working); + On("启动灯"); + Off("停止灯"); WorkEnvironment.Instance.Ready(); WorkEnvironment.Instance.EnvReadyOkEvent.WaitOne(); DischargeFlow.Instance.Start(); @@ -150,7 +154,7 @@ namespace Rs.MotionPlat.Commom { MachineManage.Instance.SetLoadUnloadStatus(ERunState.Waiting); } - MachineManage.Instance.SetLocalMachineStatus(EMachineStatus.Working); + LightManger.Instance.SetStatus(ELightStatus.Green); } }); } @@ -159,6 +163,9 @@ namespace Rs.MotionPlat.Commom { if(MachineManage.Instance.MachineStatus== EMachineStatus.Working) { + LightManger.Instance.SetStatus(ELightStatus.Yellow); + Off("启动灯"); + On("停止灯"); DischargeFlow.Instance.Stop(); TurnoverFlow.Instance.Stop(); MachineManage.Instance.SetCenterMachineStatus(ERunStatus.Stopped); diff --git a/Rs.SkyLine/Recipe/StockTrayLocationRecipe.Designer.cs b/Rs.SkyLine/Recipe/StockTrayLocationRecipe.Designer.cs index 285edb1..ff1cb61 100644 --- a/Rs.SkyLine/Recipe/StockTrayLocationRecipe.Designer.cs +++ b/Rs.SkyLine/Recipe/StockTrayLocationRecipe.Designer.cs @@ -380,7 +380,7 @@ this.btnSaveSlotOffsetDistY.FlatAppearance.BorderColor = System.Drawing.Color.White; this.btnSaveSlotOffsetDistY.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSaveSlotOffsetDistY.ForeColor = System.Drawing.Color.White; - this.btnSaveSlotOffsetDistY.Location = new System.Drawing.Point(684, 111); + this.btnSaveSlotOffsetDistY.Location = new System.Drawing.Point(685, 46); this.btnSaveSlotOffsetDistY.Name = "btnSaveSlotOffsetDistY"; this.btnSaveSlotOffsetDistY.Size = new System.Drawing.Size(79, 25); this.btnSaveSlotOffsetDistY.TabIndex = 51; @@ -396,13 +396,14 @@ this.btnSaveMark2CenterDistY.FlatAppearance.BorderColor = System.Drawing.Color.White; this.btnSaveMark2CenterDistY.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSaveMark2CenterDistY.ForeColor = System.Drawing.Color.White; - this.btnSaveMark2CenterDistY.Location = new System.Drawing.Point(684, 42); + this.btnSaveMark2CenterDistY.Location = new System.Drawing.Point(685, 117); this.btnSaveMark2CenterDistY.Name = "btnSaveMark2CenterDistY"; this.btnSaveMark2CenterDistY.Size = new System.Drawing.Size(79, 25); this.btnSaveMark2CenterDistY.TabIndex = 51; this.btnSaveMark2CenterDistY.Tag = "LoadY"; this.btnSaveMark2CenterDistY.Text = "Save"; this.btnSaveMark2CenterDistY.UseVisualStyleBackColor = false; + this.btnSaveMark2CenterDistY.Visible = false; this.btnSaveMark2CenterDistY.Click += new System.EventHandler(this.btnSavePoint_Click); // // txtTeachMarkY2 @@ -443,7 +444,7 @@ this.btnSaveSlotOffsetDistX.FlatAppearance.BorderColor = System.Drawing.Color.White; this.btnSaveSlotOffsetDistX.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSaveSlotOffsetDistX.ForeColor = System.Drawing.Color.White; - this.btnSaveSlotOffsetDistX.Location = new System.Drawing.Point(684, 80); + this.btnSaveSlotOffsetDistX.Location = new System.Drawing.Point(685, 15); this.btnSaveSlotOffsetDistX.Name = "btnSaveSlotOffsetDistX"; this.btnSaveSlotOffsetDistX.Size = new System.Drawing.Size(79, 25); this.btnSaveSlotOffsetDistX.TabIndex = 52; @@ -459,13 +460,14 @@ this.btnSaveMark2CenterDistX.FlatAppearance.BorderColor = System.Drawing.Color.White; this.btnSaveMark2CenterDistX.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSaveMark2CenterDistX.ForeColor = System.Drawing.Color.White; - this.btnSaveMark2CenterDistX.Location = new System.Drawing.Point(684, 11); + this.btnSaveMark2CenterDistX.Location = new System.Drawing.Point(685, 86); this.btnSaveMark2CenterDistX.Name = "btnSaveMark2CenterDistX"; this.btnSaveMark2CenterDistX.Size = new System.Drawing.Size(79, 25); this.btnSaveMark2CenterDistX.TabIndex = 52; this.btnSaveMark2CenterDistX.Tag = "LoadX"; this.btnSaveMark2CenterDistX.Text = "Save"; this.btnSaveMark2CenterDistX.UseVisualStyleBackColor = false; + this.btnSaveMark2CenterDistX.Visible = false; this.btnSaveMark2CenterDistX.Click += new System.EventHandler(this.btnSavePoint_Click); // // txtTeachMarkX2 @@ -584,7 +586,7 @@ this.txtSlotOffsetDistY.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtSlotOffsetDistY.Font = new System.Drawing.Font("宋体", 9F); this.txtSlotOffsetDistY.ForeColor = System.Drawing.Color.White; - this.txtSlotOffsetDistY.Location = new System.Drawing.Point(575, 115); + this.txtSlotOffsetDistY.Location = new System.Drawing.Point(576, 50); this.txtSlotOffsetDistY.Name = "txtSlotOffsetDistY"; this.txtSlotOffsetDistY.Size = new System.Drawing.Size(85, 21); this.txtSlotOffsetDistY.TabIndex = 53; @@ -599,7 +601,7 @@ this.txtSlotOffsetDistX.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtSlotOffsetDistX.Font = new System.Drawing.Font("宋体", 9F); this.txtSlotOffsetDistX.ForeColor = System.Drawing.Color.White; - this.txtSlotOffsetDistX.Location = new System.Drawing.Point(575, 84); + this.txtSlotOffsetDistX.Location = new System.Drawing.Point(576, 19); this.txtSlotOffsetDistX.Name = "txtSlotOffsetDistX"; this.txtSlotOffsetDistX.Size = new System.Drawing.Size(85, 21); this.txtSlotOffsetDistX.TabIndex = 54; @@ -614,13 +616,14 @@ this.txtMark2CenterDistY.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtMark2CenterDistY.Font = new System.Drawing.Font("宋体", 9F); this.txtMark2CenterDistY.ForeColor = System.Drawing.Color.White; - this.txtMark2CenterDistY.Location = new System.Drawing.Point(575, 46); + this.txtMark2CenterDistY.Location = new System.Drawing.Point(576, 121); this.txtMark2CenterDistY.Name = "txtMark2CenterDistY"; this.txtMark2CenterDistY.Size = new System.Drawing.Size(85, 21); this.txtMark2CenterDistY.TabIndex = 53; this.txtMark2CenterDistY.Tag = "LoadY"; this.txtMark2CenterDistY.Text = "0.01"; this.txtMark2CenterDistY.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.txtMark2CenterDistY.Visible = false; // // txtMark2CenterDistX // @@ -629,19 +632,20 @@ this.txtMark2CenterDistX.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtMark2CenterDistX.Font = new System.Drawing.Font("宋体", 9F); this.txtMark2CenterDistX.ForeColor = System.Drawing.Color.White; - this.txtMark2CenterDistX.Location = new System.Drawing.Point(575, 15); + this.txtMark2CenterDistX.Location = new System.Drawing.Point(576, 90); this.txtMark2CenterDistX.Name = "txtMark2CenterDistX"; this.txtMark2CenterDistX.Size = new System.Drawing.Size(85, 21); this.txtMark2CenterDistX.TabIndex = 54; this.txtMark2CenterDistX.Tag = "LoadX"; this.txtMark2CenterDistX.Text = "0.01"; this.txtMark2CenterDistX.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.txtMark2CenterDistX.Visible = false; // // label4 // this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(487, 119); + this.label4.Location = new System.Drawing.Point(488, 54); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(77, 12); this.label4.TabIndex = 47; @@ -682,11 +686,12 @@ // this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(439, 50); + this.label2.Location = new System.Drawing.Point(440, 125); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(125, 12); this.label2.TabIndex = 47; this.label2.Text = "Mark -> CenterDistY:"; + this.label2.Visible = false; // // txtMarkX2 // @@ -708,7 +713,7 @@ // this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(487, 88); + this.label3.Location = new System.Drawing.Point(488, 23); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(77, 12); this.label3.TabIndex = 48; @@ -743,11 +748,12 @@ // this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(439, 19); + this.label1.Location = new System.Drawing.Point(440, 94); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(125, 12); this.label1.TabIndex = 48; this.label1.Text = "Mark -> CenterDistX:"; + this.label1.Visible = false; // // label7 // diff --git a/Rs.SkyLine/Recipe/StockTrayLocationRecipe.cs b/Rs.SkyLine/Recipe/StockTrayLocationRecipe.cs index 656cb8c..8f1aa8d 100644 --- a/Rs.SkyLine/Recipe/StockTrayLocationRecipe.cs +++ b/Rs.SkyLine/Recipe/StockTrayLocationRecipe.cs @@ -99,10 +99,12 @@ namespace Rs.MotionPlat.Recipe //int tempIndex = ((i+1) * 20) - (colNum - 1) - index; //int tempIndex = index + colNum - 1;// (i + 1) * 10 - index + 1; - double xBase = double.Parse(dt.Rows[0]["MarkX1"].ToString()) + double.Parse(dt.Rows[0]["Mark2CenterDistX"].ToString()) + (j * double.Parse(dt.Rows[0]["SlotOffsetDistX"].ToString())); - double yBase = double.Parse(dt.Rows[0]["MarkY1"].ToString()) + double.Parse(dt.Rows[0]["Mark2CenterDistY"].ToString()) + (i * double.Parse(dt.Rows[0]["SlotOffsetDistY"].ToString())); - double xRun = double.Parse(dt.Rows[0]["MarkX1"].ToString()) + double.Parse(dt.Rows[0]["Mark2CenterDistX"].ToString()) + (j * double.Parse(dt.Rows[0]["SlotOffsetDistX"].ToString())); - double yRun = double.Parse(dt.Rows[0]["MarkY1"].ToString()) + double.Parse(dt.Rows[0]["Mark2CenterDistY"].ToString()) + (i * double.Parse(dt.Rows[0]["SlotOffsetDistY"].ToString())); + //double xBase = double.Parse(dt.Rows[0]["MarkX1"].ToString()) + double.Parse(dt.Rows[0]["Mark2CenterDistX"].ToString()) + (j * double.Parse(dt.Rows[0]["SlotOffsetDistX"].ToString())); + //double yBase = double.Parse(dt.Rows[0]["MarkY1"].ToString()) + double.Parse(dt.Rows[0]["Mark2CenterDistY"].ToString()) + (i * double.Parse(dt.Rows[0]["SlotOffsetDistY"].ToString())); + //double xRun = double.Parse(dt.Rows[0]["MarkX1"].ToString()) + double.Parse(dt.Rows[0]["Mark2CenterDistX"].ToString()) + (j * double.Parse(dt.Rows[0]["SlotOffsetDistX"].ToString())); + //double yRun = double.Parse(dt.Rows[0]["MarkY1"].ToString()) + double.Parse(dt.Rows[0]["Mark2CenterDistY"].ToString()) + (i * double.Parse(dt.Rows[0]["SlotOffsetDistY"].ToString())); + double xRun = double.Parse(dt.Rows[0]["MarkX1"].ToString()) + (j * double.Parse(dt.Rows[0]["SlotOffsetDistX"].ToString())); + double yRun = double.Parse(dt.Rows[0]["MarkY1"].ToString()) + (i * double.Parse(dt.Rows[0]["SlotOffsetDistY"].ToString())); string insertRunSql = $"insert into TrayPoints(trayid,recipename,trayname,slotindex,x,y) values('{dt.Rows[0]["id"]}','{dt.Rows[0]["recipename"]}','{dt.Rows[0]["TrayName"]}',{tempIndex},{xRun},{yRun})"; db.ExecuteNonQuery(insertRunSql); index++; diff --git a/Rs.SkyLine/Recipe/TurnoverLocationRecipe.cs b/Rs.SkyLine/Recipe/TurnoverLocationRecipe.cs index d5834d3..036450d 100644 --- a/Rs.SkyLine/Recipe/TurnoverLocationRecipe.cs +++ b/Rs.SkyLine/Recipe/TurnoverLocationRecipe.cs @@ -127,11 +127,12 @@ namespace Rs.MotionPlat.Recipe { for (int j = 0; j < colNum; j++) { - double xBase = double.Parse(dt.Rows[0]["MarkX1"].ToString()) + (j * double.Parse(dt.Rows[0]["SlotOffsetDistX"].ToString())); - double yBase = double.Parse(dt.Rows[0]["MarkY1"].ToString()) + (i * double.Parse(dt.Rows[0]["SlotOffsetDistY"].ToString())); - - double xRun = double.Parse(dt.Rows[0]["MarkX1"].ToString()) + double.Parse(dt.Rows[0]["Mark2CenterDistX"].ToString()) + (j * double.Parse(dt.Rows[0]["SlotOffsetDistX"].ToString())); - double yRun = double.Parse(dt.Rows[0]["MarkY1"].ToString()) + double.Parse(dt.Rows[0]["Mark2CenterDistY"].ToString()) + (i * double.Parse(dt.Rows[0]["SlotOffsetDistY"].ToString())); + //double xBase = double.Parse(dt.Rows[0]["MarkX1"].ToString()) + (j * double.Parse(dt.Rows[0]["SlotOffsetDistX"].ToString())); + //double yBase = double.Parse(dt.Rows[0]["MarkY1"].ToString()) + (i * double.Parse(dt.Rows[0]["SlotOffsetDistY"].ToString())); + //double xRun = double.Parse(dt.Rows[0]["MarkX1"].ToString()) + double.Parse(dt.Rows[0]["Mark2CenterDistX"].ToString()) + (j * double.Parse(dt.Rows[0]["SlotOffsetDistX"].ToString())); + //double yRun = double.Parse(dt.Rows[0]["MarkY1"].ToString()) + double.Parse(dt.Rows[0]["Mark2CenterDistY"].ToString()) + (i * double.Parse(dt.Rows[0]["SlotOffsetDistY"].ToString())); + double xRun = double.Parse(dt.Rows[0]["MarkX1"].ToString()) + (j * double.Parse(dt.Rows[0]["SlotOffsetDistX"].ToString())); + double yRun = double.Parse(dt.Rows[0]["MarkY1"].ToString()) + (i * double.Parse(dt.Rows[0]["SlotOffsetDistY"].ToString())); string insertRunSql = $"insert into TrayPoints(trayid,recipename,trayname,slotindex,x,y) values({dt.Rows[0]["id"]},'{GlobalVar.CurRecipe}', '{dt.Rows[0]["TrayName"]}',{index},{xRun},{yRun})"; db.ExecuteNonQuery(insertRunSql); index++;