扫码保存图片修改，横移逻辑修改

source/DeviceLibrary/assemblyLine/HY/HY_C1Line.cs

@@ -148,6 +148,7 @@ namespace OnlineStore.DeviceLibrary
             //判断流水线打开了才可以运行 
             //判断流水线打开了才可以运行 
             if (!MoveStop)
             if (!MoveStop)
             {
             {
+                stopWatchCheck();
                 if (MoveInfo.MoveType.Equals(LineMoveType.None))
                 if (MoveInfo.MoveType.Equals(LineMoveType.None))
                 {
                 {
                     if (LineManager.Line.CanProcessLine())
                     if (LineManager.Line.CanProcessLine())
@@ -185,39 +186,43 @@ namespace OnlineStore.DeviceLibrary
         private object lockObj = "";
         private object lockObj = "";
 
 
         private bool  preTrayIsC1Line = false;
         private bool  preTrayIsC1Line = false;
+
+        private void stopWatchCheck()
+        {
+            if (IOValue(IO_Type.HY_TrayCheck).Equals(IO_VALUE.HIGH))
+            {
+                trayCheckLowWait.Stop();
+                CheckStopWatch(trayCheckWait, 30000, false);
+            }
+            else
+            {
+                trayCheckWait.Stop();
+                CheckStopWatch(trayCheckLowWait, 30000, false);
+            }
+            if (Config.DIList.ContainsKey(IO_Type.HY_FrontStopCheck) && IOValue(IO_Type.HY_FrontStopCheck).Equals(IO_VALUE.HIGH))
+            {
+                CheckStopWatch(frontTrayCheckWait, 30000, false);
+            }
+            else
+            {
+                frontTrayCheckWait.Stop();
+            }
+            if (Config.DIList.ContainsKey(IO_Type.HY_OL_Tray_Check) && IOValue(IO_Type.HY_OL_Tray_Check).Equals(IO_VALUE.HIGH))
+            {
+                CheckStopWatch(olcheckWatch, 30000, false);
+            }
+            else
+            {
+                olcheckWatch.Stop();
+            }
+        }
+     
         private void CheckFixture()
         private void CheckFixture()
         {
         {
             if (Monitor.TryEnter(lockObj, 100))
             if (Monitor.TryEnter(lockObj, 100))
             {
             {
                 try
                 try
-                {
-                    if (IOValue(IO_Type.HY_TrayCheck).Equals(IO_VALUE.HIGH))
-                    {
-                        trayCheckLowWait.Stop();
-                        CheckStopWatch(trayCheckWait, 30000, false);
-                    }
-                    else
-                    {
-                        trayCheckWait.Stop();
-                        CheckStopWatch(trayCheckLowWait, 30000, false);
-                    }
-                    if (Config.DIList.ContainsKey(IO_Type.HY_FrontStopCheck) && IOValue(IO_Type.HY_FrontStopCheck).Equals(IO_VALUE.HIGH))
-                    {
-                        CheckStopWatch(frontTrayCheckWait, 30000, false);
-                    }
-                    else
-                    {
-                        frontTrayCheckWait.Stop();
-                    }
-                    if (Config.DIList.ContainsKey(IO_Type.HY_OL_Tray_Check) && IOValue(IO_Type.HY_OL_Tray_Check).Equals(IO_VALUE.HIGH))
-                    {
-                        CheckStopWatch(olcheckWatch, 30000, false);
-                    }
-                    else
-                    {
-                        olcheckWatch.Stop();
-                    }
-
+                { 
                     if (MoveInfo.MoveType.Equals(LineMoveType.None).Equals(false))
                     if (MoveInfo.MoveType.Equals(LineMoveType.None).Equals(false))
                     {
                     {
                         LogUtil.error(Name + "  CheckFixture " + " 不在空闲中，直接返回 ");
                         LogUtil.error(Name + "  CheckFixture " + " 不在空闲中，直接返回 ");
@@ -791,6 +796,11 @@ namespace OnlineStore.DeviceLibrary
                 CheckLog(" 结束托盘处理 ");
                 CheckLog(" 结束托盘处理 ");
                 ClearTrayRFID();
                 ClearTrayRFID();
                 MoveEndS();
                 MoveEndS();
+
+                if (frontTrayCheckWait.ElapsedMilliseconds > 2000)
+                {
+                    CheckFixture();
+                }
             }
             }
 
 
             #endregion
             #endregion

source/DeviceLibrary/deviceLibrary/halcon/CodeManager.cs

@@ -189,9 +189,16 @@ namespace OnlineStore.DeviceLibrary
                             }
                             }
                         }
                         }
                         //if (!findRightCode && SaveErrorImageToFile.Equals(1))
                         //if (!findRightCode && SaveErrorImageToFile.Equals(1))
-                        if ( !findRightCode)
+                        if (  (!findRightCode) || eyemNoCode)
                         {
                         {
-                            SaveImageToFile(deviceName, cameraName + (eyemNoCode ? "eyem" : ""), bmp);
+                            //如果halcon没扫出的，
+                            string nameStr = "";
+                            if (findRightCode && eyemNoCode)
+                            {
+                                nameStr = "eyem";
+                            }
+
+                            SaveImageToFile(deviceName, cameraName + nameStr, bmp);
                         }
                         }
                         if (deviceName != "" || r != "")
                         if (deviceName != "" || r != "")
                         {
                         {