bug修改。入料三 托盘逻辑优化

source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs

@@ -214,8 +214,8 @@ namespace OnlineStore.DeviceLibrary
                 {
                     TimeSpan span = DateTime.Now - SecondMoveInfo.LastSetpTime;
                     //去掉延迟
-                    SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_03_Stop2Down);
-                    LogUtil.debug(Name + "托盘阻挡：" + SecondMoveInfo.SLog + "阻挡气缸上升，下降耗时（" + FormUtil.GetSpanStr(span) + "），等待SW_TrayCheck=1），最多等待30秒");
+                    SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_02_FixtureCheck);
+                    LogUtil.debug(Name + "托盘阻挡：" + SecondMoveInfo.SLog + "阻挡气缸上升，下降耗时（" + FormUtil.GetSpanStr(span) + "），等待SW_TrayCheck=1） "); 
                     SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SW_TrayCheck, IO_VALUE.HIGH));
                     //SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(30000));
                     //SecondMoveInfo.OneWaitCanEndStep = true;
@@ -228,13 +228,13 @@ namespace OnlineStore.DeviceLibrary
             //    CheckLog("托盘检测：" + SecondMoveInfo.SLog + "再次等待SW_TrayCheck=1 ："); 
             //    SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SW_TrayCheck, IO_VALUE.HIGH));  
             //}
-            //else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MIO_02_WaitFixture))
-            //{
-            //    SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_03_Stop2Down);
-            //    CheckLog("托盘检测：" + SecondMoveInfo.SLog + "阻挡气缸上升，等待SW_TrayCheck=1）");
-            //    CheckAndMove(IO_Type.SW_StopDown, IO_VALUE.LOW);
-            //    SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SW_TrayCheck, IO_VALUE.HIGH));
-            //}
+            else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MIO_02_FixtureCheck))
+            {
+                SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_03_Stop2Down);
+                CheckLog("托盘检测：" + SecondMoveInfo.SLog + "等待500再次，等待SW_TrayCheck=1）");
+                SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
+                SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SW_TrayCheck, IO_VALUE.HIGH));
+            }
             else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MIO_03_Stop2Down))
             {
                 //if (Config.SidesWayNum <= 0)

source/DeviceLibrary/deviceLibrary/halcon/CodeManager.cs

@@ -578,15 +578,6 @@ namespace OnlineStore.DeviceLibrary
                     bool findRightCode = false;
                     try
                     { 
-
-
-                        //取照片完成，先检测是否有料，有料才需要扫码，否则直接返回
-                        hasReel = EyemManager.ReelCheck(bmp);
-                        if (!hasReel)
-                        {
-                            return (false, codeList);
-                        }
-
                         LogUtil.info(deviceName + "  【" + cameraName + "】视觉识别有料【" + FormUtil.GetSpanStr(DateTime.Now - startTime) + "】，开始扫码");
 
                         ho_Image = Camera._cam.CaptureOnImage(cameraName, out bmp);
@@ -597,6 +588,13 @@ namespace OnlineStore.DeviceLibrary
                             continue;
                         } 
 
+                        //取照片完成，先检测是否有料，有料才需要扫码，否则直接返回
+                        hasReel = EyemManager.ReelCheck(bmp);
+                        if (!hasReel)
+                        {
+                            return (false, codeList);
+                        } 
+
                         string r = "";
 
                         bool eyemNoCode = false;