扫码超时时间修改

source/DeviceLibrary/DeviceLibrary/halcon/CodeManager.cs

@@ -173,7 +173,7 @@ namespace OnlineStore.DeviceLibrary
                             }
                             }
                             else
                             else
                             {
                             {
-                                cc = HDCodeHelper.DecodeCode(ho_Image, codeCount, GetCodeParamFilePath(codeType), codeType);
+                                cc = HDCodeHelper.DecodeCode(ho_Image, codeType, GetCodeParamFilePath(codeType), codeCount, 2000);
                             }
                             }
                             foreach (CodeInfo c in cc)
                             foreach (CodeInfo c in cc)
                             {
                             {
@@ -189,7 +189,7 @@ namespace OnlineStore.DeviceLibrary
                         {
                         {
                             //  SaveImageToFile(deviceName, cameraName, bit);
                             //  SaveImageToFile(deviceName, cameraName, bit);
                         }
                         }
-                        LogUtil.info( " 【" + cameraName + "】扫码完成【" + FormUtil.GetSpanStr(DateTime.Now - startTime) + "】 ：" + r);
+                        LogUtil.info( " 【" + cameraName + "】"+  " 扫码完成【" + FormUtil.GetSpanStr(DateTime.Now - startTime) + "】 ：" + r);
                     }
                     }
                     catch (AccessViolationException e)
                     catch (AccessViolationException e)
                     {
                     {

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs

@@ -708,9 +708,9 @@ namespace OnlineStore.DeviceLibrary
                 InStoreLog("入库：SIS_38 ，清理扫码信息，开始扫码,最多等待6000  ");
                 InStoreLog("入库：SIS_38 ，清理扫码信息，开始扫码,最多等待6000  ");
                 AutomaticBaiting.ClearInStoreInfo();
                 AutomaticBaiting.ClearInStoreInfo();
                 StoreMove.NextMoveStep(StoreMoveStep.SIS_38_ScanCode);
                 StoreMove.NextMoveStep(StoreMoveStep.SIS_38_ScanCode);
-                StoreMove.OneWaitCanEndStep = true;
                 StoreMove.WaitList.Add(WaitResultInfo.WaitCodeOK());
                 StoreMove.WaitList.Add(WaitResultInfo.WaitCodeOK());
-                StoreMove.WaitList.Add(WaitResultInfo.WaitTime(6000));
+                StoreMove.WaitList.Add(WaitResultInfo.WaitTime(9000));
+                StoreMove.OneWaitCanEndStep = true;
                 AutomaticBaiting.GetCameraCode();
                 AutomaticBaiting.GetCameraCode();
             }
             }
             else if (StoreMove.MoveStep.Equals(StoreMoveStep.SIS_38_ScanCode))
             else if (StoreMove.MoveStep.Equals(StoreMoveStep.SIS_38_ScanCode))

source/DeviceLibrary/acSingleStore/AutomaticBaiting.cs

@@ -638,8 +638,8 @@ namespace OnlineStore.DeviceLibrary
             if (IOManager.IOValue(IO_Type.TrayCheck_LoadMaterial).Equals(IO_VALUE.HIGH))
             if (IOManager.IOValue(IO_Type.TrayCheck_LoadMaterial).Equals(IO_VALUE.HIGH))
             {
             {
                 StoreMove.NextMoveStep(StoreMoveStep.AUTO_I03_ScanCode);
                 StoreMove.NextMoveStep(StoreMoveStep.AUTO_I03_ScanCode);
-                InStoreLog("  开始扫码，最多等待10000 ");
-                StoreMove.WaitList.Add(WaitResultInfo.WaitTime(10000));
+                InStoreLog("  开始扫码，最多等待9000 ");
+                StoreMove.WaitList.Add(WaitResultInfo.WaitTime(9000));
                 StoreMove.WaitList.Add(WaitResultInfo.WaitCodeOK());
                 StoreMove.WaitList.Add(WaitResultInfo.WaitCodeOK());
                 StoreMove.OneWaitCanEndStep = true;
                 StoreMove.OneWaitCanEndStep = true;
                 GetCameraCode();
                 GetCameraCode();