修改真空吸破延时名称

Rs.SkyLine/Commom/Scheduling.cs

@@ -1135,7 +1135,11 @@ namespace Rs.MotionPlat.Commom
         /// <summary>
         /// 测试完成, 发送: <see cref="Scheduling"/>
         /// </summary>
-        TestFinished
+        TestFinished,
+        /// <summary>
+        /// 清空设备上的所有物料到料仓,发送<see cref="Scheduling"/>, 收到后原路返回
+        /// </summary>
+        Cleanout
     }
 
     /// <summary>

Rs.SkyLine/Flow/TestCenter.cs

@@ -41,6 +41,9 @@ namespace Rs.MotionPlat.Flow
         {
             switch (ssi.Type)
             {
+                case SchedulingStatusInfo.InfoType.OneCycle:
+
+                    break;
                 case SchedulingStatusInfo.InfoType.DisableFixtureVacuumCheck:
                     GlobalVar.DisableFixtureVacuumCheck = bool.Parse(ssi.Info);
                     break;
@@ -131,6 +134,9 @@ namespace Rs.MotionPlat.Flow
                     }
                     switch (eInstructioneInstruction)
                     {
+                        case EInstruction.Cleanout:
+                            ReportToTestCenter(schedule);
+                            break;
                         case EInstruction.TransferSiloTray:
                             ReportToTestCenter(schedule);
                             MachineManage.Instance.SetLoadUnloadStatus(ERunState.Busying);

Rs.SkyLine/Properties/AssemblyInfo.cs

@@ -31,6 +31,6 @@ using System.Runtime.InteropServices;
 //
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
- [assembly: AssemblyVersion("2.20.24.10")]
+ [assembly: AssemblyVersion("2.20.24.11")]
 //[assembly: AssemblyVersion("1.0.0.0")]
 //[assembly: AssemblyFileVersion("1.0.0.0")]

Rs.SkyLine/SysConfig/NozzleConfig.Designer.cs

@@ -361,38 +361,38 @@
             // label23
             // 
             this.label23.AutoSize = true;
-            this.label23.Location = new System.Drawing.Point(230, 47);
+            this.label23.Location = new System.Drawing.Point(225, 47);
             this.label23.Name = "label23";
-            this.label23.Size = new System.Drawing.Size(83, 12);
+            this.label23.Size = new System.Drawing.Size(95, 12);
             this.label23.TabIndex = 43;
-            this.label23.Text = "真空破关延时:";
+            this.label23.Text = "关真空破后延时:";
             // 
             // label26
             // 
             this.label26.AutoSize = true;
-            this.label26.Location = new System.Drawing.Point(230, 19);
+            this.label26.Location = new System.Drawing.Point(225, 19);
             this.label26.Name = "label26";
-            this.label26.Size = new System.Drawing.Size(83, 12);
+            this.label26.Size = new System.Drawing.Size(95, 12);
             this.label26.TabIndex = 43;
-            this.label26.Text = "真空吸关延时:";
+            this.label26.Text = "关真空吸后延时:";
             // 
             // label19
             // 
             this.label19.AutoSize = true;
             this.label19.Location = new System.Drawing.Point(28, 47);
             this.label19.Name = "label19";
-            this.label19.Size = new System.Drawing.Size(83, 12);
+            this.label19.Size = new System.Drawing.Size(71, 12);
             this.label19.TabIndex = 43;
-            this.label19.Text = "真空破开延时:";
+            this.label19.Text = "真空破时间:";
             // 
             // label25
             // 
             this.label25.AutoSize = true;
             this.label25.Location = new System.Drawing.Point(28, 19);
             this.label25.Name = "label25";
-            this.label25.Size = new System.Drawing.Size(83, 12);
+            this.label25.Size = new System.Drawing.Size(71, 12);
             this.label25.TabIndex = 43;
-            this.label25.Text = "真空吸开延时:";
+            this.label25.Text = "真空吸时间:";
             // 
             // txtLoadNozzleCloseVacBreakDelaytime
             // 

Rs.SkyLine/SysConfig/PressConfig.Designer.cs

@@ -33,6 +33,10 @@
             this.groupBox3 = new System.Windows.Forms.GroupBox();
             this.txtPressCloseVacBreakDelaytime = new System.Windows.Forms.TextBox();
             this.txtPresseOpenVacBreakDelaytime = new System.Windows.Forms.TextBox();
+            this.label10 = new System.Windows.Forms.Label();
+            this.label9 = new System.Windows.Forms.Label();
+            this.label5 = new System.Windows.Forms.Label();
+            this.label8 = new System.Windows.Forms.Label();
             this.txtPresseCloseVacSuctionDelaytime = new System.Windows.Forms.TextBox();
             this.label7 = new System.Windows.Forms.Label();
             this.txtPressOpenVacSuctionDelaytime = new System.Windows.Forms.TextBox();
@@ -54,10 +58,6 @@
             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();
@@ -134,6 +134,42 @@
             this.txtPresseOpenVacBreakDelaytime.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             this.txtPresseOpenVacBreakDelaytime.KeyUp += new System.Windows.Forms.KeyEventHandler(this.txtSysParam_KeyUp);
             // 
+            // label10
+            // 
+            this.label10.AutoSize = true;
+            this.label10.Location = new System.Drawing.Point(212, 66);
+            this.label10.Name = "label10";
+            this.label10.Size = new System.Drawing.Size(95, 12);
+            this.label10.TabIndex = 43;
+            this.label10.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(71, 12);
+            this.label9.TabIndex = 43;
+            this.label9.Text = "真空破时间:";
+            // 
+            // label5
+            // 
+            this.label5.AutoSize = true;
+            this.label5.Location = new System.Drawing.Point(212, 24);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(95, 12);
+            this.label5.TabIndex = 43;
+            this.label5.Text = "关真空吸后延时:";
+            // 
+            // 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(71, 12);
+            this.label8.TabIndex = 43;
+            this.label8.Text = "真空吸时间:";
+            // 
             // txtPresseCloseVacSuctionDelaytime
             // 
             this.txtPresseCloseVacSuctionDelaytime.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(16)))), ((int)(((byte)(16)))), ((int)(((byte)(16)))));
@@ -415,42 +451,6 @@
             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);

Rs.SkyLine/SysConfig/TurnoverConfig.Designer.cs

@@ -1306,9 +1306,9 @@
             this.label25.AutoSize = true;
             this.label25.Location = new System.Drawing.Point(206, 69);
             this.label25.Name = "label25";
-            this.label25.Size = new System.Drawing.Size(107, 12);
+            this.label25.Size = new System.Drawing.Size(119, 12);
             this.label25.TabIndex = 48;
-            this.label25.Text = "吸头真空破关延时:";
+            this.label25.Text = "吸头关真空破后延时:";
             // 
             // label29
             // 
@@ -1317,7 +1317,7 @@
             this.label29.Name = "label29";
             this.label29.Size = new System.Drawing.Size(119, 12);
             this.label29.TabIndex = 48;
-            this.label29.Text = "周转盘真空破关延时:";
+            this.label29.Text = "周转盘关真空破延时:";
             // 
             // label27
             // 
@@ -1326,52 +1326,52 @@
             this.label27.Name = "label27";
             this.label27.Size = new System.Drawing.Size(119, 12);
             this.label27.TabIndex = 48;
-            this.label27.Text = "周转盘真空吸关延时:";
+            this.label27.Text = "周转盘关真空吸延时:";
             // 
             // label28
             // 
             this.label28.AutoSize = true;
             this.label28.Location = new System.Drawing.Point(12, 157);
             this.label28.Name = "label28";
-            this.label28.Size = new System.Drawing.Size(119, 12);
+            this.label28.Size = new System.Drawing.Size(107, 12);
             this.label28.TabIndex = 48;
-            this.label28.Text = "周转盘真空破开延时:";
+            this.label28.Text = "周转盘破真空时间:";
             // 
             // label17
             // 
             this.label17.AutoSize = true;
             this.label17.Location = new System.Drawing.Point(206, 25);
             this.label17.Name = "label17";
-            this.label17.Size = new System.Drawing.Size(107, 12);
+            this.label17.Size = new System.Drawing.Size(119, 12);
             this.label17.TabIndex = 48;
-            this.label17.Text = "吸头真空吸关延时:";
+            this.label17.Text = "吸头关真空吸后延时:";
             // 
             // label26
             // 
             this.label26.AutoSize = true;
             this.label26.Location = new System.Drawing.Point(12, 126);
             this.label26.Name = "label26";
-            this.label26.Size = new System.Drawing.Size(119, 12);
+            this.label26.Size = new System.Drawing.Size(107, 12);
             this.label26.TabIndex = 48;
-            this.label26.Text = "周转盘真空吸开延时:";
+            this.label26.Text = "周转盘真空吸时间:";
             // 
             // label23
             // 
             this.label23.AutoSize = true;
             this.label23.Location = new System.Drawing.Point(15, 66);
             this.label23.Name = "label23";
-            this.label23.Size = new System.Drawing.Size(107, 12);
+            this.label23.Size = new System.Drawing.Size(95, 12);
             this.label23.TabIndex = 48;
-            this.label23.Text = "吸头真空破开延时:";
+            this.label23.Text = "吸头破真空时间:";
             // 
             // label24
             // 
             this.label24.AutoSize = true;
             this.label24.Location = new System.Drawing.Point(15, 27);
             this.label24.Name = "label24";
-            this.label24.Size = new System.Drawing.Size(107, 12);
+            this.label24.Size = new System.Drawing.Size(95, 12);
             this.label24.TabIndex = 48;
-            this.label24.Text = "吸头真空吸开延时:";
+            this.label24.Text = "吸头真空吸时间:";
             // 
             // TurnoverConfig
             //