图片保存增加勾选项，增加请重写功能

source/AssemblyLineClient/FrmLineStore.cs

@@ -520,15 +520,11 @@ namespace OnlineStore.AssemblyLine
         private void timer1_Tick(object sender, EventArgs e)
         private void timer1_Tick(object sender, EventArgs e)
         {
         {
             LogM();
             LogM();
-            if (!listView1.Visible)
+            if (!this.Visible)
             {
             {
                 return;
                 return;
             }
             }
-            string canScanCode = "";
-            //if (lineBean.lineStatus.Equals(LineStatus.StoreOnline) && lineBean.runStatus.Equals(LineRunStatus.Runing))
-            //{
-            //    //canScanCode = lineBean.CanScanCode() ? "（可扫码入库）" : "（出库未完成，不可扫码入库）";
-
+            string canScanCode = "";  
             if (AgvClient.CurrCancelState)
             if (AgvClient.CurrCancelState)
             {
             {
                 aGVCancelStateToolStripMenuItem.Text = gouStr + " AGV cancelState";
                 aGVCancelStateToolStripMenuItem.Text = gouStr + " AGV cancelState";
@@ -562,7 +558,10 @@ namespace OnlineStore.AssemblyLine
                     }
                     }
                 }
                 }
             }
             }
-
+            if (!listView1.Visible)
+            {
+                return;
+            }
             lblWarnMsg.Text = warnMsg;
             lblWarnMsg.Text = warnMsg;
             int i = 0;
             int i = 0;
 
 
@@ -1163,6 +1162,18 @@ namespace OnlineStore.AssemblyLine
             LogUtil.info(Name + " 点击：" + aGVCancelStateToolStripMenuItem.Text);
             LogUtil.info(Name + " 点击：" + aGVCancelStateToolStripMenuItem.Text);
         }
         }
 
 
-       
+        private void chbSaveImage_CheckedChanged(object sender, EventArgs e)
+        {
+            if (!LoadOk)
+            {
+                return;
+            }
+            if (CodeManager.SaveImage.Equals(chbSaveImage.Checked))
+            {
+                return;
+            }
+            CodeManager.SaveImage = (chbSaveImage.Checked);
+            LogUtil.info("勾选 保存扫码图片功能：CodeManager.SaveImage =" + CodeManager.SaveImage);
+        }
     }
     }
 }
 }

source/DeviceLibrary/assemblyLine/EquipBase.cs

@@ -463,7 +463,7 @@ namespace OnlineStore.DeviceLibrary
                                     CheckAlarmProcess(moveInfo, LineAlarmType.IoSingleTimeOut);
                                     CheckAlarmProcess(moveInfo, LineAlarmType.IoSingleTimeOut);
                                 }
                                 }
                             }
                             }
-                            else if (rwSpan.TotalSeconds > 5 && span.TotalSeconds > 6 && span.TotalSeconds < LineManager.Config.IOSingle_TimerOut * 2)
+                             if (rwSpan.TotalSeconds > 5 && span.TotalSeconds > 6 && span.TotalSeconds < LineManager.Config.IOSingle_TimerOut * 2)
                             {
                             {
                                 preRWTime = DateTime.Now;
                                 preRWTime = DateTime.Now;
                                 string msg = moveInfo.Name + " [" + moveInfo.MoveType + "][" + moveInfo.MoveStep + "] " + NotOkMsg + "已等待 " + Math.Round(span.TotalSeconds, 1) + "秒，重写DO：";
                                 string msg = moveInfo.Name + " [" + moveInfo.MoveType + "][" + moveInfo.MoveStep + "] " + NotOkMsg + "已等待 " + Math.Round(span.TotalSeconds, 1) + "秒，重写DO：";

source/DeviceLibrary/deviceLibrary/halcon/CodeManager.cs

@@ -16,6 +16,7 @@ namespace OnlineStore.DeviceLibrary
 {
 {
     public class CodeManager
     public class CodeManager
     {
     {
+        public static bool SaveImage = false;
         public static List<string> codeTypeList = new List<string>();
         public static List<string> codeTypeList = new List<string>();
         public static List<string> balserNameList = new List<string>();
         public static List<string> balserNameList = new List<string>();
         public static List<string> hikNameList = new List<string>();
         public static List<string> hikNameList = new List<string>();
@@ -124,8 +125,8 @@ namespace OnlineStore.DeviceLibrary
                     bool findRightCode = false;
                     bool findRightCode = false;
                     try
                     try
                     {
                     {
-                        ho_Image = Camera._cam.CaptureOnImage(cameraName );
-                        if ( ho_Image == null)
+                        ho_Image = Camera._cam.CaptureOnImage(cameraName);
+                        if (ho_Image == null)
                         {
                         {
                             LogUtil.error(deviceName + "  【" + cameraName + "】取图片失败[" + Camera._cam.ErrInfo + "]，关闭相机");
                             LogUtil.error(deviceName + "  【" + cameraName + "】取图片失败[" + Camera._cam.ErrInfo + "]，关闭相机");
                             CloseCamera(cameraName);
                             CloseCamera(cameraName);
@@ -165,9 +166,10 @@ namespace OnlineStore.DeviceLibrary
                                 break;
                                 break;
                             }
                             }
                         }
                         }
-                        if (!findRightCode&& SaveErrorImageToFile.Equals(1))
+                        //if (!findRightCode && SaveErrorImageToFile.Equals(1))
+                        if (SaveImage)
                         {
                         {
-                           SaveImageToFile(deviceName, cameraName, ho_Image);
+                            SaveImageToFile(deviceName, cameraName, ho_Image);
                         }
                         }
                         if (deviceName != "" || r != "")
                         if (deviceName != "" || r != "")
                         {
                         {
@@ -210,7 +212,7 @@ namespace OnlineStore.DeviceLibrary
             return codeList;
             return codeList;
         }
         }
 
 
-        private static  int SaveErrorImageToFile = ConfigAppSettings.GetIntValue(Setting_Init.SaveErrorImageToFile);
+         private static  int SaveErrorImageToFile = ConfigAppSettings.GetIntValue(Setting_Init.SaveErrorImageToFile);
 
 
         private static void SaveImageToFile(string deviceName, string cameraName, HalconDotNet.HObject bitmap)
         private static void SaveImageToFile(string deviceName, string cameraName, HalconDotNet.HObject bitmap)
         {
         {