注释取出料盘上下轴上升的功能

source/ACSingleStore/记录.txt

@@ -140,6 +140,9 @@ PRO,最后一盘料需要补充的高度,LastTrayAddHeight,10,,,,,,,,,
 	20190326修改：
 	20190326修改：
 	伺服若已在原点但未回过原点，需要匀速走1500秒，再回原点
 	伺服若已在原点但未回过原点，需要匀速走1500秒，再回原点
 
 
+	20190422
+	暂时注释取出料盘上下轴上升的功能
+
 
 
 
 
 
 

source/DeviceLibrary/acSingleStore/AutomaticBaiting_Partial.cs

@@ -537,8 +537,8 @@ namespace OnlineStore.DeviceLibrary
                 if (BatchOutStoreCount > 0 && BatchOutStoreHeight > 0)
                 if (BatchOutStoreCount > 0 && BatchOutStoreHeight > 0)
                 {
                 {
                     BatchDoorOpen(false);
                     BatchDoorOpen(false);
-                    return StartOut();
-                    //return "";
+                    //return StartOut();
+                    return "";
                 }
                 }
                 else
                 else
                 {
                 {

source/DeviceLibrary/halcon/CodeManager.cs

@@ -46,7 +46,7 @@ namespace OnlineStore.DeviceLibrary
                     codeTypeList.Add(str.Trim());
                     codeTypeList.Add(str.Trim());
                 }
                 }
 
 
-                LoadCamera();
+                LoadCamera(false );
 
 
                 CodeLibrary.HDCodeLearnHelper.LoadConfig(nameStr, codeStr);
                 CodeLibrary.HDCodeLearnHelper.LoadConfig(nameStr, codeStr);
             }
             }
@@ -55,8 +55,13 @@ namespace OnlineStore.DeviceLibrary
                 LogUtil.error("解析摄像机配置出错：" + ex.ToString());
                 LogUtil.error("解析摄像机配置出错：" + ex.ToString());
             } 
             } 
         }
         }
-        private static void  LoadCamera()
+        private static void LoadCamera(bool isReLoad)
         {
         {
+            if (isReLoad)
+            {
+                CodeLibrary.HIKCamera.Instance.Load();
+                CodeLibrary.BaslerCamera.Instance.Load();
+            }
             string[] names = CodeLibrary.HIKCamera.Instance.CameraName;
             string[] names = CodeLibrary.HIKCamera.Instance.CameraName;
             hikNameList.AddRange(names);
             hikNameList.AddRange(names);
             names = CodeLibrary.BaslerCamera.Instance.CameraName;
             names = CodeLibrary.BaslerCamera.Instance.CameraName;
@@ -74,12 +79,7 @@ namespace OnlineStore.DeviceLibrary
         {
         {
             Bitmap bitm = null;
             Bitmap bitm = null;
 
 
-            //若未加载到相机，需要重新加载相机
-            if (balserNameList.Count <= 0 && hikNameList.Count <= 0)
-            {
-                LogUtil.error("获取图片时发现未加载到相机，重新加载相机");
-                LoadCamera();
-            }
+
             if (balserNameList.Contains(cameraName))
             if (balserNameList.Contains(cameraName))
             {
             {
                 BaslerCamera.Instance.Open(cameraName);
                 BaslerCamera.Instance.Open(cameraName);
@@ -87,7 +87,7 @@ namespace OnlineStore.DeviceLibrary
                 bitm = BaslerCamera.Instance.Image;
                 bitm = BaslerCamera.Instance.Image;
                 BaslerCamera.Instance.Close();
                 BaslerCamera.Instance.Close();
             }
             }
-            else if(hikNameList.Contains(cameraName))
+            else if (hikNameList.Contains(cameraName))
             {
             {
                 HIKCamera.Instance.Open(cameraName);
                 HIKCamera.Instance.Open(cameraName);
                 HIKCamera.Instance.GrabOne();
                 HIKCamera.Instance.GrabOne();
@@ -96,7 +96,13 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             else
             else
             {
             {
-                LogUtil.info("未找到摄像机【"+cameraName+"】无法获取图片");
+                LogUtil.info("未找到摄像机【" + cameraName + "】无法获取图片");
+                //若未加载到相机，需要重新加载相机
+                if (balserNameList.Count <= 0 && hikNameList.Count <= 0)
+                {
+                    LogUtil.error("获取图片时发现未加载到相机，重新加载相机");
+                    LoadCamera(true);
+                }
             }
             }
             return bitm;
             return bitm;
         }
         }