扫码逻辑优化

source/DeviceLibrary/storeBean/inputBean/BatchMoveBean_Partial.cs

@@ -237,6 +237,10 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             else if (MoveInfo.IsStep(StepEnum.IB11_ScanCode))
             else if (MoveInfo.IsStep(StepEnum.IB11_ScanCode))
             {
             {
+
+                if (scanTask == null || scanTask.IsCompleted)
+                {
+                    ClearWarnMsg("扫码超时");
                     //WorkLog("IB09_ScanCode");
                     //WorkLog("IB09_ScanCode");
                     MoveInfo.MoveParam = new InOutParam(new InOutPosInfo("", ""));
                     MoveInfo.MoveParam = new InOutParam(new InOutPosInfo("", ""));
                     string code = CodeManager.ProcessCode(LastCodeList);
                     string code = CodeManager.ProcessCode(LastCodeList);
@@ -264,8 +268,14 @@ namespace OnlineStore.DeviceLibrary
                         var span = DateTime.Now - MoveInfo.LastSetpTime;
                         var span = DateTime.Now - MoveInfo.LastSetpTime;
                         WorkLog("料串入料 ：扫码结束【" + code + "】，等待取料机构来取料," + MoveInfo.MoveParam.PosInfo.ToStr());
                         WorkLog("料串入料 ：扫码结束【" + code + "】，等待取料机构来取料," + MoveInfo.MoveParam.PosInfo.ToStr());
                     }
                     }
-              
-            }else if (MoveInfo.IsStep(StepEnum.IB12_BatchAxisToReelPosition))
+                }
+                else 
+                {
+                    WarnMsg = Name + "[" + MoveInfo.MoveStep + "]  扫码超时  [" + FormUtil.GetSpanStr(MoveInfo.StepSpan()) + "]";
+                    LogUtil.error(WarnMsg, 999);
+                }
+            }
+            else if (MoveInfo.IsStep(StepEnum.IB12_BatchAxisToReelPosition))
             {
             {
                 string code = CodeManager.ProcessCode(LastCodeList);
                 string code = CodeManager.ProcessCode(LastCodeList);
                 MoveInfo.NextMoveStep(StepEnum.IB13_ScanOK);
                 MoveInfo.NextMoveStep(StepEnum.IB13_ScanOK);
@@ -333,6 +343,7 @@ namespace OnlineStore.DeviceLibrary
             return false;
             return false;
         }
         }
         bool isScan = ConfigAppSettings.GetIntValue(Setting_Init.NeedScanCode).Equals(1);
         bool isScan = ConfigAppSettings.GetIntValue(Setting_Init.NeedScanCode).Equals(1);
+        private Task<List<string>> scanTask = null;
         private void IB11_ScanCode()
         private void IB11_ScanCode()
         {
         {
             ClearWarnMsg("等待旋转轴离开料串超时");
             ClearWarnMsg("等待旋转轴离开料串超时");
@@ -357,7 +368,8 @@ namespace OnlineStore.DeviceLibrary
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(6000));
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(6000));
                 try
                 try
                 {
                 {
-                    Task<List<string>> scanTask = Task.Factory.StartNew(delegate
+                    //Task<List<string>> scanTask = Task.Factory.StartNew(delegate
+                      scanTask = Task.Factory.StartNew(delegate
                     {
                     {
                         Robot.IOMove(IO_Type.CameraLed, IO_VALUE.HIGH);
                         Robot.IOMove(IO_Type.CameraLed, IO_VALUE.HIGH);
 
 
@@ -399,6 +411,7 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             else
             else
             {
             {
+                scanTask = null;
                 WorkLog("料盘移栽 ：不需要扫码");
                 WorkLog("料盘移栽 ：不需要扫码");
             }
             }