增加GRR模式，在GRR模式下，只有第一次才扫码，后面就不再扫码了

Rs.SkyLine/Commom/GlobalVar.cs

@@ -763,5 +763,16 @@ namespace Rs.Framework
                 return SysConfigParam.GetValue<bool>(nameof(EnableTwoSpeed));
             }
         }
+
+        /// <summary>
+        /// GRR
+        /// </summary>
+        public static bool GRR
+        {
+            get
+            {
+                return SysConfigParam.GetValue<bool>(nameof(GRR));
+            }
+        }
     }
 }

Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs

@@ -128,6 +128,7 @@ namespace Rs.MotionPlat.Flow
         /// 未执行的任务数量
         /// </summary>
         private int undoTaskNum = 0;
+        int scanNum = 0;
         public override void Run()
         {
             switch (flowStep)
@@ -1468,6 +1469,12 @@ namespace Rs.MotionPlat.Flow
                         if(curNozzle.ToType== TurnoverType.Turnover)
                         {
                             if (LoadAndUnloadTask.Instance.GetUndealedLoadToTurnoverTask().Count == 0 && !GlobalVar.VirtualAxis)
+                            {
+                                if(GlobalVar.GRR)
+                                {
+                                    scanNum++;
+                                }
+                                if(scanNum==1 || !GlobalVar.GRR)
                                 {
                                     //没有需要给周转盘上料的任务后，就开始上相机扫码
                                     //判断周转盘第一行有没有产品,如果有产品则拍第一行
@@ -1645,6 +1652,7 @@ namespace Rs.MotionPlat.Flow
                                     }
                                 }
                             }
+                        }
                         
                         if (LoadAndUnloadTask.Instance.GetUnDealedTask().Count > 0)
                         {

Rs.SkyLine/SysConfig/CommonConfig.Designer.cs

@@ -58,6 +58,7 @@
             this.label6 = new System.Windows.Forms.Label();
             this.cboxVirtualAxis = new System.Windows.Forms.CheckBox();
             this.cboxCheckSafeEnable = new System.Windows.Forms.CheckBox();
+            this.cboxEnableTestFixtureFiberCheck = new System.Windows.Forms.CheckBox();
             this.cboxEnableTwoSpeed = new System.Windows.Forms.CheckBox();
             this.cboxEnableScanBarCodeByDownCamera = new System.Windows.Forms.CheckBox();
             this.cboxEnableExceptionHandlingNozzle = new System.Windows.Forms.CheckBox();
@@ -82,7 +83,7 @@
             this.label27 = new System.Windows.Forms.Label();
             this.txtControlCenterIP = new System.Windows.Forms.TextBox();
             this.label26 = new System.Windows.Forms.Label();
-            this.cboxEnableTestFixtureFiberCheck = new System.Windows.Forms.CheckBox();
+            this.cboxGRR = new System.Windows.Forms.CheckBox();
             this.tableLayoutPanel1.SuspendLayout();
             this.groupBox3.SuspendLayout();
             this.groupBox10.SuspendLayout();
@@ -331,6 +332,7 @@
             this.groupBox1.Controls.Add(this.label6);
             this.groupBox1.Controls.Add(this.cboxVirtualAxis);
             this.groupBox1.Controls.Add(this.cboxCheckSafeEnable);
+            this.groupBox1.Controls.Add(this.cboxGRR);
             this.groupBox1.Controls.Add(this.cboxEnableTestFixtureFiberCheck);
             this.groupBox1.Controls.Add(this.cboxEnableTwoSpeed);
             this.groupBox1.Controls.Add(this.cboxEnableScanBarCodeByDownCamera);
@@ -473,6 +475,16 @@
             this.cboxCheckSafeEnable.Text = "安全检查";
             this.cboxCheckSafeEnable.UseVisualStyleBackColor = true;
             // 
+            // cboxEnableTestFixtureFiberCheck
+            // 
+            this.cboxEnableTestFixtureFiberCheck.AutoSize = true;
+            this.cboxEnableTestFixtureFiberCheck.Location = new System.Drawing.Point(294, 277);
+            this.cboxEnableTestFixtureFiberCheck.Name = "cboxEnableTestFixtureFiberCheck";
+            this.cboxEnableTestFixtureFiberCheck.Size = new System.Drawing.Size(96, 16);
+            this.cboxEnableTestFixtureFiberCheck.TabIndex = 8;
+            this.cboxEnableTestFixtureFiberCheck.Text = "启用光纤检测";
+            this.cboxEnableTestFixtureFiberCheck.UseVisualStyleBackColor = true;
+            // 
             // cboxEnableTwoSpeed
             // 
             this.cboxEnableTwoSpeed.AutoSize = true;
@@ -728,15 +740,15 @@
             this.label26.TabIndex = 0;
             this.label26.Text = "中控IP:";
             // 
-            // cboxEnableTestFixtureFiberCheck
+            // cboxGRR
             // 
-            this.cboxEnableTestFixtureFiberCheck.AutoSize = true;
+            this.cboxGRR.AutoSize = true;
-            this.cboxEnableTestFixtureFiberCheck.Location = new System.Drawing.Point(294, 277);
+            this.cboxGRR.Location = new System.Drawing.Point(391, 277);
-            this.cboxEnableTestFixtureFiberCheck.Name = "cboxEnableTestFixtureFiberCheck";
+            this.cboxGRR.Name = "cboxGRR";
-            this.cboxEnableTestFixtureFiberCheck.Size = new System.Drawing.Size(96, 16);
+            this.cboxGRR.Size = new System.Drawing.Size(42, 16);
-            this.cboxEnableTestFixtureFiberCheck.TabIndex = 8;
+            this.cboxGRR.TabIndex = 8;
-            this.cboxEnableTestFixtureFiberCheck.Text = "启用光纤检测";
+            this.cboxGRR.Text = "GRR";
-            this.cboxEnableTestFixtureFiberCheck.UseVisualStyleBackColor = true;
+            this.cboxGRR.UseVisualStyleBackColor = true;
             // 
             // CommonConfig
             // 
@@ -824,5 +836,6 @@
         private System.Windows.Forms.Label label9;
         private System.Windows.Forms.CheckBox cboxEnableTwoSpeed;
         private System.Windows.Forms.CheckBox cboxEnableTestFixtureFiberCheck;
+        private System.Windows.Forms.CheckBox cboxGRR;
     }
 }