1、修复检测完有无料后定拍后轴不动的问题。

2、增加扫码失败后产品是否搬运到治具测试选项。

Rs.DeweyTester/Commom/GlobalVar.cs

@@ -23,6 +23,17 @@ namespace Rs.Framework
         #region newpro
 
 
+        /// <summary>
+        /// 扫码失败是否测试
+        /// </summary>
+        [ParameterInit("bool", "true", "system", "扫码失败是否测试")]
+        public static bool ScanFailToTest
+        {
+            get
+            {
+                return SysConfigParam.GetValue<bool>(nameof(ScanFailToTest));
+            }
+        }
 
 
         /// <summary>

Rs.DeweyTester/Flow/NormalFlow/DischargeFlow.cs

@@ -428,7 +428,7 @@ namespace Rs.MotionPlat.Flow
                                         else if (fixtureret.Result == EOneGrabSixteenResult.LocationOkScanBarcodeFail)
                                         {
                                             Nozzle idleNozzle = NozzleManager.GetIdelNozzle();
-                                            if (false)
+                                            if (!GlobalVar.ScanFailToTest)
                                             {
                                                 StockTakeFlow.Instance.Take(ETrayType.Input, ret.SlotIndex, idleNozzle.NozzleIndex);
                                                 //放料

Rs.DeweyTester/Properties/AssemblyInfo.cs

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

Rs.DeweyTester/SysConfig/CommonConfig.Designer.cs

@@ -93,6 +93,7 @@
             this.cboxEnableBeforePlaceTrayToOkGrab = new System.Windows.Forms.CheckBox();
             this.cboxEnableOkTrayCheckFull = new System.Windows.Forms.CheckBox();
             this.cboxEnableBeforePlaceProductGrab = new System.Windows.Forms.CheckBox();
+            this.cboxScanFailToTest = new System.Windows.Forms.CheckBox();
             this.cboxDisableBuzzer = new System.Windows.Forms.CheckBox();
             this.cboxCheckVisionSwOpened = new System.Windows.Forms.CheckBox();
             this.cboxIsSimTest = new System.Windows.Forms.CheckBox();
@@ -151,6 +152,7 @@
             // 
             // groupBox8
             // 
+            resources.ApplyResources(this.groupBox8, "groupBox8");
             this.groupBox8.Controls.Add(this.txtHightChannel);
             this.groupBox8.Controls.Add(this.button1);
             this.groupBox8.Controls.Add(this.cboxLanguage);
@@ -162,7 +164,6 @@
             this.groupBox8.Controls.Add(this.cboxEnableStock);
             this.groupBox8.Controls.Add(this.cboxRunSpace);
             this.groupBox8.Controls.Add(this.label14);
-            resources.ApplyResources(this.groupBox8, "groupBox8");
             this.groupBox8.ForeColor = System.Drawing.Color.White;
             this.groupBox8.Name = "groupBox8";
             this.groupBox8.TabStop = false;
@@ -175,9 +176,9 @@
             // 
             // button1
             // 
+            resources.ApplyResources(this.button1, "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;
-            resources.ApplyResources(this.button1, "button1");
             this.button1.ForeColor = System.Drawing.Color.White;
             this.button1.Name = "button1";
             this.button1.UseVisualStyleBackColor = false;
@@ -185,11 +186,11 @@
             // 
             // cboxLanguage
             // 
+            resources.ApplyResources(this.cboxLanguage, "cboxLanguage");
             this.cboxLanguage.FormattingEnabled = true;
             this.cboxLanguage.Items.AddRange(new object[] {
             resources.GetString("cboxLanguage.Items"),
             resources.GetString("cboxLanguage.Items1")});
-            resources.ApplyResources(this.cboxLanguage, "cboxLanguage");
             this.cboxLanguage.Name = "cboxLanguage";
             // 
             // label2
@@ -247,6 +248,7 @@
             // 
             // groupBox3
             // 
+            resources.ApplyResources(this.groupBox3, "groupBox3");
             this.groupBox3.Controls.Add(this.btnSaveRelCategory);
             this.groupBox3.Controls.Add(this.txtSiteID);
             this.groupBox3.Controls.Add(this.comBoxCp);
@@ -266,16 +268,15 @@
             this.groupBox3.Controls.Add(this.label17);
             this.groupBox3.Controls.Add(this.txtMachineID);
             this.groupBox3.Controls.Add(this.label5);
-            resources.ApplyResources(this.groupBox3, "groupBox3");
             this.groupBox3.ForeColor = System.Drawing.Color.White;
             this.groupBox3.Name = "groupBox3";
             this.groupBox3.TabStop = false;
             // 
             // btnSaveRelCategory
             // 
+            resources.ApplyResources(this.btnSaveRelCategory, "btnSaveRelCategory");
             this.btnSaveRelCategory.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56)))));
             this.btnSaveRelCategory.FlatAppearance.BorderColor = System.Drawing.Color.White;
-            resources.ApplyResources(this.btnSaveRelCategory, "btnSaveRelCategory");
             this.btnSaveRelCategory.ForeColor = System.Drawing.Color.White;
             this.btnSaveRelCategory.Name = "btnSaveRelCategory";
             this.btnSaveRelCategory.UseVisualStyleBackColor = false;
@@ -289,47 +290,47 @@
             // 
             // comBoxCp
             // 
+            resources.ApplyResources(this.comBoxCp, "comBoxCp");
             this.comBoxCp.FormattingEnabled = true;
             this.comBoxCp.Items.AddRange(new object[] {
             resources.GetString("comBoxCp.Items"),
             resources.GetString("comBoxCp.Items1"),
             resources.GetString("comBoxCp.Items2")});
-            resources.ApplyResources(this.comBoxCp, "comBoxCp");
             this.comBoxCp.Name = "comBoxCp";
             this.comBoxCp.SelectedIndexChanged += new System.EventHandler(this.comBoxCp_SelectedIndexChanged);
             // 
             // comBoxRelCategory
             // 
+            resources.ApplyResources(this.comBoxRelCategory, "comBoxRelCategory");
             this.comBoxRelCategory.FormattingEnabled = true;
             this.comBoxRelCategory.Items.AddRange(new object[] {
             resources.GetString("comBoxRelCategory.Items"),
             resources.GetString("comBoxRelCategory.Items1"),
             resources.GetString("comBoxRelCategory.Items2")});
-            resources.ApplyResources(this.comBoxRelCategory, "comBoxRelCategory");
             this.comBoxRelCategory.Name = "comBoxRelCategory";
             this.comBoxRelCategory.SelectedIndexChanged += new System.EventHandler(this.comBoxRelCategory_SelectedIndexChanged);
             // 
             // cboxHostType
             // 
+            resources.ApplyResources(this.cboxHostType, "cboxHostType");
             this.cboxHostType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cboxHostType.FormattingEnabled = true;
             this.cboxHostType.Items.AddRange(new object[] {
             resources.GetString("cboxHostType.Items"),
             resources.GetString("cboxHostType.Items1"),
             resources.GetString("cboxHostType.Items2")});
-            resources.ApplyResources(this.cboxHostType, "cboxHostType");
             this.cboxHostType.Name = "cboxHostType";
             this.cboxHostType.SelectedIndexChanged += new System.EventHandler(this.cboxHostType_SelectedIndexChanged);
             // 
             // cboxConfigName
             // 
+            resources.ApplyResources(this.cboxConfigName, "cboxConfigName");
             this.cboxConfigName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cboxConfigName.FormattingEnabled = true;
             this.cboxConfigName.Items.AddRange(new object[] {
             resources.GetString("cboxConfigName.Items"),
             resources.GetString("cboxConfigName.Items1"),
             resources.GetString("cboxConfigName.Items2")});
-            resources.ApplyResources(this.cboxConfigName, "cboxConfigName");
             this.cboxConfigName.Name = "cboxConfigName";
             this.cboxConfigName.SelectedIndexChanged += new System.EventHandler(this.cboxConfigName_SelectedIndexChanged);
             // 
@@ -404,6 +405,7 @@
             // 
             // groupBox1
             // 
+            resources.ApplyResources(this.groupBox1, "groupBox1");
             this.groupBox1.Controls.Add(this.cboxEnableCheckStickMaterial);
             this.groupBox1.Controls.Add(this.txtUphRefreshCycle);
             this.groupBox1.Controls.Add(this.cboxMsgShowEn);
@@ -431,6 +433,7 @@
             this.groupBox1.Controls.Add(this.cboxEnableBeforePlaceTrayToOkGrab);
             this.groupBox1.Controls.Add(this.cboxEnableOkTrayCheckFull);
             this.groupBox1.Controls.Add(this.cboxEnableBeforePlaceProductGrab);
+            this.groupBox1.Controls.Add(this.cboxScanFailToTest);
             this.groupBox1.Controls.Add(this.cboxDisableBuzzer);
             this.groupBox1.Controls.Add(this.cboxCheckVisionSwOpened);
             this.groupBox1.Controls.Add(this.cboxIsSimTest);
@@ -448,7 +451,6 @@
             this.groupBox1.Controls.Add(this.lblTakeTrayFromNg2InputSpeed);
             this.groupBox1.Controls.Add(this.lblWholeSpeed);
             this.groupBox1.Controls.Add(this.label1);
-            resources.ApplyResources(this.groupBox1, "groupBox1");
             this.groupBox1.ForeColor = System.Drawing.Color.White;
             this.groupBox1.Name = "groupBox1";
             this.groupBox1.TabStop = false;
@@ -535,10 +537,10 @@
             // 
             // panelEx1
             // 
+            resources.ApplyResources(this.panelEx1, "panelEx1");
             this.panelEx1.Controls.Add(this.btnSaveSpeedParam);
             this.panelEx1.Controls.Add(this.cboxCurRecipe);
             this.panelEx1.Controls.Add(this.label4);
-            resources.ApplyResources(this.panelEx1, "panelEx1");
             this.panelEx1.Name = "panelEx1";
             // 
             // btnSaveSpeedParam
@@ -553,10 +555,10 @@
             // 
             // cboxCurRecipe
             // 
+            resources.ApplyResources(this.cboxCurRecipe, "cboxCurRecipe");
             this.cboxCurRecipe.FormattingEnabled = true;
             this.cboxCurRecipe.Items.AddRange(new object[] {
             resources.GetString("cboxCurRecipe.Items")});
-            resources.ApplyResources(this.cboxCurRecipe, "cboxCurRecipe");
             this.cboxCurRecipe.Name = "cboxCurRecipe";
             // 
             // label4
@@ -655,6 +657,13 @@
             this.cboxEnableBeforePlaceProductGrab.UseVisualStyleBackColor = true;
             this.cboxEnableBeforePlaceProductGrab.CheckedChanged += new System.EventHandler(this.cbox_CheckedChanged);
             // 
+            // cboxScanFailToTest
+            // 
+            resources.ApplyResources(this.cboxScanFailToTest, "cboxScanFailToTest");
+            this.cboxScanFailToTest.Name = "cboxScanFailToTest";
+            this.cboxScanFailToTest.UseVisualStyleBackColor = true;
+            this.cboxScanFailToTest.CheckedChanged += new System.EventHandler(this.cbox_CheckedChanged);
+            // 
             // cboxDisableBuzzer
             // 
             resources.ApplyResources(this.cboxDisableBuzzer, "cboxDisableBuzzer");
@@ -768,6 +777,7 @@
             // 
             // groupBox4
             // 
+            resources.ApplyResources(this.groupBox4, "groupBox4");
             this.groupBox4.Controls.Add(this.dataGridView1);
             this.groupBox4.Controls.Add(this.label6);
             this.groupBox4.Controls.Add(this.panel1);
@@ -777,13 +787,13 @@
             this.groupBox4.Controls.Add(this.txtControlCenterPort);
             this.groupBox4.Controls.Add(this.cboxEnableExceptionHandlingNozzle);
             this.groupBox4.Controls.Add(this.cboxEnableScanBarCodeByDownCamera);
-            resources.ApplyResources(this.groupBox4, "groupBox4");
             this.groupBox4.ForeColor = System.Drawing.Color.White;
             this.groupBox4.Name = "groupBox4";
             this.groupBox4.TabStop = false;
             // 
             // dataGridView1
             // 
+            resources.ApplyResources(this.dataGridView1, "dataGridView1");
             this.dataGridView1.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
             this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -792,7 +802,6 @@
             this.英文名,
             this.是否显示,
             this.是否需要登录});
-            resources.ApplyResources(this.dataGridView1, "dataGridView1");
             this.dataGridView1.Name = "dataGridView1";
             this.dataGridView1.RowTemplate.Height = 23;
             this.dataGridView1.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellEndEdit);
@@ -840,9 +849,9 @@
             // 
             // panel1
             // 
+            resources.ApplyResources(this.panel1, "panel1");
             this.panel1.Controls.Add(this.radioButton4);
             this.panel1.Controls.Add(this.radioButton3);
-            resources.ApplyResources(this.panel1, "panel1");
             this.panel1.Name = "panel1";
             // 
             // radioButton4
@@ -863,9 +872,9 @@
             // 
             // txtControlCenterIP
             // 
+            resources.ApplyResources(this.txtControlCenterIP, "txtControlCenterIP");
             this.txtControlCenterIP.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(16)))), ((int)(((byte)(16)))), ((int)(((byte)(16)))));
             this.txtControlCenterIP.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            resources.ApplyResources(this.txtControlCenterIP, "txtControlCenterIP");
             this.txtControlCenterIP.ForeColor = System.Drawing.Color.White;
             this.txtControlCenterIP.Name = "txtControlCenterIP";
             // 
@@ -881,9 +890,9 @@
             // 
             // txtControlCenterPort
             // 
+            resources.ApplyResources(this.txtControlCenterPort, "txtControlCenterPort");
             this.txtControlCenterPort.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(16)))), ((int)(((byte)(16)))), ((int)(((byte)(16)))));
             this.txtControlCenterPort.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            resources.ApplyResources(this.txtControlCenterPort, "txtControlCenterPort");
             this.txtControlCenterPort.ForeColor = System.Drawing.Color.White;
             this.txtControlCenterPort.Name = "txtControlCenterPort";
             // 
@@ -1027,5 +1036,6 @@
         private System.Windows.Forms.TextBox txtHightChannel;
         private System.Windows.Forms.TextBox txtBarcodeLength;
         private System.Windows.Forms.Label label22;
+        private System.Windows.Forms.CheckBox cboxScanFailToTest;
     }
 }

Rs.DeweyTester/SysConfig/CommonConfig.en-US.resx

@@ -117,10 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="txtHightChannel.Visible" type="System.Boolean, mscorlib">
-    <value>False</value>
-  </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="button1.Location" type="System.Drawing.Point, System.Drawing">
     <value>251, 388</value>
@@ -152,9 +148,6 @@
   <data name="cboxRunSpace.Location" type="System.Drawing.Point, System.Drawing">
     <value>36, 206</value>
   </data>
-  <data name="label14.Visible" type="System.Boolean, mscorlib">
-    <value>False</value>
-  </data>
   <data name="groupBox8.Location" type="System.Drawing.Point, System.Drawing">
     <value>853, 3</value>
   </data>
@@ -356,6 +349,15 @@
   <data name="cboxEnableBeforePlaceProductGrab.Text" xml:space="preserve">
     <value>take photos of the bin before loading</value>
   </data>
+  <data name="cboxScanFailToTest.Location" type="System.Drawing.Point, System.Drawing">
+    <value>641, 206</value>
+  </data>
+  <data name="cboxScanFailToTest.Size" type="System.Drawing.Size, System.Drawing">
+    <value>126, 16</value>
+  </data>
+  <data name="cboxScanFailToTest.Text" xml:space="preserve">
+    <value>Scan fail to test</value>
+  </data>
   <data name="cboxDisableBuzzer.Location" type="System.Drawing.Point, System.Drawing">
     <value>684, 243</value>
   </data>

Rs.DeweyTester/Vision/OneGrabOneVision.cs

@@ -27,9 +27,9 @@ namespace Rs.MotionPlat.Vision
                 {
                     data = Encoding.ASCII.GetString(reciveBuffer.ToArray());
                     //MessageQueue.Instance.Insert(data);
-                    if (Regex.IsMatch(data, "M\\d{0,1},0"))//data == "M,0")
+                    if (data == "M,0" || data=="M2,0")
                     {
-                        MessageQueue.Instance.Insert("视觉收到拍照指令");
+                        MessageQueue.Instance.Insert($">>> {data}");
                     }
                     else if (Regex.IsMatch( data,"C\\d{0,1},0"))// == "C,0")
                     {