Merge branch 'master' of http://106.15.194.121:8083/lina/SO908-XLRStore

source/DeviceLibrary/storeBean/EquipBase.cs

@@ -333,8 +333,13 @@ namespace OnlineStore.DeviceLibrary
                         if (!wait.IsEnd)
                         {
                             TimeSpan rwSpan = DateTime.Now - preRWTime;
+                            int timeOutSeconds = StoreManager.Config.IOSingle_TimerOut;
+                            if (MoveInfo.IsStep(StepEnum.II42_WaitNoReel) || MoveInfo.IsStep(StepEnum.II62_WaitNoReel))
+                            {
+                                timeOutSeconds = 40;
+                            }
                             //一分钟还未检测到
-                            if (span.TotalSeconds > StoreManager.Config.IOSingle_TimerOut && alarmType <= AlarmType.IoSingleTimeOut)
+                            if (span.TotalSeconds > timeOutSeconds && alarmType <= AlarmType.IoSingleTimeOut)
                             {
                                 ConfigIO io = baseConfig.getWaitIO(wait.IoType);
                                 WarnMsg = moveInfo.Name + "[" + moveInfo.MoveType + "][" + moveInfo.MoveStep + "] 等待" + NotOkMsg + " 超时 " + Math.Round(span.TotalSeconds, 1) + "秒";

source/DeviceLibrary/storeBean/inputBean/InputEquip_InStore.cs

@@ -252,6 +252,7 @@ namespace OnlineStore.DeviceLibrary
                 {
                     TrayHasLeave();
                     MoveInfo.NextMoveStep(StepEnum.II42_WaitNoReel);
+                    MoveInfo.TimeOutSeconds = 60;
                     MoveLog($"入库取料{shelf}{MoveInfo.SLog}:  等待A上暂存区无料");
                     MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.UpperArea_Check_A, IO_VALUE.LOW));
                 }
@@ -271,7 +272,7 @@ namespace OnlineStore.DeviceLibrary
                     MiddleAxis.AbsMove(MoveInfo, Config.Middle_P4_AUpper, Config.Middle_P4_Speed);
                     MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.MAxis_Check_AreaA, IO_VALUE.HIGH));
                 }
-                else if (MoveInfo.IsTimeOut(20))
+                else if (MoveInfo.IsTimeOut(60))
                 {
                     MoveTimeOut(MoveInfo, "A上暂存区物料拿走");
                 }
@@ -368,7 +369,7 @@ namespace OnlineStore.DeviceLibrary
                     ClearTimeoutAlarm("B上暂存区物料拿走");
                     II63_MiddleToP5();
                 }
-                else if (MoveInfo.IsTimeOut(20))
+                else if (MoveInfo.IsTimeOut(60))
                 {
                     MoveTimeOut(MoveInfo, "B上暂存区物料拿走");
                 }