扫码逻辑优化

source/DeviceLibrary/storeBean/inputBean/BatchMoveBean_Partial.cs

@@ -233,39 +233,49 @@ namespace OnlineStore.DeviceLibrary
                 else if (MoveInfo.IsTimeOut(10))
                 else if (MoveInfo.IsTimeOut(10))
                 {
                 {
                     WarnMsg = Name + "[" + MoveInfo.MoveStep + "] " + "等待旋转轴离开料串超时" + "[" + FormUtil.GetSpanStr(MoveInfo.StepSpan()) + "]";
                     WarnMsg = Name + "[" + MoveInfo.MoveStep + "] " + "等待旋转轴离开料串超时" + "[" + FormUtil.GetSpanStr(MoveInfo.StepSpan()) + "]";
-                } 
+                }
             }
             }
             else if (MoveInfo.IsStep(StepEnum.IB11_ScanCode))
             else if (MoveInfo.IsStep(StepEnum.IB11_ScanCode))
             {
             {
-                //WorkLog("IB09_ScanCode");
-                MoveInfo.MoveParam = new InOutParam(new InOutPosInfo("", ""));
-                string code = CodeManager.ProcessCode(LastCodeList);
-                MoveInfo.MoveParam.PosInfo.barcode = code;
-                MoveInfo.MoveParam.PosInfo.rfid = CurrShelf.ShelfRfid;
-                if (String.IsNullOrEmpty(code))
+
+                if (scanTask == null || scanTask.IsCompleted)
                 {
                 {
-                    MoveInfo.MoveParam.PosInfo.IsNG = true;
-                    MoveInfo.MoveParam.PosInfo.NgMsg = "无有效条码NG";
-                    WorkLog(" 无有效条码NG，需要放入NG箱：" + MoveInfo.MoveParam.PosInfo.ToStr());
-                }
+                    ClearWarnMsg("扫码超时");
+                    //WorkLog("IB09_ScanCode");
+                    MoveInfo.MoveParam = new InOutParam(new InOutPosInfo("", ""));
+                    string code = CodeManager.ProcessCode(LastCodeList);
+                    MoveInfo.MoveParam.PosInfo.barcode = code;
+                    MoveInfo.MoveParam.PosInfo.rfid = CurrShelf.ShelfRfid;
+                    if (String.IsNullOrEmpty(code))
+                    {
+                        MoveInfo.MoveParam.PosInfo.IsNG = true;
+                        MoveInfo.MoveParam.PosInfo.NgMsg = "无有效条码NG";
+                        WorkLog(" 无有效条码NG，需要放入NG箱：" + MoveInfo.MoveParam.PosInfo.ToStr());
+                    }
 
 
 
 
-                //如果之前走到了扫码点，需要下降
-                if (toBatchP4)
-                {
-                    MoveInfo.NextMoveStep(StepEnum.IB12_BatchAxisToReelPosition);
-                    MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
-                    BatchAxis.AbsMove(MoveInfo, batchAxisReelPosition, Robot.Config.BatchAxis_P4Speed);
-                    WorkLog("扫码结束，扫码前走到了扫码点【" + Config.BatchAxisP4 + "】，批量轴需要返回之前位置【" + batchAxisReelPosition + "】");
+                    //如果之前走到了扫码点，需要下降
+                    if (toBatchP4)
+                    {
+                        MoveInfo.NextMoveStep(StepEnum.IB12_BatchAxisToReelPosition);
+                        MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
+                        BatchAxis.AbsMove(MoveInfo, batchAxisReelPosition, Robot.Config.BatchAxis_P4Speed);
+                        WorkLog("扫码结束，扫码前走到了扫码点【" + Config.BatchAxisP4 + "】，批量轴需要返回之前位置【" + batchAxisReelPosition + "】");
+                    }
+                    else
+                    {
+                        MoveInfo.NextMoveStep(StepEnum.IB13_ScanOK);
+                        var span = DateTime.Now - MoveInfo.LastSetpTime;
+                        WorkLog("料串入料 ：扫码结束【" + code + "】，等待取料机构来取料," + MoveInfo.MoveParam.PosInfo.ToStr());
+                    }
                 }
                 }
-                else
+                else 
                 {
                 {
-                    MoveInfo.NextMoveStep(StepEnum.IB13_ScanOK);
-                    var span = DateTime.Now - MoveInfo.LastSetpTime;
-                    WorkLog("料串入料 ：扫码结束【" + code + "】，等待取料机构来取料," + MoveInfo.MoveParam.PosInfo.ToStr());
+                    WarnMsg = Name + "[" + MoveInfo.MoveStep + "]  扫码超时  [" + FormUtil.GetSpanStr(MoveInfo.StepSpan()) + "]";
+                    LogUtil.error(WarnMsg, 999);
                 }
                 }
-              
-            }else if (MoveInfo.IsStep(StepEnum.IB12_BatchAxisToReelPosition))
+            }
+            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("料盘移栽 ：不需要扫码");
             }
             }