-环形线取消入库任务不禁用库位

source/DeviceLibrary/assemblyLine/HY/HY_Coveryor.cs

@@ -48,9 +48,9 @@ namespace OnlineStore.DeviceLibrary
             runStatus = LineRunStatus.HomeMoving;
             runStatus = LineRunStatus.HomeMoving;
             MoveInfo.NewMove(LineMoveType.RHome);
             MoveInfo.NewMove(LineMoveType.RHome);
             StartReset();
             StartReset();
-            //if (isDebug)
+            if (isDebug)
             {
             {
-                mainTimer.Interval = 180;
+                mainTimer.Interval = 300;
                 mainTimer.Enabled = true;
                 mainTimer.Enabled = true;
                 LogInfo("StartRun 设置 Interval=180 ，启动定时器");
                 LogInfo("StartRun 设置 Interval=180 ，启动定时器");
             }
             }
@@ -120,6 +120,11 @@ namespace OnlineStore.DeviceLibrary
                 }
                 }
                 else if (MoveInfo.IsStep(LineMoveStep.JHY_R05_ClampCheck))
                 else if (MoveInfo.IsStep(LineMoveStep.JHY_R05_ClampCheck))
                 {
                 {
+                    if (!mainTimer.Enabled)
+                    {
+                        mainTimer.Enabled = true;
+                        LogInfo("复位完成 设置 mainTimer.Enabled = true ");
+                    }
                     mainTimer.Interval = 180;
                     mainTimer.Interval = 180;
                     LogInfo("复位完成 设置 Interval=180 ");
                     LogInfo("复位完成 设置 Interval=180 ");
                     LogInfo(MoveInfo.MoveType + " 完成！");
                     LogInfo(MoveInfo.MoveType + " 完成！");

source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs

@@ -706,7 +706,7 @@ namespace OnlineStore.DeviceLibrary
                                     LogUtil.error(Name + "托盘号【" + currTrayNum + "】入库信息【" + currCode.ToStr() + "】料仓未验证成功，更新为入库NG料，从waitInStoreList中删除" + reIndex + "，取消入库任务");
                                     LogUtil.error(Name + "托盘号【" + currTrayNum + "】入库信息【" + currCode.ToStr() + "】料仓未验证成功，更新为入库NG料，从waitInStoreList中删除" + reIndex + "，取消入库任务");
                                     TrayManager.UpdateInStoreNG(currTrayNum, true, "Box验证入库失败");
                                     TrayManager.UpdateInStoreNG(currTrayNum, true, "Box验证入库失败");
                                     waitInStoreList.RemoveAt(reIndex);
                                     waitInStoreList.RemoveAt(reIndex);
-                                    SServerManager.cancelPutInTask(Name, currCode.WareCode, true);
+                                    SServerManager.cancelPutInTask(Name, currCode.WareCode, false);
                                     return false;
                                     return false;
                                 }
                                 }
                             }
                             }
@@ -715,7 +715,7 @@ namespace OnlineStore.DeviceLibrary
                         {
                         {
                             LogUtil.error(Name + "托盘信息 " + tray.ToStr() + " 与入库任务 " + currCode.ToStr() + " 不一致，从waitInStoreList中删除" + reIndex + "，取消入库任务");
                             LogUtil.error(Name + "托盘信息 " + tray.ToStr() + " 与入库任务 " + currCode.ToStr() + " 不一致，从waitInStoreList中删除" + reIndex + "，取消入库任务");
                             waitInStoreList.RemoveAt(reIndex);
                             waitInStoreList.RemoveAt(reIndex);
-                            SServerManager.cancelPutInTask(Name, currCode.WareCode, true);
+                            SServerManager.cancelPutInTask(Name, currCode.WareCode, false);
                             return false;
                             return false;
                         }
                         }
                     }
                     }