增加预扫码超时判断

source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs

@@ -846,10 +846,11 @@ namespace OnlineStore.DeviceLibrary
             InLog("料盘移栽" + MoveInfo.SLog + "：提升轴下降到料盘不溢出(" + (currPositon - Config.Height_ChangeValue * 30) + ")：" + targetPosition+"，速度"+Config.BatchAxis_P4Speed);
             InLog("料盘移栽" + MoveInfo.SLog + "：提升轴下降到料盘不溢出(" + (currPositon - Config.Height_ChangeValue * 30) + ")：" + targetPosition+"，速度"+Config.BatchAxis_P4Speed);
             BatchAxis.AbsMove(MoveInfo, targetPosition, Config.BatchAxis_P4Speed);
             BatchAxis.AbsMove(MoveInfo, targetPosition, Config.BatchAxis_P4Speed);
         }
         }
-
+        private Task YuScanTask = null;
         private void YuScanCode()
         private void YuScanCode()
         {
         {
             bool isScan = ConfigAppSettings.GetIntValue(Setting_Init.NeedScanCode).Equals(1);
             bool isScan = ConfigAppSettings.GetIntValue(Setting_Init.NeedScanCode).Equals(1);
+            YuScanTask = null;
             //TODO 此处需要等待空托盘 
             //TODO 此处需要等待空托盘 
             if (MoveInfo.ShelfNoTray.Equals(false) && isScan)
             if (MoveInfo.ShelfNoTray.Equals(false) && isScan)
             {
             {
@@ -859,7 +860,7 @@ namespace OnlineStore.DeviceLibrary
                 List<string> bijiaoList = new List<string>(LastCodeList);
                 List<string> bijiaoList = new List<string>(LastCodeList);
                 try
                 try
                 {
                 {
-                    Task<List<string>> scanTask = Task.Factory.StartNew(delegate
+                    YuScanTask = Task.Factory.StartNew(delegate
                     { 
                     { 
                         Thread.Sleep(100);
                         Thread.Sleep(100);
                         NextCodeList = CodeManager.CameraScan(Config.GetCameraList(), Name.Trim()+"预扫码");
                         NextCodeList = CodeManager.CameraScan(Config.GetCameraList(), Name.Trim()+"预扫码");
@@ -916,6 +917,9 @@ namespace OnlineStore.DeviceLibrary
         {
         {
             if (CylinderIsOk(IO_Type.SL_MoveCylinder_Take, IO_Type.SL_MoveCylinder_Give))
             if (CylinderIsOk(IO_Type.SL_MoveCylinder_Take, IO_Type.SL_MoveCylinder_Give))
             {
             {
+                if (YuScanTask == null || YuScanTask.IsCompleted)
+                {
+                    ClearTimeoutAlarm("预扫码结束超时");
                     MoveInfo.NextMoveStep(LineMoveStep.FI_18_ScanCode);
                     MoveInfo.NextMoveStep(LineMoveStep.FI_18_ScanCode);
                     bool isScan = ConfigAppSettings.GetIntValue(Setting_Init.NeedScanCode).Equals(1);
                     bool isScan = ConfigAppSettings.GetIntValue(Setting_Init.NeedScanCode).Equals(1);
 
 
@@ -965,6 +969,11 @@ namespace OnlineStore.DeviceLibrary
                         InLog("料盘移栽" + MoveInfo.SLog + "：不需要扫码");
                         InLog("料盘移栽" + MoveInfo.SLog + "：不需要扫码");
                     }
                     }
                 }
                 }
+                else if (MoveInfo.IsTimeOut(60))
+                {
+                    MoveTimeOut(MoveInfo, "预扫码结束超时");
+                }
+            }
             else
             else
             {
             {
                 FI_17_CylinderGive();
                 FI_17_CylinderGive();