扫码超时配置

source/Common/Setting_Init.cs

@@ -39,7 +39,7 @@ namespace OnlineStore.Common
         /// 需要识别的二维码类型，多个中间使用#分割
         /// 需要识别的二维码类型，多个中间使用#分割
         /// </summary>
         /// </summary>
         public static string CodeType = "CodeType";
         public static string CodeType = "CodeType";
-
+        public static string CodeTimeOut = "CodeTimeOut";
 
 
         /// <summary>
         /// <summary>
         /// 配置文件路径  Data Matrix ECC 200.dcm
         /// 配置文件路径  Data Matrix ECC 200.dcm

source/DeviceLibrary/deviceLibrary/halcon/CodeManager.cs

@@ -99,8 +99,9 @@ namespace OnlineStore.DeviceLibrary
         {
         {
             Camera._cam.CloseAll();
             Camera._cam.CloseAll();
         }
         }
-        public static List<string> CameraScan(string cameraName, string deviceName, bool findRightCodeBreak = false, int timeOut = 1500)
+        public static List<string> CameraScan(string cameraName, string deviceName, bool findRightCodeBreak = false)
         {
         {
+            int timeOut = ConfigAppSettings.GetIntValue(Setting_Init.CodeTimeOut,6000);
             List<string> nameList = new List<string>() { cameraName };
             List<string> nameList = new List<string>() { cameraName };
             return CameraScan(nameList, deviceName, findRightCodeBreak, timeOut);
             return CameraScan(nameList, deviceName, findRightCodeBreak, timeOut);
         }
         }

source/DeviceLibrary/storeBean/inputBean/BatchMoveBean_Partial.cs

@@ -366,7 +366,7 @@ namespace OnlineStore.DeviceLibrary
                 WorkLog("料盘移栽 ：开始扫码");
                 WorkLog("料盘移栽 ：开始扫码");
                 MoveInfo.OneWaitCanEndStep = true;
                 MoveInfo.OneWaitCanEndStep = true;
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitFeedScanCode());
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitFeedScanCode());
-                MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(6000));
+                MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(60000));
                 try
                 try
                 {
                 {
                     //Task<List<string>> scanTask = Task.Factory.StartNew(delegate
                     //Task<List<string>> scanTask = Task.Factory.StartNew(delegate