增加料盘运动可以运动到三点定位的点位

Rs.DeweyTester/Recipe/StockTrayLocationRecipe.Designer.cs

@@ -101,6 +101,7 @@
             this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewLinkColumn2 = new System.Windows.Forms.DataGridViewLinkColumn();
+            this.cboxThreePointLocation = new System.Windows.Forms.CheckBox();
             this.contextMenuStrip1.SuspendLayout();
             this.panelEx2.SuspendLayout();
             this.panelEx5.SuspendLayout();
@@ -311,6 +312,7 @@
             // 
             // groupBox1
             // 
+            this.groupBox1.Controls.Add(this.cboxThreePointLocation);
             this.groupBox1.Controls.Add(this.btnThreePointLocation);
             this.groupBox1.Controls.Add(this.btnCreateMatrix);
             this.groupBox1.Controls.Add(this.btnSaveSlotOffsetDistY);
@@ -697,6 +699,12 @@
             this.dataGridViewLinkColumn2.UseColumnTextForLinkValue = true;
             this.dataGridViewLinkColumn2.VisitedLinkColor = System.Drawing.Color.White;
             // 
+            // cboxThreePointLocation
+            // 
+            resources.ApplyResources(this.cboxThreePointLocation, "cboxThreePointLocation");
+            this.cboxThreePointLocation.Name = "cboxThreePointLocation";
+            this.cboxThreePointLocation.UseVisualStyleBackColor = true;
+            // 
             // StockTrayLocationRecipe
             // 
             resources.ApplyResources(this, "$this");
@@ -783,5 +791,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6;
         private System.Windows.Forms.DataGridViewLinkColumn dataGridViewLinkColumn2;
         private System.Windows.Forms.Button btnThreePointLocation;
+        private System.Windows.Forms.CheckBox cboxThreePointLocation;
     }
 }

Rs.DeweyTester/Recipe/StockTrayLocationRecipe.cs

@@ -176,6 +176,9 @@ namespace Rs.MotionPlat.Recipe
         {
             if(selectedSlot!=null)
             {
+                //string key = $"{GlobalVar.CurRecipe}-{}-{}";
+                Enum.TryParse(dt.Rows[0]["trayname"].ToString(), out ETrayType trayType);
+                SlotPoint sp = TrayRunPointManager.GetSlotPoint(trayType, selectedSlot.Index);
                 int nozzleIndex = 0;
                 string querySql = string.Empty;
                 //if(m_trayName=="Input" || m_trayName=="Ng")
@@ -190,8 +193,19 @@ namespace Rs.MotionPlat.Recipe
                 DataTable dtGoPosition = db.GetDataTable(querySql);
                 if(ObjectHelper.IsNotNullorEmpty(dtGoPosition))
                 {
-                    double targetX = double.Parse(dtGoPosition.Rows[0]["X"].ToString());
+                    double targetX = 0.0;
-                    double targetY = double.Parse(dtGoPosition.Rows[0]["Y"].ToString());
+                    double targetY = 0.0;
+                    if (cboxThreePointLocation.Checked)
+                    {
+                        targetX = sp.X;
+                        targetY = sp.Y;
+                    }
+                    else
+                    {
+                        targetX = double.Parse(dtGoPosition.Rows[0]["X"].ToString());
+                        targetY = double.Parse(dtGoPosition.Rows[0]["Y"].ToString());
+                    }
+                    
                     ToolStripMenuItem subMenu=sender as ToolStripMenuItem;
                     ToolStripMenuItem parentMenu = (ToolStripMenuItem)subMenu.OwnerItem;
                     if (parentMenu.Text.IndexOf("Nozzle") >= 0)

Rs.DeweyTester/Recipe/StockTrayLocationRecipe.resx

@@ -122,7 +122,7 @@
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="moveToolStripMenuItem9.Size" type="System.Drawing.Size, System.Drawing">
-    <value>109, 22</value>
+    <value>180, 22</value>
   </data>
   <data name="moveToolStripMenuItem9.Text" xml:space="preserve">
     <value>Move</value>
@@ -339,6 +339,33 @@
   <data name="&gt;&gt;panelEx5.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
+  <data name="cboxThreePointLocation.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="cboxThreePointLocation.Location" type="System.Drawing.Point, System.Drawing">
+    <value>324, 137</value>
+  </data>
+  <data name="cboxThreePointLocation.Size" type="System.Drawing.Size, System.Drawing">
+    <value>96, 16</value>
+  </data>
+  <data name="cboxThreePointLocation.TabIndex" type="System.Int32, mscorlib">
+    <value>57</value>
+  </data>
+  <data name="cboxThreePointLocation.Text" xml:space="preserve">
+    <value>三点定位数据</value>
+  </data>
+  <data name="&gt;&gt;cboxThreePointLocation.Name" xml:space="preserve">
+    <value>cboxThreePointLocation</value>
+  </data>
+  <data name="&gt;&gt;cboxThreePointLocation.Type" xml:space="preserve">
+    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;cboxThreePointLocation.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;cboxThreePointLocation.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
   <data name="btnThreePointLocation.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
   </data>
@@ -367,7 +394,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;btnThreePointLocation.ZOrder" xml:space="preserve">
-    <value>0</value>
+    <value>1</value>
   </data>
   <data name="btnCreateMatrix.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Right</value>
@@ -394,7 +421,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;btnCreateMatrix.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>2</value>
   </data>
   <data name="btnSaveSlotOffsetDistY.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Right</value>
@@ -427,7 +454,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;btnSaveSlotOffsetDistY.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>3</value>
   </data>
   <data name="btnTeachMarkY2.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
     <value>Flat</value>
@@ -457,7 +484,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;btnTeachMarkY2.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>4</value>
   </data>
   <data name="btnSaveSlotOffsetDistX.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Right</value>
@@ -490,7 +517,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;btnSaveSlotOffsetDistX.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>5</value>
   </data>
   <data name="btnTeachMarkX1.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
     <value>Flat</value>
@@ -520,7 +547,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;btnTeachMarkX1.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>6</value>
   </data>
   <data name="btnMoveMarkY2.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
     <value>Flat</value>
@@ -550,7 +577,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;btnMoveMarkY2.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>7</value>
   </data>
   <data name="btnMoveMarkX1.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
     <value>Flat</value>
@@ -580,7 +607,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;btnMoveMarkX1.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>8</value>
   </data>
   <data name="txtSlotOffsetDistY.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Right</value>
@@ -613,7 +640,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;txtSlotOffsetDistY.ZOrder" xml:space="preserve">
-    <value>8</value>
+    <value>9</value>
   </data>
   <data name="txtSlotOffsetDistX.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Right</value>
@@ -646,7 +673,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;txtSlotOffsetDistX.ZOrder" xml:space="preserve">
-    <value>9</value>
+    <value>10</value>
   </data>
   <data name="label4.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Right</value>
@@ -679,7 +706,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;label4.ZOrder" xml:space="preserve">
-    <value>10</value>
+    <value>11</value>
   </data>
   <data name="txtMarkY2.Font" type="System.Drawing.Font, System.Drawing">
     <value>宋体, 9pt</value>
@@ -709,7 +736,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;txtMarkY2.ZOrder" xml:space="preserve">
-    <value>11</value>
+    <value>12</value>
   </data>
   <data name="label3.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Right</value>
@@ -742,7 +769,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
-    <value>12</value>
+    <value>13</value>
   </data>
   <data name="txtMarkX1.Font" type="System.Drawing.Font, System.Drawing">
     <value>宋体, 9pt</value>
@@ -772,7 +799,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;txtMarkX1.ZOrder" xml:space="preserve">
-    <value>13</value>
+    <value>14</value>
   </data>
   <data name="label6.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -802,7 +829,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;label6.ZOrder" xml:space="preserve">
-    <value>14</value>
+    <value>15</value>
   </data>
   <data name="label5.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -832,7 +859,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;label5.ZOrder" xml:space="preserve">
-    <value>15</value>
+    <value>16</value>
   </data>
   <data name="groupBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
@@ -1333,6 +1360,6 @@
     <value>StockTrayLocationRecipe</value>
   </data>
   <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>Rs.MotionPlat.BaseForm, Rs.MotionPlat, Version=1.20.24.1, Culture=neutral, PublicKeyToken=null</value>
+    <value>Rs.MotionPlat.BaseForm, Rs.MotionPlat, Version=1.20.24.6, Culture=neutral, PublicKeyToken=null</value>
   </data>
 </root>