出库等待改为30秒

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs

@@ -124,11 +124,11 @@ namespace OnlineStore.DeviceLibrary
                     string msg = "";
                     if (wait.IsHomeMove)
                     {
-                        wait.IsEnd = ACHomeMoveIsEnd(wait.AxisInfo, out msg); 
+                        wait.IsEnd = ACHomeMoveIsEnd(wait.AxisInfo, out msg);
                     }
                     else
                     {
-                        wait.IsEnd = ACAxisMoveIsEnd(wait.AxisInfo, wait.TargetPosition, wait.TargetSpeed, out msg); 
+                        wait.IsEnd = ACAxisMoveIsEnd(wait.AxisInfo, wait.TargetPosition, wait.TargetSpeed, out msg);
                     }
                     if (!msg.Equals(""))
                     {
@@ -141,7 +141,12 @@ namespace OnlineStore.DeviceLibrary
                 else if (wait.WaitType == 2)
                 {
                     wait.IsEnd = KNDIOValue(wait.IoType).Equals(wait.IoValue);
-                    if ((!wait.IsEnd) && span.TotalMilliseconds > Config.IOSingle_TimerOut)
+                    int timeOutMs = Config.IOSingle_TimerOut;
+                    if (StoreMove.MoveStep == StoreMoveStep.SO_14_WaitTake)
+                    {
+                        timeOutMs = 35000;
+                    }
+                    if ((!wait.IsEnd) && span.TotalMilliseconds > timeOutMs)
                     {
                         ConfigIO io = Config.getWaitIO(wait.IoType);
                         WarnMsg = StoreName + " 等待信号" + io.DisplayStr + "=" + wait.IoValue + "超时！";
@@ -153,17 +158,17 @@ namespace OnlineStore.DeviceLibrary
                 }
                 else if (wait.WaitType == 3)
                 {
-                    wait.IsEnd = span.TotalMilliseconds >= wait.TimeMSeconds;
+                    wait.IsEnd = (span.TotalMilliseconds >= wait.TimeMSeconds);
                 }
                 else if (wait.WaitType == 5)
                 {
                     if (wait.IsHomeMove)
                     {
-                        wait.IsEnd = ShuoKeControls.IsHomeMoveEnd(wait.SlvAddr, StoreMove.LastSetpTime); 
+                        wait.IsEnd = ShuoKeControls.IsHomeMoveEnd(wait.SlvAddr, StoreMove.LastSetpTime);
                     }
                     else
                     {
-                        wait.IsEnd = ShuoKeControls.IsMoveEnd(wait.SlvAddr, StoreMove.LastSetpTime); 
+                        wait.IsEnd = ShuoKeControls.IsMoveEnd(wait.SlvAddr, StoreMove.LastSetpTime);
                     }
                     if (!wait.IsEnd)
                     {
@@ -664,8 +669,8 @@ namespace OnlineStore.DeviceLibrary
             else if (StoreMove.MoveStep == StoreMoveStep.SO_13_GoBack)
             {
                 StoreMove.NextMoveStep(StoreMoveStep.SO_14_WaitTake);
-                OutStoreLog("出库：SO_14_WaitTake 等待拿走物品，最多等待10秒");
-                StoreMove.WaitList.Add(WaitResultInfo.WaitTime(10000));
+                OutStoreLog("出库：SO_14_WaitTake 等待拿走物品，最多等待30秒");
+                StoreMove.WaitList.Add(WaitResultInfo.WaitTime(30000));
                 StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.LOW));
                 StoreMove.OneWaitCanEndStep = true;
             }

source/DeviceLibrary/store/model/StoreMoveInfo.cs

@@ -17,7 +17,7 @@ namespace OnlineStore.DeviceLibrary
         /// <summary>
         /// 超时时间
         /// </summary>
-        public int TimeOutSeconds = 300;
+        public int TimeOutSeconds = 60;
         public StoreMoveInfo(int storeId)
         {
             moveType = StoreMoveType.None;