优化P2程序

Rs.SkyLine/FormMain.cs

@@ -196,14 +196,14 @@ namespace Rs.MotionPlat
                     trayInput.RowNum = int.Parse(dr["RowNum"].ToString());
                 }
 
-                dr = dt.AsEnumerable().Where(r => r.Field<string>("TrayName") == "OK").First();
+                dr = dt.AsEnumerable().Where(r => r.Field<string>("TrayName") == "Ok").First();
                 if (dr != null)
                 {
                     trayOk.ColumnNum = int.Parse(dr["ColumnNum"].ToString());
                     trayOk.RowNum = int.Parse(dr["RowNum"].ToString());
                 }
 
-                dr = dt.AsEnumerable().Where(r => r.Field<string>("TrayName") == "NG").First();
+                dr = dt.AsEnumerable().Where(r => r.Field<string>("TrayName") == "Ng").First();
                 if (dr != null)
                 {
                     trayNg.ColumnNum = int.Parse(dr["ColumnNum"].ToString());

Rs.SkyLine/SysConfig/ClampConfig.Designer.cs

@@ -117,6 +117,7 @@
             this.button20.Tag = "TurnoverY";
             this.button20.Text = "自动放料盘";
             this.button20.UseVisualStyleBackColor = false;
+            this.button20.Visible = false;
             // 
             // button21
             // 
@@ -131,6 +132,7 @@
             this.button21.Tag = "TurnoverY";
             this.button21.Text = "自动取料盘";
             this.button21.UseVisualStyleBackColor = false;
+            this.button21.Visible = false;
             // 
             // button22
             // 
@@ -174,6 +176,7 @@
             this.button17.Tag = "TurnoverY";
             this.button17.Text = "自动放料盘";
             this.button17.UseVisualStyleBackColor = false;
+            this.button17.Visible = false;
             // 
             // button18
             // 
@@ -188,6 +191,7 @@
             this.button18.Tag = "TurnoverY";
             this.button18.Text = "自动取料盘";
             this.button18.UseVisualStyleBackColor = false;
+            this.button18.Visible = false;
             // 
             // button19
             // 
@@ -231,6 +235,7 @@
             this.button14.Tag = "TurnoverY";
             this.button14.Text = "自动放料盘";
             this.button14.UseVisualStyleBackColor = false;
+            this.button14.Visible = false;
             // 
             // button15
             // 
@@ -245,6 +250,7 @@
             this.button15.Tag = "TurnoverY";
             this.button15.Text = "自动取料盘";
             this.button15.UseVisualStyleBackColor = false;
+            this.button15.Visible = false;
             // 
             // button16
             // 
@@ -288,6 +294,7 @@
             this.button11.Tag = "TurnoverY";
             this.button11.Text = "自动放料盘";
             this.button11.UseVisualStyleBackColor = false;
+            this.button11.Visible = false;
             // 
             // button12
             // 
@@ -302,6 +309,7 @@
             this.button12.Tag = "TurnoverY";
             this.button12.Text = "自动取料盘";
             this.button12.UseVisualStyleBackColor = false;
+            this.button12.Visible = false;
             // 
             // button13
             // 
@@ -345,6 +353,7 @@
             this.button4.Tag = "TurnoverY";
             this.button4.Text = "自动放料盘";
             this.button4.UseVisualStyleBackColor = false;
+            this.button4.Visible = false;
             // 
             // button5
             // 
@@ -359,6 +368,7 @@
             this.button5.Tag = "TurnoverY";
             this.button5.Text = "自动取料盘";
             this.button5.UseVisualStyleBackColor = false;
+            this.button5.Visible = false;
             // 
             // button6
             // 
@@ -402,6 +412,7 @@
             this.button3.Tag = "TurnoverY";
             this.button3.Text = "自动放料盘";
             this.button3.UseVisualStyleBackColor = false;
+            this.button3.Visible = false;
             // 
             // button2
             // 
@@ -416,6 +427,7 @@
             this.button2.Tag = "TurnoverY";
             this.button2.Text = "自动取料盘";
             this.button2.UseVisualStyleBackColor = false;
+            this.button2.Visible = false;
             // 
             // btnMoveTakePos
             // 

Rs.SkyLine/SysConfig/LightConfig.Designer.cs

@@ -73,7 +73,6 @@
             this.panelEx1 = new Rs.Controls.PanelEx();
             this.groupBox4 = new System.Windows.Forms.GroupBox();
             this.txtRunResult = new System.Windows.Forms.RichTextBox();
-            this.button1 = new System.Windows.Forms.Button();
             this.groupBox1.SuspendLayout();
             this.groupBox3.SuspendLayout();
             this.groupBox2.SuspendLayout();
@@ -582,22 +581,11 @@
             this.txtRunResult.TabIndex = 2;
             this.txtRunResult.Text = "";
             // 
-            // button1
-            // 
-            this.button1.Location = new System.Drawing.Point(720, 334);
-            this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(75, 23);
-            this.button1.TabIndex = 2;
-            this.button1.Text = "button1";
-            this.button1.UseVisualStyleBackColor = true;
-            this.button1.Click += new System.EventHandler(this.button1_Click);
-            // 
             // LightConfig
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1102, 744);
-            this.Controls.Add(this.button1);
             this.Controls.Add(this.panelEx1);
             this.Name = "LightConfig";
             this.Text = "LightConfig";
@@ -661,6 +649,5 @@
         private System.Windows.Forms.Button btnOpen;
         private System.Windows.Forms.GroupBox groupBox4;
         private System.Windows.Forms.RichTextBox txtRunResult;
-        private System.Windows.Forms.Button button1;
     }
 }

Rs.SkyLine/SysConfig/LightConfig.cs

@@ -278,15 +278,6 @@ namespace Rs.MotionPlat.SysConfig
             });
         }
 
-        private void button1_Click(object sender, EventArgs e)
-        {
-            SlotPoint sp = TrayPointManager.GetSlotPoint(ETrayType.Input, 1);
-            SlotPoint dist = TrayPointManager.GetDistToNozzle1(2);
-            sp.X += dist.X;
-            sp.Y += dist.Y;
-            AxisControl.LoadX.MovePos(sp.X, 4);
-            AxisControl.LoadY.MovePos(sp.Y, 4);
-        }
 
         private void btnClose_Click(object sender, EventArgs e)
         {

Rs.SkyLine/SysConfig/PressConfig.Designer.cs

@@ -38,13 +38,7 @@
             this.txtPressOpenVacSuctionDelaytime = new System.Windows.Forms.TextBox();
             this.label6 = new System.Windows.Forms.Label();
             this.label20 = new System.Windows.Forms.Label();
-            this.label5 = new System.Windows.Forms.Label();
             this.label21 = new System.Windows.Forms.Label();
-            this.label23 = new System.Windows.Forms.Label();
-            this.button2 = new System.Windows.Forms.Button();
-            this.button8 = new System.Windows.Forms.Button();
-            this.button1 = new System.Windows.Forms.Button();
-            this.button7 = new System.Windows.Forms.Button();
             this.groupBox1 = new System.Windows.Forms.GroupBox();
             this.txtPressLowSpeedOffset = new System.Windows.Forms.TextBox();
             this.txtPressSafeZ = new System.Windows.Forms.TextBox();
@@ -60,6 +54,10 @@
             this.btnTeachPressZ = new System.Windows.Forms.Button();
             this.btnMovePressY = new System.Windows.Forms.Button();
             this.btnTeachPressY = new System.Windows.Forms.Button();
+            this.label8 = new System.Windows.Forms.Label();
+            this.label5 = new System.Windows.Forms.Label();
+            this.label9 = new System.Windows.Forms.Label();
+            this.label10 = new System.Windows.Forms.Label();
             this.panelEx1.SuspendLayout();
             this.groupBox3.SuspendLayout();
             this.groupBox1.SuspendLayout();
@@ -87,23 +85,21 @@
             // 
             this.groupBox3.Controls.Add(this.txtPressCloseVacBreakDelaytime);
             this.groupBox3.Controls.Add(this.txtPresseOpenVacBreakDelaytime);
+            this.groupBox3.Controls.Add(this.label10);
+            this.groupBox3.Controls.Add(this.label9);
+            this.groupBox3.Controls.Add(this.label5);
+            this.groupBox3.Controls.Add(this.label8);
             this.groupBox3.Controls.Add(this.txtPresseCloseVacSuctionDelaytime);
             this.groupBox3.Controls.Add(this.label7);
             this.groupBox3.Controls.Add(this.txtPressOpenVacSuctionDelaytime);
             this.groupBox3.Controls.Add(this.label6);
             this.groupBox3.Controls.Add(this.label20);
-            this.groupBox3.Controls.Add(this.label5);
             this.groupBox3.Controls.Add(this.label21);
-            this.groupBox3.Controls.Add(this.label23);
-            this.groupBox3.Controls.Add(this.button2);
-            this.groupBox3.Controls.Add(this.button8);
-            this.groupBox3.Controls.Add(this.button1);
-            this.groupBox3.Controls.Add(this.button7);
             this.groupBox3.Dock = System.Windows.Forms.DockStyle.Top;
             this.groupBox3.ForeColor = System.Drawing.Color.White;
             this.groupBox3.Location = new System.Drawing.Point(0, 172);
             this.groupBox3.Name = "groupBox3";
-            this.groupBox3.Size = new System.Drawing.Size(401, 222);
+            this.groupBox3.Size = new System.Drawing.Size(401, 112);
             this.groupBox3.TabIndex = 2;
             this.groupBox3.TabStop = false;
             this.groupBox3.Text = "真空吸";
@@ -114,7 +110,7 @@
             this.txtPressCloseVacBreakDelaytime.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.txtPressCloseVacBreakDelaytime.Font = new System.Drawing.Font("宋体", 9F);
             this.txtPressCloseVacBreakDelaytime.ForeColor = System.Drawing.Color.White;
-            this.txtPressCloseVacBreakDelaytime.Location = new System.Drawing.Point(319, 129);
+            this.txtPressCloseVacBreakDelaytime.Location = new System.Drawing.Point(310, 61);
             this.txtPressCloseVacBreakDelaytime.Name = "txtPressCloseVacBreakDelaytime";
             this.txtPressCloseVacBreakDelaytime.Size = new System.Drawing.Size(50, 21);
             this.txtPressCloseVacBreakDelaytime.TabIndex = 50;
@@ -129,7 +125,7 @@
             this.txtPresseOpenVacBreakDelaytime.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.txtPresseOpenVacBreakDelaytime.Font = new System.Drawing.Font("宋体", 9F);
             this.txtPresseOpenVacBreakDelaytime.ForeColor = System.Drawing.Color.White;
-            this.txtPresseOpenVacBreakDelaytime.Location = new System.Drawing.Point(117, 129);
+            this.txtPresseOpenVacBreakDelaytime.Location = new System.Drawing.Point(108, 61);
             this.txtPresseOpenVacBreakDelaytime.Name = "txtPresseOpenVacBreakDelaytime";
             this.txtPresseOpenVacBreakDelaytime.Size = new System.Drawing.Size(50, 21);
             this.txtPresseOpenVacBreakDelaytime.TabIndex = 50;
@@ -144,7 +140,7 @@
             this.txtPresseCloseVacSuctionDelaytime.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.txtPresseCloseVacSuctionDelaytime.Font = new System.Drawing.Font("宋体", 9F);
             this.txtPresseCloseVacSuctionDelaytime.ForeColor = System.Drawing.Color.White;
-            this.txtPresseCloseVacSuctionDelaytime.Location = new System.Drawing.Point(319, 53);
+            this.txtPresseCloseVacSuctionDelaytime.Location = new System.Drawing.Point(310, 20);
             this.txtPresseCloseVacSuctionDelaytime.Name = "txtPresseCloseVacSuctionDelaytime";
             this.txtPresseCloseVacSuctionDelaytime.Size = new System.Drawing.Size(50, 21);
             this.txtPresseCloseVacSuctionDelaytime.TabIndex = 51;
@@ -156,7 +152,7 @@
             // label7
             // 
             this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(375, 134);
+            this.label7.Location = new System.Drawing.Point(366, 66);
             this.label7.Name = "label7";
             this.label7.Size = new System.Drawing.Size(17, 12);
             this.label7.TabIndex = 47;
@@ -168,7 +164,7 @@
             this.txtPressOpenVacSuctionDelaytime.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.txtPressOpenVacSuctionDelaytime.Font = new System.Drawing.Font("宋体", 9F);
             this.txtPressOpenVacSuctionDelaytime.ForeColor = System.Drawing.Color.White;
-            this.txtPressOpenVacSuctionDelaytime.Location = new System.Drawing.Point(117, 53);
+            this.txtPressOpenVacSuctionDelaytime.Location = new System.Drawing.Point(108, 20);
             this.txtPressOpenVacSuctionDelaytime.Name = "txtPressOpenVacSuctionDelaytime";
             this.txtPressOpenVacSuctionDelaytime.Size = new System.Drawing.Size(50, 21);
             this.txtPressOpenVacSuctionDelaytime.TabIndex = 51;
@@ -180,7 +176,7 @@
             // label6
             // 
             this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(375, 57);
+            this.label6.Location = new System.Drawing.Point(366, 24);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(17, 12);
             this.label6.TabIndex = 48;
@@ -189,99 +185,21 @@
             // label20
             // 
             this.label20.AutoSize = true;
-            this.label20.Location = new System.Drawing.Point(173, 134);
+            this.label20.Location = new System.Drawing.Point(164, 66);
             this.label20.Name = "label20";
             this.label20.Size = new System.Drawing.Size(17, 12);
             this.label20.TabIndex = 47;
             this.label20.Text = "ms";
             // 
-            // label5
-            // 
-            this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(329, 30);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(29, 12);
-            this.label5.TabIndex = 49;
-            this.label5.Text = "延时";
-            // 
             // label21
             // 
             this.label21.AutoSize = true;
-            this.label21.Location = new System.Drawing.Point(173, 57);
+            this.label21.Location = new System.Drawing.Point(164, 24);
             this.label21.Name = "label21";
             this.label21.Size = new System.Drawing.Size(17, 12);
             this.label21.TabIndex = 48;
             this.label21.Text = "ms";
             // 
-            // label23
-            // 
-            this.label23.AutoSize = true;
-            this.label23.Location = new System.Drawing.Point(127, 30);
-            this.label23.Name = "label23";
-            this.label23.Size = new System.Drawing.Size(29, 12);
-            this.label23.TabIndex = 49;
-            this.label23.Text = "延时";
-            // 
-            // button2
-            // 
-            this.button2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56)))));
-            this.button2.FlatAppearance.BorderColor = System.Drawing.Color.White;
-            this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.button2.Font = new System.Drawing.Font("宋体", 12F);
-            this.button2.ForeColor = System.Drawing.Color.White;
-            this.button2.Location = new System.Drawing.Point(204, 115);
-            this.button2.Name = "button2";
-            this.button2.Size = new System.Drawing.Size(100, 40);
-            this.button2.TabIndex = 45;
-            this.button2.Text = "真空破关";
-            this.button2.UseVisualStyleBackColor = false;
-            this.button2.Click += new System.EventHandler(this.button2_Click);
-            // 
-            // button8
-            // 
-            this.button8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
-            this.button8.FlatAppearance.BorderColor = System.Drawing.Color.White;
-            this.button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.button8.Font = new System.Drawing.Font("宋体", 12F);
-            this.button8.ForeColor = System.Drawing.Color.White;
-            this.button8.Location = new System.Drawing.Point(204, 39);
-            this.button8.Name = "button8";
-            this.button8.Size = new System.Drawing.Size(100, 40);
-            this.button8.TabIndex = 45;
-            this.button8.Text = "真空吸关";
-            this.button8.UseVisualStyleBackColor = false;
-            this.button8.Click += new System.EventHandler(this.button8_Click);
-            // 
-            // button1
-            // 
-            this.button1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56)))));
-            this.button1.FlatAppearance.BorderColor = System.Drawing.Color.White;
-            this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.button1.Font = new System.Drawing.Font("宋体", 12F);
-            this.button1.ForeColor = System.Drawing.Color.White;
-            this.button1.Location = new System.Drawing.Point(11, 115);
-            this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(100, 40);
-            this.button1.TabIndex = 45;
-            this.button1.Text = "真空破开";
-            this.button1.UseVisualStyleBackColor = false;
-            this.button1.Click += new System.EventHandler(this.button1_Click);
-            // 
-            // button7
-            // 
-            this.button7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
-            this.button7.FlatAppearance.BorderColor = System.Drawing.Color.White;
-            this.button7.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.button7.Font = new System.Drawing.Font("宋体", 12F);
-            this.button7.ForeColor = System.Drawing.Color.White;
-            this.button7.Location = new System.Drawing.Point(11, 39);
-            this.button7.Name = "button7";
-            this.button7.Size = new System.Drawing.Size(100, 40);
-            this.button7.TabIndex = 45;
-            this.button7.Text = "真空吸开";
-            this.button7.UseVisualStyleBackColor = false;
-            this.button7.Click += new System.EventHandler(this.button7_Click);
-            // 
             // groupBox1
             // 
             this.groupBox1.Controls.Add(this.txtPressLowSpeedOffset);
@@ -497,6 +415,42 @@
             this.btnTeachPressY.UseVisualStyleBackColor = false;
             this.btnTeachPressY.Click += new System.EventHandler(this.Teach_Click);
             // 
+            // label8
+            // 
+            this.label8.AutoSize = true;
+            this.label8.Location = new System.Drawing.Point(16, 24);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(83, 12);
+            this.label8.TabIndex = 43;
+            this.label8.Text = "真空吸开延时:";
+            // 
+            // label5
+            // 
+            this.label5.AutoSize = true;
+            this.label5.Location = new System.Drawing.Point(221, 24);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(83, 12);
+            this.label5.TabIndex = 43;
+            this.label5.Text = "真空吸关延时:";
+            // 
+            // label9
+            // 
+            this.label9.AutoSize = true;
+            this.label9.Location = new System.Drawing.Point(16, 66);
+            this.label9.Name = "label9";
+            this.label9.Size = new System.Drawing.Size(83, 12);
+            this.label9.TabIndex = 43;
+            this.label9.Text = "真空破开延时:";
+            // 
+            // label10
+            // 
+            this.label10.AutoSize = true;
+            this.label10.Location = new System.Drawing.Point(221, 66);
+            this.label10.Name = "label10";
+            this.label10.Size = new System.Drawing.Size(83, 12);
+            this.label10.TabIndex = 43;
+            this.label10.Text = "真空破关延时:";
+            // 
             // PressConfig
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -526,8 +480,6 @@
         private System.Windows.Forms.Button btnTeachPressY;
         private Controls.PanelEx panelEx2;
         private System.Windows.Forms.GroupBox groupBox3;
-        private System.Windows.Forms.Button button8;
-        private System.Windows.Forms.Button button7;
         private System.Windows.Forms.TextBox txtPressSafeZ;
         private System.Windows.Forms.Label label4;
         private System.Windows.Forms.TextBox txtPressZ;
@@ -536,8 +488,6 @@
         private System.Windows.Forms.Button btnTeachPressSafeZ;
         private System.Windows.Forms.Button btnMovePressZ;
         private System.Windows.Forms.Button btnTeachPressZ;
-        private System.Windows.Forms.Button button2;
-        private System.Windows.Forms.Button button1;
         private System.Windows.Forms.TextBox txtPressLowSpeedOffset;
         private System.Windows.Forms.Label label1;
         private System.Windows.Forms.TextBox txtPressCloseVacBreakDelaytime;
@@ -547,8 +497,10 @@
         private System.Windows.Forms.TextBox txtPressOpenVacSuctionDelaytime;
         private System.Windows.Forms.Label label6;
         private System.Windows.Forms.Label label20;
-        private System.Windows.Forms.Label label5;
         private System.Windows.Forms.Label label21;
-        private System.Windows.Forms.Label label23;
+        private System.Windows.Forms.Label label10;
+        private System.Windows.Forms.Label label9;
+        private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.Label label8;
     }
 }

Rs.SkyLine/SysConfig/StockControl.cs

@@ -33,7 +33,7 @@ namespace Rs.MotionPlat.SysConfig
                 Task.Run(() => {
                     if (MachineManage.Instance.MachineStatus == EMachineStatus.Homed || MachineManage.Instance.MachineStatus == EMachineStatus.Stop)
                     {
-                        if (StockManager.Instance.GetStock(result).IsRunning())
+                        if (!StockManager.Instance.GetStock(result).IsRunning())
                         {
                             if (IsBack(trayName))
                             {
@@ -80,7 +80,7 @@ namespace Rs.MotionPlat.SysConfig
                 Task.Run(() => {
                     if(MachineManage.Instance.MachineStatus== EMachineStatus.Homed || MachineManage.Instance.MachineStatus== EMachineStatus.Stop)
                     {
-                        if (StockManager.Instance.GetStock(result).IsRunning())
+                        if (!StockManager.Instance.GetStock(result).IsRunning())
                         {
                             if (IsBack(trayName))
                             {

Rs.SkyLine/SysConfig/TrayLocationRecipe.Designer.cs

@@ -115,6 +115,7 @@
             this.cameraTemplate1.Name = "cameraTemplate1";
             this.cameraTemplate1.Size = new System.Drawing.Size(1030, 845);
             this.cameraTemplate1.TabIndex = 2;
+            this.cameraTemplate1.Visible = false;
             // 
             // panelEx2
             //