优化排料逻辑

Rs.DeweyTester/Commom/Enums.cs

@@ -6,6 +6,8 @@ using System.Threading.Tasks;
 
 namespace Rs.MotionPlat.Commom
 {
+    
+
     /// <summary>
     /// 异常安全处理位
     /// </summary>

Rs.DeweyTester/Commom/GlobalVar.cs

@@ -17,6 +17,30 @@ namespace Rs.Framework
     {
         #region newpro
 
+        /// <summary>
+        /// 模拟测试良率
+        /// </summary>
+        [ParameterInit("int", "95", "system", "模拟测试良率")]
+        public static int SimulateTestYield
+        {
+            get
+            {
+                return SysConfigParam.GetValue<int>(nameof(SimulateTestYield));
+            }
+        }
+
+        /// <summary>
+        /// 模拟测试时间
+        /// </summary>
+        [ParameterInit("int", "30", "system", "模拟测试时间")]
+        public static int SimulateTestTime
+        {
+            get
+            {
+                return SysConfigParam.GetValue<int>(nameof(SimulateTestTime));
+            }
+        }
+
         /// <summary>
         /// 检测视觉软件是否打开
         /// </summary>

Rs.DeweyTester/Commom/NozzleCollection.cs

@@ -84,12 +84,12 @@ namespace Rs.MotionPlat.Commom
         {
             if (op == EIoOperate.Open)
             {
-                Ops.On($"{NozzleIndex}号吸嘴真空吸电磁阀");
+                Ops.On($"吸料真空{NozzleIndex}吸");
                 Thread.Sleep(GlobalVar.LoadNozzleOpenVacSuctionDelaytime);
             }
             else
             {
-                Ops.Off($"{NozzleIndex}号吸嘴真空吸电磁阀");
+                Ops.Off($"吸料真空{NozzleIndex}吸");
                 Thread.Sleep(GlobalVar.LoadNozzleCloseVacSuctionDelaytime);
             }
         }
@@ -101,11 +101,11 @@ namespace Rs.MotionPlat.Commom
         {
             if (op == EIoOperate.Open)
             {
-                Ops.On($"{NozzleIndex}号吸嘴真空破电磁阀");
+                Ops.On($"吸料真空{NozzleIndex}破");
             }
             else
             {
-                Ops.Off($"{NozzleIndex}号吸嘴真空破电磁阀");
+                Ops.Off($"吸料真空{NozzleIndex}破");
             }
         }
 
@@ -115,7 +115,7 @@ namespace Rs.MotionPlat.Commom
         /// <returns></returns>
         public bool HasProduct()
         {
-            return Ops.IsOn($"{NozzleIndex}号吸嘴真空吸检测");
+            return Ops.IsOn($"吸料真空{NozzleIndex}检测");
         }
     }
 
@@ -494,7 +494,7 @@ namespace Rs.MotionPlat.Commom
         /// <param name="trayType"></param>
         /// <param name="nozzleIndex"></param>
         /// <returns></returns>
-        public static double GotoTrayTakeProductPos(ETrayType trayType, int nozzleIndex)
+        public static double GetNozzleToTrayTakeProductPos(ETrayType trayType, int nozzleIndex)
         {
             double targetPos = 0.0;
             switch (trayType)
@@ -574,5 +574,25 @@ namespace Rs.MotionPlat.Commom
             double offsetHeight = GetNozzleOffsetHeight(nozzleIndex);
             return targetPos + offsetHeight;
         }
+
+        /// <summary>
+        /// 吸嘴运动
+        /// </summary>
+        /// <param name="nozzle"></param>
+        /// <returns></returns>
+        public static bool Go(Nozzle nozzle,double pos,int speed)
+        {
+            ErrorCode errCode = AxisControl.GetAxis($"NozzleZ{nozzle.NozzleIndex}").MovePos(pos, GlobalVar.WholeSpeed);
+            if (errCode == ErrorCode.Ok)
+            {
+                return true;
+            }
+            else
+            {
+                AlarmEntity alarmEntity = AlarmCollection.Get($"NozzleZ{nozzle.NozzleIndex}运动异常报警");
+                Msgbox.ShowDialog(alarmEntity, EButtonType.Retry);
+                return false;
+            }
+        }
     }
 }

Rs.DeweyTester/Entitys/SimulateTesterManager.cs

@@ -56,14 +56,14 @@ namespace Rs.MotionPlat.Entitys
         void CheckTest()
         {
             if (!_btest) return;
-            if(_start.ElapsedMilliseconds>45*1000)
+            if(_start.ElapsedMilliseconds>GlobalVar.SimulateTestTime*1000)
             {
                 _start.Stop();
                 _btest = false;
                 testResult = $"1$";
                 Random rnd = new Random();
                 int randomNumber = rnd.Next(0, 100);
-                int res = randomNumber < 20 ? 0 : 1;
+                int res = randomNumber < (100-GlobalVar.SimulateTestYield) ? 0 : 1;
                 testResult = $"Result#0#{res}#CsvInfo#FailItems#TestItems#BinInfo$";
             }
         }

Rs.DeweyTester/Entitys/TestFixtureManager.cs

@@ -319,13 +319,13 @@ namespace Rs.MotionPlat.Entitys
                     }
                     while (true)
                     {
-                        if (dataEvent.WaitOne(10))
+                        if (dataEvent.WaitOne(100))
                         {
                             break;
                         }
                         else
                         {
-                            Thread.Sleep(10);
+                            Thread.Sleep(100);
                         }
                     }
                     Send("Status$");
@@ -351,13 +351,13 @@ namespace Rs.MotionPlat.Entitys
         {
             while (true)
             {
-                if (dataEvent.WaitOne(10))
+                if (dataEvent.WaitOne(100))
                 {
                     break;
                 }
                 else
                 {
-                    Thread.Sleep(10);
+                    Thread.Sleep(100);
                 }
             }
             Send($"Reset$");
@@ -374,13 +374,13 @@ namespace Rs.MotionPlat.Entitys
         {
             while (true)
             {
-                if (dataEvent.WaitOne(10))
+                if (dataEvent.WaitOne(100))
                 {
                     break;
                 }
                 else
                 {
-                    Thread.Sleep(10);
+                    Thread.Sleep(100);
                 }
             }
             Send($"Pause#1$");
@@ -397,13 +397,13 @@ namespace Rs.MotionPlat.Entitys
         {
             while (true)
             {
-                if (dataEvent.WaitOne(10))
+                if (dataEvent.WaitOne(100))
                 {
                     break;
                 }
                 else
                 {
-                    Thread.Sleep(10);
+                    Thread.Sleep(100);
                 }
             }
             int noise = GlobalVar.Noise ? 1 : 0;
@@ -424,7 +424,7 @@ namespace Rs.MotionPlat.Entitys
                 {
                     if(!Connected)
                     {
-                        Thread.Sleep(50);
+                        Thread.Sleep(100);
                         continue;
                     }
                     byte[] bytes=new byte[1024 *10];
@@ -656,6 +656,10 @@ namespace Rs.MotionPlat.Entitys
                             File.AppendAllText(logFileName, $"{DateTime.Now.ToString("HH:mm:ss fff")} {log}\r\n");
                         }
                     }
+                    else
+                    {
+                        Thread.Sleep(100);
+                    }
                 }
             });
         }
@@ -684,6 +688,24 @@ namespace Rs.MotionPlat.Entitys
             }
         }
 
+        /// <summary>
+        /// 夹头夹紧
+        /// </summary>
+        public void ColletOn()
+        {
+            Ops.On($"治具夹{Index}");
+            Thread.Sleep(100);
+        }
+
+        /// <summary>
+        /// 夹头松开
+        /// </summary>
+        public void ColletOff()
+        {
+            Ops.Off($"治具夹{Index}");
+            Thread.Sleep(100);
+        }
+
     }
     public class TestFixtureManager
     {

Rs.DeweyTester/Flow/NormalFlow/DischargeFlow.cs

@@ -43,12 +43,10 @@ namespace Rs.MotionPlat.Flow
         到料仓拍照位上方,
         等待到料仓拍照位上方,
         料仓取料拍照,
-        料仓取料拍照结果处理,
         到料仓取料位上方,
         等待到料仓取料位上方,
         到料仓取料位下方,
         等待到料仓取料位下方,
-        料仓取料打开真空吸,
         料仓取料完成抬起,
         等待料仓取料完成抬起,
         料仓取料真空吸检测,
@@ -275,18 +273,17 @@ namespace Rs.MotionPlat.Flow
                         List<VisionResult> vResult =  VisionHelper.OneGrabFour();
                         if(vResult!=null &&vResult.Count==4)
                         {
-
+                            for (int i = 0; i < vResult.Count; i++)
+                            {
+                                OneGrabFourManager.Instance.DealGrabResult(slot.Index, i + 1, vResult[i]);
+                            }
+                            GlobalTray.GrabTray.ChangeStatus(slot.Index, ESlotStatus.NotHave);
+                            flowStep = EDischargeFlowStep.到料仓取料位上方;
                         }
-                        for(int i=0;i<vResult.Count;i++)
+                        else
                         {
-                            OneGrabFourManager.Instance.DealGrabResult(slot.Index, i + 1, vResult[i]);
+                            Msgbox.ShowDialog(EButtonType.Retry, "料盘拍照失败，请处理后点击重试");
                         }
-                        GlobalTray.GrabTray.ChangeStatus(slot.Index, ESlotStatus.NotHave);
-                        flowStep = EDischargeFlowStep.料仓取料拍照结果处理;
-                        break;
-                    case EDischargeFlowStep.料仓取料拍照结果处理:
-                       
-                        flowStep = EDischargeFlowStep.到料仓取料位上方;
                         break;
                     case EDischargeFlowStep.到料仓取料位上方:
                         //获取空闲吸嘴
@@ -299,31 +296,9 @@ namespace Rs.MotionPlat.Flow
                             targetPosition.X = re.LoadX + GlobalVar.Nozzle1ToCameraCenterOffsetX + NozzleManager.GetNozzleOffsetX(curNozzle.NozzleIndex);
                             targetPosition.Y1 = GlobalVar.StockSideY1;
                             targetPosition.Y2 = re.LoadY + GlobalVar.Nozzle1ToCameraCenterOffsetY2 + NozzleManager.GetNozzleOffsetY2(curNozzle.NozzleIndex);
-                            errCode = AxisControl.LoadX.MovePos(targetPosition.X, GlobalVar.WholeSpeed);
-                            if (errCode == ErrorCode.Ok)
+                            if(GroupAxisMove.XY1Y2MovePos(targetPosition))
                             {
-                                errCode = AxisControl.LoadY1.MovePos(targetPosition.Y1, GlobalVar.WholeSpeed);
-                                if (errCode == ErrorCode.Ok)
-                                {
-                                    errCode = AxisControl.LoadY2.MovePos(targetPosition.Y2, GlobalVar.WholeSpeed);
-                                    if (errCode == ErrorCode.Ok)
-                                    {
-                                        flowStep = EDischargeFlowStep.等待到料仓取料位上方;
-
-                                    }
-                                    else
-                                    {
-                                        Msg.ShowError($"轴LoadY2运动异常");
-                                    }
-                                }
-                                else
-                                {
-                                    Msg.ShowError($"轴LoadY1运动异常");
-                                }
-                            }
-                            else
-                            {
-                                Msg.ShowError($"轴Loadx运动异常");
+                                flowStep = EDischargeFlowStep.等待到料仓取料位上方;
                             }
                         }
                         
@@ -345,8 +320,8 @@ namespace Rs.MotionPlat.Flow
                         }
                         break;
                     case EDischargeFlowStep.到料仓取料位下方:
-                        errCode=AxisControl.GetAxis($"NozzleZ{curNozzle.NozzleIndex}").MovePos(36,GlobalVar.WholeSpeed);
-                        if(errCode== ErrorCode.Ok)
+                        targetPosition.StockZ = NozzleManager.GetNozzleToTrayTakeProductPos(ETrayType.Input, curNozzle.NozzleIndex);
+                        if(NozzleManager.Go(curNozzle, targetPosition.StockZ, GlobalVar.WholeSpeed))
                         {
                             flowStep = EDischargeFlowStep.等待到料仓取料位下方;
                         }
@@ -354,25 +329,12 @@ namespace Rs.MotionPlat.Flow
                     case EDischargeFlowStep.等待到料仓取料位下方:
                         if(Ops.IsStop($"NozzleZ{curNozzle.NozzleIndex}"))
                         {
-                            flowStep = EDischargeFlowStep.料仓取料打开真空吸;
-                        }
-                        break;
-                    case EDischargeFlowStep.料仓取料打开真空吸:
-                        if(GlobalVar.RunSpace)
-                        {
-                            flowStep = EDischargeFlowStep.料仓取料完成抬起;
-                        }
-                        else
-                        {
-                            Ops.On($"吸料真空{curNozzle.NozzleIndex}吸");
-                            Thread.Sleep(100);
+                            curNozzle.VacSuction(EIoOperate.Open);
                             flowStep = EDischargeFlowStep.料仓取料完成抬起;
                         }
-                        
                         break;
                     case EDischargeFlowStep.料仓取料完成抬起:
-                        errCode = AxisControl.GetAxis($"NozzleZ{curNozzle.NozzleIndex}").MovePos(0, GlobalVar.WholeSpeed);
-                        if (errCode == ErrorCode.Ok)
+                        if(NozzleManager.Go(curNozzle,0,GlobalVar.WholeSpeed))
                         {
                             flowStep = EDischargeFlowStep.等待料仓取料完成抬起;
                         }
@@ -384,13 +346,35 @@ namespace Rs.MotionPlat.Flow
                         }
                         break;
                     case EDischargeFlowStep.料仓取料真空吸检测:
-                        if(true)
+                        if (Ops.IsOn($"吸料真空{curNozzle.NozzleIndex}检测"))
                         {
                             curNozzle.Product = new TestProduct() { SN = VirtualBarCode.Code, TestNum = 0 };
                             curNozzle.Status = ENozzleStatus.ToTest;
                             GlobalTray.NozzleTray.ChangeStatus(curNozzle.NozzleIndex, ESlotStatus.Have);
                             flowStep = EDischargeFlowStep.判断是否需要从料仓取料;
                         }
+                        else
+                        {
+                            EButtonType btnSelect = Msgbox.ShowDialog(EButtonType.EndInput | EButtonType.Retry | EButtonType.Skip, "料仓取料失败");
+                            switch (btnSelect)
+                            {
+                                case EButtonType.EndInput:
+
+                                    break;
+                                case EButtonType.Retry:
+                                    logInfo = GetClassName() + $"选择了重试";
+                                    MessageQueue.Instance.Insert(logInfo);
+                                    //关闭真空吸
+                                    curNozzle.VacSuction(EIoOperate.Close);
+                                    flowStep = EDischargeFlowStep.到料仓取料位下方;
+                                    break;
+                                case EButtonType.Skip:
+                                    logInfo = GetClassName() + $"选择了跳过";
+                                    MessageQueue.Instance.Insert(logInfo);
+                                    flowStep = EDischargeFlowStep.到料仓取料位上方;
+                                    break;
+                            }
+                        }
                         break;
 
 
@@ -401,36 +385,12 @@ namespace Rs.MotionPlat.Flow
                     //治具换料
                     case EDischargeFlowStep.到治具取料等待位:
                         //先去第一个治具拍照位上方等待
-                        targetPosition.X = GetFixtureGrabPosX(lastFixtureIndex + 1);
-                        targetPosition.Y1 = GlobalVar.FixtureSideY1;
-                        targetPosition.Y2 = GetFixtureGrabPosY2(lastFixtureIndex + 1);
-                        errCode = AxisControl.LoadX.MovePos(targetPosition.X, GlobalVar.WholeSpeed);
-                        if (errCode == ErrorCode.Ok)
-                        {
-                            errCode = AxisControl.LoadY1.MovePos(targetPosition.Y1, GlobalVar.WholeSpeed);
-                            if (errCode == ErrorCode.Ok)
-                            {
-                                errCode = AxisControl.LoadY2.MovePos(targetPosition.Y2, GlobalVar.WholeSpeed);
-                                if (errCode == ErrorCode.Ok)
-                                {
-                                    logInfo = $"到治具放料缓冲位,tloadx={targetPosition.X},tloady1={targetPosition.Y1},tloady2={targetPosition.Y2}";
-                                    MessageQueue.Instance.Insert(logInfo);
-                                    flowStep = EDischargeFlowStep.等待到治具取料等待位;
-
-                                }
-                                else
-                                {
-                                    Msg.ShowError($"轴LoadY2运动异常,ret={errCode}");
-                                }
-                            }
-                            else
-                            {
-                                Msg.ShowError($"轴LoadY1运动异常,ret={errCode}");
-                            }
-                        }
-                        else
+                        targetPosition =FixtureManager.GetFixtureGrabPos(lastFixtureIndex + 1);
+                        if(GroupAxisMove.XY1Y2MovePos(targetPosition))
                         {
-                            Msg.ShowError($"轴LoadX运动异常,ret={errCode}");
+                            logInfo = $"到治具放料缓冲位,tloadx={targetPosition.X},tloady1={targetPosition.Y1},tloady2={targetPosition.Y2}";
+                            MessageQueue.Instance.Insert(logInfo);
+                            flowStep = EDischargeFlowStep.等待到治具取料等待位;
                         }
                         break;
                     case EDischargeFlowStep.等待到治具取料等待位:
@@ -477,36 +437,12 @@ namespace Rs.MotionPlat.Flow
                         curNozzle = NozzleManager.GetIdelNozzle();
                         if(curNozzle!=null)
                         {
-                            targetPosition.X = GetFixtureGrabPosX(curFixture.Index) + GlobalVar.Nozzle1ToCameraCenterOffsetX + NozzleManager.GetNozzleOffsetX(curNozzle.NozzleIndex);
-                            targetPosition.Y1 = GlobalVar.FixtureSideY1;
-                            targetPosition.Y2 = GetFixtureGrabPosY2(curFixture.Index) + GlobalVar.Nozzle1ToCameraCenterOffsetY2 + NozzleManager.GetNozzleOffsetY2(curNozzle.NozzleIndex);
-                            errCode = AxisControl.LoadX.MovePos(targetPosition.X, GlobalVar.WholeSpeed);
-                            if (errCode == ErrorCode.Ok)
+                            targetPosition = NozzleManager.GetNozzleToFixturePos(curFixture.Index, curNozzle.NozzleIndex);
+                            if (GroupAxisMove.XY1Y2MovePos(targetPosition))
                             {
-                                errCode = AxisControl.LoadY1.MovePos(targetPosition.Y1, GlobalVar.WholeSpeed);
-                                if (errCode == ErrorCode.Ok)
-                                {
-                                    errCode = AxisControl.LoadY2.MovePos(targetPosition.Y2, GlobalVar.WholeSpeed);
-                                    if (errCode == ErrorCode.Ok)
-                                    {
-                                        logInfo = $"到治具取料位上方,tloadx={targetPosition.X},tloady1={targetPosition.Y1},tloady2={targetPosition.Y2}";
-                                        MessageQueue.Instance.Insert(logInfo);
-                                        flowStep = EDischargeFlowStep.等待到治具取料位上方;
-
-                                    }
-                                    else
-                                    {
-                                        Msg.ShowError("轴LoadY2运动异常");
-                                    }
-                                }
-                                else
-                                {
-                                    Msg.ShowError("轴LoadY1运动异常");
-                                }
-                            }
-                            else
-                            {
-                                Msg.ShowError("轴LoadX运动异常");
+                                logInfo = GetClassName() + $"到治具取料位上方,tloadx={targetPosition.X},tloady1={targetPosition.Y1},tloady2={targetPosition.Y2}";
+                                MessageQueue.Instance.Insert(logInfo);
+                                flowStep = EDischargeFlowStep.等待到治具取料位上方;
                             }
                         }
                         break;
@@ -527,15 +463,11 @@ namespace Rs.MotionPlat.Flow
                         }
                         break;
                     case EDischargeFlowStep.到治具取料位下方1:
-                        errCode = AxisControl.GetAxis($"NozzleZ{curNozzle.NozzleIndex}").MovePos(10, GlobalVar.WholeSpeed);
-                        if(errCode== ErrorCode.Ok)
+                        targetPosition.NozzleZ = NozzleManager.GetFixtureTakeProductPos(curFixture.Index, curNozzle.NozzleIndex);
+                        if(NozzleManager.Go(curNozzle, targetPosition.NozzleZ, GlobalVar.WholeSpeed))
                         {
                             flowStep = EDischargeFlowStep.等待到治具取料位下方1;
                         }
-                        else
-                        {
-                            Msg.ShowError($"轴NozzleZ{curNozzle.NozzleIndex}运动异常");
-                        }
                         break;
                     case EDischargeFlowStep.等待到治具取料位下方1:
                         if(Ops.IsStop($"NozzleZ{curNozzle.NozzleIndex}"))
@@ -544,15 +476,11 @@ namespace Rs.MotionPlat.Flow
                         }
                         break;
                     case EDischargeFlowStep.到治具取料位下方2:
-                        errCode = AxisControl.GetAxis($"NozzleZ{curNozzle.NozzleIndex}").MovePos(10, GlobalVar.WholeSpeed);
-                        if (errCode == ErrorCode.Ok)
+                        targetPosition.NozzleZ = NozzleManager.GetFixtureTakeProductPos(curFixture.Index, curNozzle.NozzleIndex);
+                        if (NozzleManager.Go(curNozzle, targetPosition.NozzleZ, GlobalVar.WholeSpeed))
                         {
                             flowStep = EDischargeFlowStep.等待到治具取料位下方2;
                         }
-                        else
-                        {
-                            Msg.ShowError($"轴NozzleZ{curNozzle.NozzleIndex}运动异常");
-                        }
                         break;
                     case EDischargeFlowStep.等待到治具取料位下方2:
                         if (Ops.IsStop($"NozzleZ{curNozzle.NozzleIndex}"))
@@ -563,16 +491,18 @@ namespace Rs.MotionPlat.Flow
                             }
                             else
                             {
-                                Ops.On($"吸料真空{curNozzle.NozzleIndex}吸");
-                                Thread.Sleep(100);
-                                Ops.Off($"治具夹{curFixture.Index}");
-                                Thread.Sleep(100);
+                                curNozzle.VacSuction(EIoOperate.Open);
+                                curFixture.ColletOff();
                                 flowStep = EDischargeFlowStep.治具取料完成抬起1;
                             }
                            
                         }
                         break;
                     case EDischargeFlowStep.治具取料完成抬起1:
+                        if(NozzleManager.Go(curNozzle,0, GlobalVar.WholeSpeed))
+                        {
+
+                        }
                         errCode = AxisControl.GetAxis($"NozzleZ{curNozzle.NozzleIndex}").MovePos(0, GlobalVar.WholeSpeed);
                         if (errCode == ErrorCode.Ok)
                         {

Rs.DeweyTester/Flow/NormalFlow/GrrFlow.cs

@@ -215,7 +215,7 @@ namespace Rs.MotionPlat.Flow
                                 targetPosition.Y2 = curTakeSlotPoint.Y;
                                 if(GroupAxisMove.XY1Y2MovePos(targetPosition))
                                 {
-
+                                    logInfo = GetClassName() + $"到料仓拍照位上方";
                                     flowStep = EGrrFlowStep.等待到料仓拍照位上方;
                                 }
                             }
@@ -305,7 +305,7 @@ namespace Rs.MotionPlat.Flow
                         }
                         break;
                     case EGrrFlowStep.到料仓取料位下方:
-                        targetPosition.NozzleZ = NozzleManager.GotoTrayTakeProductPos(ETrayType.Grr, curTakeNozzle.NozzleIndex);
+                        targetPosition.NozzleZ = NozzleManager.GetNozzleToTrayTakeProductPos(ETrayType.Grr, curTakeNozzle.NozzleIndex);
                         errCode = AxisControl.GetAxis($"NozzleZ{curTakeNozzle.NozzleIndex}").MovePos(targetPosition.NozzleZ, GlobalVar.WholeSpeed);
                         if (errCode == ErrorCode.Ok)
                         {
@@ -806,7 +806,7 @@ namespace Rs.MotionPlat.Flow
                         }
                         break;
                     case EGrrFlowStep.到料仓放料位下方:
-                        targetPosition.NozzleZ = NozzleManager.GotoTrayTakeProductPos(ETrayType.Grr, curDumpNozzle.NozzleIndex);
+                        targetPosition.NozzleZ = NozzleManager.GetNozzleToTrayTakeProductPos(ETrayType.Grr, curDumpNozzle.NozzleIndex);
                         errCode = AxisControl.GetAxis($"NozzleZ{curDumpNozzle.NozzleIndex}").MovePos(targetPosition.NozzleZ, GlobalVar.WholeSpeed);
                         if (errCode == ErrorCode.Ok)
                         {

Rs.DeweyTester/FrmDialog.cs

@@ -16,11 +16,12 @@ namespace Rs.MotionPlat
 {
     public enum EButtonType
     {
-        None = 1<<0,
-        Ok= 1<<1,
-        Cancel = 1<<2,
-        Retry=1<<3,
-        EndInput= 1<<4
+        None = 1 << 0,
+        Cancel = 1 << 1,
+        Ok = 1 << 2,
+        Retry = 1 << 3,
+        EndInput = 1 << 4,
+        Skip = 1 << 5
     }
 
     public partial class FrmDialog : BaseFormHeader
@@ -33,6 +34,7 @@ namespace Rs.MotionPlat
         Button btnCancel = new Button() { Name = "Cancel" };
         Button btnEndInput = new Button() { Name = "EndInput" };
         Button btnRetry = new Button() { Name = "Retry" };
+        Button btnSkip = new Button() { Name = "Skip" };
         List<Button> buttons = new List<Button>();
         public FrmDialog()
         {
@@ -41,9 +43,9 @@ namespace Rs.MotionPlat
             buttons.Add(btnCancel);
             buttons.Add(btnEndInput);
             buttons.Add(btnRetry);
+            buttons.Add(btnSkip);
             foreach (var item in buttons)
             {
-                
                 item.Cursor = Cursors.Hand;
                 item.Text = item.Name;
                 item.Size = new System.Drawing.Size(100, 30);
@@ -131,6 +133,10 @@ namespace Rs.MotionPlat
                             btnRetry.Dock = DockStyle.Fill;
                             p.Controls.Add(btnRetry);
                             break;
+                        case "Skip":
+                            btnSkip.Dock = DockStyle.Fill;
+                            p.Controls.Add(btnSkip);
+                            break;
                         case "None":
                             this.panelBottom.Visible = false;
                             break;

Rs.DeweyTester/SysConfig/CommonConfig.Designer.cs

@@ -49,9 +49,13 @@
             this.cboxGRR = new System.Windows.Forms.CheckBox();
             this.txtGrrProductNum = new System.Windows.Forms.TextBox();
             this.label8 = new System.Windows.Forms.Label();
+            this.txtSimulateTestYield = new System.Windows.Forms.TextBox();
+            this.txtSimulateTestTime = new System.Windows.Forms.TextBox();
             this.txtMachineID = new System.Windows.Forms.TextBox();
             this.label11 = new System.Windows.Forms.Label();
+            this.label13 = new System.Windows.Forms.Label();
             this.label10 = new System.Windows.Forms.Label();
+            this.label12 = new System.Windows.Forms.Label();
             this.label7 = new System.Windows.Forms.Label();
             this.label5 = new System.Windows.Forms.Label();
             this.label3 = new System.Windows.Forms.Label();
@@ -67,6 +71,7 @@
             this.cboxEnableTC3 = new System.Windows.Forms.CheckBox();
             this.cboxEnableTC2 = new System.Windows.Forms.CheckBox();
             this.cboxEnableTC1 = new System.Windows.Forms.CheckBox();
+            this.cboxCheckVisionSwOpened = new System.Windows.Forms.CheckBox();
             this.cboxIsSimTest = new System.Windows.Forms.CheckBox();
             this.cboxPrintTC6Communicate = new System.Windows.Forms.CheckBox();
             this.cboxPrintTC3Communicate = new System.Windows.Forms.CheckBox();
@@ -97,7 +102,6 @@
             this.txtControlCenterPort = new System.Windows.Forms.TextBox();
             this.cboxEnableExceptionHandlingNozzle = new System.Windows.Forms.CheckBox();
             this.cboxEnableScanBarCodeByDownCamera = new System.Windows.Forms.CheckBox();
-            this.cboxCheckVisionSwOpened = new System.Windows.Forms.CheckBox();
             this.tableLayoutPanel1.SuspendLayout();
             this.groupBox8.SuspendLayout();
             this.groupBox1.SuspendLayout();
@@ -217,9 +221,13 @@
             this.groupBox1.Controls.Add(this.cboxGRR);
             this.groupBox1.Controls.Add(this.txtGrrProductNum);
             this.groupBox1.Controls.Add(this.label8);
+            this.groupBox1.Controls.Add(this.txtSimulateTestYield);
+            this.groupBox1.Controls.Add(this.txtSimulateTestTime);
             this.groupBox1.Controls.Add(this.txtMachineID);
             this.groupBox1.Controls.Add(this.label11);
+            this.groupBox1.Controls.Add(this.label13);
             this.groupBox1.Controls.Add(this.label10);
+            this.groupBox1.Controls.Add(this.label12);
             this.groupBox1.Controls.Add(this.label7);
             this.groupBox1.Controls.Add(this.label5);
             this.groupBox1.Controls.Add(this.label3);
@@ -292,21 +300,44 @@
             resources.ApplyResources(this.label8, "label8");
             this.label8.Name = "label8";
             // 
+            // txtSimulateTestYield
+            // 
+            resources.ApplyResources(this.txtSimulateTestYield, "txtSimulateTestYield");
+            this.txtSimulateTestYield.Name = "txtSimulateTestYield";
+            this.txtSimulateTestYield.KeyUp += new System.Windows.Forms.KeyEventHandler(this.txtSysParam_KeyUp);
+            // 
+            // txtSimulateTestTime
+            // 
+            resources.ApplyResources(this.txtSimulateTestTime, "txtSimulateTestTime");
+            this.txtSimulateTestTime.Name = "txtSimulateTestTime";
+            this.txtSimulateTestTime.KeyUp += new System.Windows.Forms.KeyEventHandler(this.txtSysParam_KeyUp);
+            // 
             // txtMachineID
             // 
             resources.ApplyResources(this.txtMachineID, "txtMachineID");
             this.txtMachineID.Name = "txtMachineID";
+            this.txtMachineID.KeyUp += new System.Windows.Forms.KeyEventHandler(this.txtSysParam_KeyUp);
             // 
             // label11
             // 
             resources.ApplyResources(this.label11, "label11");
             this.label11.Name = "label11";
             // 
+            // label13
+            // 
+            resources.ApplyResources(this.label13, "label13");
+            this.label13.Name = "label13";
+            // 
             // label10
             // 
             resources.ApplyResources(this.label10, "label10");
             this.label10.Name = "label10";
             // 
+            // label12
+            // 
+            resources.ApplyResources(this.label12, "label12");
+            this.label12.Name = "label12";
+            // 
             // label7
             // 
             resources.ApplyResources(this.label7, "label7");
@@ -417,6 +448,13 @@
             this.cboxEnableTC1.UseVisualStyleBackColor = true;
             this.cboxEnableTC1.CheckedChanged += new System.EventHandler(this.cboxFixture_CheckedChanged);
             // 
+            // cboxCheckVisionSwOpened
+            // 
+            resources.ApplyResources(this.cboxCheckVisionSwOpened, "cboxCheckVisionSwOpened");
+            this.cboxCheckVisionSwOpened.Name = "cboxCheckVisionSwOpened";
+            this.cboxCheckVisionSwOpened.UseVisualStyleBackColor = true;
+            this.cboxCheckVisionSwOpened.CheckedChanged += new System.EventHandler(this.cbox_CheckedChanged);
+            // 
             // cboxIsSimTest
             // 
             resources.ApplyResources(this.cboxIsSimTest, "cboxIsSimTest");
@@ -637,13 +675,6 @@
             this.cboxEnableScanBarCodeByDownCamera.Name = "cboxEnableScanBarCodeByDownCamera";
             this.cboxEnableScanBarCodeByDownCamera.UseVisualStyleBackColor = true;
             // 
-            // cboxCheckVisionSwOpened
-            // 
-            resources.ApplyResources(this.cboxCheckVisionSwOpened, "cboxCheckVisionSwOpened");
-            this.cboxCheckVisionSwOpened.Name = "cboxCheckVisionSwOpened";
-            this.cboxCheckVisionSwOpened.UseVisualStyleBackColor = true;
-            this.cboxCheckVisionSwOpened.CheckedChanged += new System.EventHandler(this.cbox_CheckedChanged);
-            // 
             // CommonConfig
             // 
             resources.ApplyResources(this, "$this");
@@ -740,5 +771,9 @@
         private System.Windows.Forms.Label label11;
         private System.Windows.Forms.Label label10;
         private System.Windows.Forms.CheckBox cboxCheckVisionSwOpened;
+        private System.Windows.Forms.TextBox txtSimulateTestYield;
+        private System.Windows.Forms.TextBox txtSimulateTestTime;
+        private System.Windows.Forms.Label label13;
+        private System.Windows.Forms.Label label12;
     }
 }

Rs.DeweyTester/SysConfig/CommonConfig.resx

@@ -657,6 +657,48 @@
   <data name="&gt;&gt;label8.ZOrder" xml:space="preserve">
     <value>6</value>
   </data>
+  <data name="txtSimulateTestYield.Location" type="System.Drawing.Point, System.Drawing">
+    <value>460, 108</value>
+  </data>
+  <data name="txtSimulateTestYield.Size" type="System.Drawing.Size, System.Drawing">
+    <value>94, 21</value>
+  </data>
+  <data name="txtSimulateTestYield.TabIndex" type="System.Int32, mscorlib">
+    <value>11</value>
+  </data>
+  <data name="&gt;&gt;txtSimulateTestYield.Name" xml:space="preserve">
+    <value>txtSimulateTestYield</value>
+  </data>
+  <data name="&gt;&gt;txtSimulateTestYield.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;txtSimulateTestYield.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;txtSimulateTestYield.ZOrder" xml:space="preserve">
+    <value>7</value>
+  </data>
+  <data name="txtSimulateTestTime.Location" type="System.Drawing.Point, System.Drawing">
+    <value>460, 73</value>
+  </data>
+  <data name="txtSimulateTestTime.Size" type="System.Drawing.Size, System.Drawing">
+    <value>94, 21</value>
+  </data>
+  <data name="txtSimulateTestTime.TabIndex" type="System.Int32, mscorlib">
+    <value>11</value>
+  </data>
+  <data name="&gt;&gt;txtSimulateTestTime.Name" xml:space="preserve">
+    <value>txtSimulateTestTime</value>
+  </data>
+  <data name="&gt;&gt;txtSimulateTestTime.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;txtSimulateTestTime.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;txtSimulateTestTime.ZOrder" xml:space="preserve">
+    <value>8</value>
+  </data>
   <data name="txtMachineID.Location" type="System.Drawing.Point, System.Drawing">
     <value>155, 108</value>
   </data>
@@ -676,7 +718,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;txtMachineID.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>9</value>
   </data>
   <data name="label11.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -706,7 +748,37 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;label11.ZOrder" xml:space="preserve">
-    <value>8</value>
+    <value>10</value>
+  </data>
+  <data name="label13.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label13.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="label13.Location" type="System.Drawing.Point, System.Drawing">
+    <value>367, 114</value>
+  </data>
+  <data name="label13.Size" type="System.Drawing.Size, System.Drawing">
+    <value>83, 12</value>
+  </data>
+  <data name="label13.TabIndex" type="System.Int32, mscorlib">
+    <value>10</value>
+  </data>
+  <data name="label13.Text" xml:space="preserve">
+    <value>模拟测试良率:</value>
+  </data>
+  <data name="&gt;&gt;label13.Name" xml:space="preserve">
+    <value>label13</value>
+  </data>
+  <data name="&gt;&gt;label13.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label13.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;label13.ZOrder" xml:space="preserve">
+    <value>11</value>
   </data>
   <data name="label10.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -736,7 +808,37 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;label10.ZOrder" xml:space="preserve">
-    <value>9</value>
+    <value>12</value>
+  </data>
+  <data name="label12.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label12.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="label12.Location" type="System.Drawing.Point, System.Drawing">
+    <value>367, 79</value>
+  </data>
+  <data name="label12.Size" type="System.Drawing.Size, System.Drawing">
+    <value>83, 12</value>
+  </data>
+  <data name="label12.TabIndex" type="System.Int32, mscorlib">
+    <value>10</value>
+  </data>
+  <data name="label12.Text" xml:space="preserve">
+    <value>模拟测试时间:</value>
+  </data>
+  <data name="&gt;&gt;label12.Name" xml:space="preserve">
+    <value>label12</value>
+  </data>
+  <data name="&gt;&gt;label12.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label12.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;label12.ZOrder" xml:space="preserve">
+    <value>13</value>
   </data>
   <data name="label7.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -766,7 +868,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;label7.ZOrder" xml:space="preserve">
-    <value>10</value>
+    <value>14</value>
   </data>
   <data name="label5.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -796,7 +898,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;label5.ZOrder" xml:space="preserve">
-    <value>11</value>
+    <value>15</value>
   </data>
   <data name="label3.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -823,7 +925,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
-    <value>12</value>
+    <value>16</value>
   </data>
   <data name="comBoxTestMode.Items" xml:space="preserve">
     <value>A</value>
@@ -853,7 +955,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;comBoxTestMode.ZOrder" xml:space="preserve">
-    <value>13</value>
+    <value>17</value>
   </data>
   <data name="btnSaveSpeedParam.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Right</value>
@@ -970,7 +1072,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;panelEx1.ZOrder" xml:space="preserve">
-    <value>14</value>
+    <value>18</value>
   </data>
   <data name="tbarTakeTrayFromNg2InputSpeed.AutoSize" type="System.Boolean, mscorlib">
     <value>False</value>
@@ -997,7 +1099,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;tbarTakeTrayFromNg2InputSpeed.ZOrder" xml:space="preserve">
-    <value>15</value>
+    <value>19</value>
   </data>
   <data name="cboxEnableTC6.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1027,7 +1129,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;cboxEnableTC6.ZOrder" xml:space="preserve">
-    <value>16</value>
+    <value>20</value>
   </data>
   <data name="cboxEnableTC4.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1057,7 +1159,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;cboxEnableTC4.ZOrder" xml:space="preserve">
-    <value>17</value>
+    <value>21</value>
   </data>
   <data name="cboxEnableTC5.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1087,7 +1189,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;cboxEnableTC5.ZOrder" xml:space="preserve">
-    <value>18</value>
+    <value>22</value>
   </data>
   <data name="cboxEnableTC3.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1117,7 +1219,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;cboxEnableTC3.ZOrder" xml:space="preserve">
-    <value>19</value>
+    <value>23</value>
   </data>
   <data name="cboxEnableTC2.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1147,7 +1249,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;cboxEnableTC2.ZOrder" xml:space="preserve">
-    <value>20</value>
+    <value>24</value>
   </data>
   <data name="cboxEnableTC1.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1177,7 +1279,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;cboxEnableTC1.ZOrder" xml:space="preserve">
-    <value>21</value>
+    <value>25</value>
   </data>
   <data name="cboxCheckVisionSwOpened.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1207,7 +1309,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;cboxCheckVisionSwOpened.ZOrder" xml:space="preserve">
-    <value>22</value>
+    <value>26</value>
   </data>
   <data name="cboxIsSimTest.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1237,7 +1339,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;cboxIsSimTest.ZOrder" xml:space="preserve">
-    <value>23</value>
+    <value>27</value>
   </data>
   <data name="cboxPrintTC6Communicate.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1267,7 +1369,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;cboxPrintTC6Communicate.ZOrder" xml:space="preserve">
-    <value>24</value>
+    <value>28</value>
   </data>
   <data name="cboxPrintTC3Communicate.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1297,7 +1399,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;cboxPrintTC3Communicate.ZOrder" xml:space="preserve">
-    <value>25</value>
+    <value>29</value>
   </data>
   <data name="cboxPrintTC5Communicate.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1327,7 +1429,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;cboxPrintTC5Communicate.ZOrder" xml:space="preserve">
-    <value>26</value>
+    <value>30</value>
   </data>
   <data name="cboxPrintTC2Communicate.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1357,7 +1459,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;cboxPrintTC2Communicate.ZOrder" xml:space="preserve">
-    <value>27</value>
+    <value>31</value>
   </data>
   <data name="cboxPrintTC4Communicate.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1387,7 +1489,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;cboxPrintTC4Communicate.ZOrder" xml:space="preserve">
-    <value>28</value>
+    <value>32</value>
   </data>
   <data name="cboxPrintTC1Communicate.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1417,7 +1519,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;cboxPrintTC1Communicate.ZOrder" xml:space="preserve">
-    <value>29</value>
+    <value>33</value>
   </data>
   <data name="cboxDisableDoor.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1447,7 +1549,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;cboxDisableDoor.ZOrder" xml:space="preserve">
-    <value>30</value>
+    <value>34</value>
   </data>
   <data name="tbarWholeSpeed.AutoSize" type="System.Boolean, mscorlib">
     <value>False</value>
@@ -1474,7 +1576,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;tbarWholeSpeed.ZOrder" xml:space="preserve">
-    <value>31</value>
+    <value>35</value>
   </data>
   <data name="label15.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1504,7 +1606,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;label15.ZOrder" xml:space="preserve">
-    <value>32</value>
+    <value>36</value>
   </data>
   <data name="lblTakeTrayFromNg2InputSpeed.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1534,7 +1636,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;lblTakeTrayFromNg2InputSpeed.ZOrder" xml:space="preserve">
-    <value>33</value>
+    <value>37</value>
   </data>
   <data name="lblWholeSpeed.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1564,7 +1666,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;lblWholeSpeed.ZOrder" xml:space="preserve">
-    <value>34</value>
+    <value>38</value>
   </data>
   <data name="label1.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1594,7 +1696,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
-    <value>35</value>
+    <value>39</value>
   </data>
   <data name="groupBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>