SO_23_WaitNoTray 等待仓门口无料的超时改为1天

source/ACServoDriveTest/FrmACTest.cs

@@ -175,8 +175,9 @@ namespace ACServoDriveTest
 
         private void btnAbsMove_Click(object sender, EventArgs e)
         {
+            int speed = Convert.ToInt32(txtSpeed.Text);
             int position = Convert.ToInt32(txtPosition.Text.Trim(), 10);
-            ACServerManager.AbsMove(GetPortName(), GetSlaveAddr(), position);
+            ACServerManager.AbsMove(GetPortName(), GetSlaveAddr(), position,speed);
         }
         private void btnSend_Click(object sender, EventArgs e)
         {

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs

@@ -37,6 +37,7 @@ namespace OnlineStore.DeviceLibrary
         private int CurrInOutCount = 0;
         private int CurrInOutACount = 0;
 
+        int oneDay = 24 * 60 * 60;
         private bool LoadParamPosition(InOutParam param)
         {
             if (param == null)
@@ -180,22 +181,27 @@ namespace OnlineStore.DeviceLibrary
                 else if (wait.WaitType == 2)
                 {
                     wait.IsEnd = IOManager.IOValue(wait.IoType).Equals(wait.IoValue);
-                    int timeOutMs = Config.IOSingle_TimerOut;
+                    //转为秒
+                    int timeOutMs = Config.IOSingle_TimerOut/1000;
                     if (StoreMove.MoveStep.Equals(StoreMoveStep.SO_31_WaitTake))
                     {
-                        timeOutMs = 650000;
+                        timeOutMs = 650000 / 1000;
                     }
                     else if (StoreMove.MoveStep.Equals(StoreMoveStep.SO_29_CheckTray)
                         || StoreMove.MoveStep.Equals(StoreMoveStep.SO_22_WaitTray)
                         ||StoreMove.MoveStep.Equals(StoreMoveStep.SO_27_WaitDoorTray))
                     {
-                        timeOutMs = 5000;
+                        timeOutMs = 5000 / 1000;
                     }
                     if (StoreMove.MoveStep.Equals(StoreMoveStep.SC_03_MoveToHBag))
                     {
-                        timeOutMs = 20000;
+                        timeOutMs = 20000 / 1000;
                     }
-                    if ((!wait.IsEnd) && span.TotalMilliseconds > timeOutMs)
+                    if (StoreMove.MoveStep.Equals(StoreMoveStep.SO_23_WaitNoTray)&& wait.IoType.Equals(IO_Type.TrayCheck_Door))
+                    {
+                        timeOutMs = oneDay;
+                    }
+                    if ((!wait.IsEnd) && span.TotalSeconds > timeOutMs)
                     {
                         ConfigIO io = Config.getWaitIO(wait.IoType);
                         string msg = StoreName + "[" + StoreMove.MoveType + "][" + StoreMove.MoveStep + "] 等待" + io.DisplayStr + "=" + wait.IoValue + "超时 ";
@@ -845,16 +851,19 @@ namespace OnlineStore.DeviceLibrary
                 else
                 {
                     StoreMove.NextMoveStep(StoreMoveStep.SO_23_WaitNoTray);
-                    OutStoreLog("出库：打开仓门，等待门口无料盘信号 ");
+
+                    OutStoreLog("出库：打开仓门，等待门口无料盘信号，超时时间= oneDay");
                     StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.LOW));
+                    StoreMove.TimeOutSeconds = oneDay;
                     OpenDoor();
                 }
             }
             else if (StoreMove.MoveStep == StoreMoveStep.SO_22_WaitTray)
             {
                 StoreMove.NextMoveStep(StoreMoveStep.SO_23_WaitNoTray);
-                OutStoreLog("出库：打开仓门，等待门口无料盘信号 ");
+                OutStoreLog("出库：打开仓门，等待门口无料盘信号，超时时间= "+oneDay);
                 StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.LOW));
+                StoreMove.TimeOutSeconds = oneDay;
                 OpenDoor();
             }
             else if (StoreMove.MoveStep == StoreMoveStep.SO_23_WaitNoTray)