bug修改

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs

@@ -165,7 +165,16 @@ namespace OnlineStore.DeviceLibrary
                     {
                         timeOutMs = 650000;
                     }
-                   
+                    if (!wait.IsEnd && span.TotalSeconds > 2 && wait.IoType.Equals(IO_Type.SuckingDisc_Air))
+                    {
+                        string ioType = IO_Type.SuckingDisc_Work;
+                        IO_VALUE doValue = IOManager.DOValue(ioType);
+                        if (!doValue.Equals(wait.IoValue))
+                        {
+                            LogUtil.error("等待[" + NotOkMsg + "]，重写DO（" + ioType + "=" + wait.IoValue + "）");
+                            IOManager.IOMove(ioType, wait.IoValue); 
+                        }
+                    }
                     if ((!wait.IsEnd) && span.TotalMilliseconds > timeOutMs)
                     {
                         ConfigIO io = Config.getWaitIO(wait.IoType);

source/DeviceLibrary/acSingleStore/AutomaticBaiting_Partial.cs

@@ -107,12 +107,14 @@ namespace OnlineStore.DeviceLibrary
                         //    ConfigIO io = StoreManager.Config.getWaitIO(wait.IoType);
                         //    WarnMsg = "[" + StoreMove.MoveStep + "] 等待[" + io.ElectricalDefinition + "_" + io.Explain + "=" + wait.IoValue + "]超时";
                         //    StoreManager.Store.Alarm(StoreAlarmType.BatchIoTimeOut, io.ElectricalDefinition, WarnMsg, StoreMove.MoveType);
-                        //    LogUtil.error(WarnMsg,101);
+                        //    LogUtil.error(WarnMsg, 101);
                         //    isOk = false;
                         //    break;
                         //}
                         //如果是气缸动作，若Do未输出，重新写一遍
-                        if (!wait.IsEnd && span.TotalSeconds > 1 && (wait.IoType.Equals(IO_Type.SuckingDisc_Down) || wait.IoType.Equals(IO_Type.SuckingDisc_Up)))
+                        if (!wait.IsEnd && span.TotalSeconds > 2)
+                        {
+                            if (wait.IoType.Equals(IO_Type.SuckingDisc_Down) || wait.IoType.Equals(IO_Type.SuckingDisc_Up))
                             {
                                 IO_VALUE doValue = IOManager.DOValue(wait.IoType);
                                 if (!doValue.Equals(wait.IoValue))
@@ -124,6 +126,16 @@ namespace OnlineStore.DeviceLibrary
                                     LogUtil.error("等待[" + wait.ToStr() + "]，重写气缸DO（" + ioType + "=" + ioValue + "）");
                                     IOManager.IOMove(ioType, ioValue);
                                 }
+                            }else if (wait.IoType.Equals(IO_Type.SuckingDisc_Air))
+                            {
+                                string ioType = IO_Type.SuckingDisc_Work;
+                                IO_VALUE doValue = IOManager.DOValue(ioType);
+                                if (!doValue.Equals(wait.IoValue))
+                                {
+                                    LogUtil.error("等待[" + NotOkMsg + "]，重写DO（" + ioType + "=" + wait.IoValue + "）");
+                                    IOManager.IOMove(ioType, wait.IoValue);
+                                }
+                            }
                         }
                     }
                     else if (wait.WaitType == (int)Wait_Type.Time_3)
@@ -278,7 +290,7 @@ namespace OnlineStore.DeviceLibrary
                     {  //判断是否需要重新运动 
                         StoreMove.CanWhileCount--;
                         LogUtil.error(wait.ToStr() + " 未收到信号且停止运动，重新匀速" + StoreManager.Config.BatchAxis_SlowSpeed + "运动，剩余[" + StoreMove.CanWhileCount + "]次");
-                        ACServerManager.SuddenStop(wait.AxisInfo);
+                        ACServerManager.SuddenStop(wait.AxisInfo.DeviceName,wait.AxisInfo.GetAxisValue());
                         Thread.Sleep(2000);
                         ACServerManager.SpeedMove(wait.AxisInfo.DeviceName, wait.AxisInfo.GetAxisValue(), StoreManager.Config.BatchAxis_SlowSpeed);
                     }

source/DeviceLibrary/store/AC_Store.cs

@@ -375,7 +375,7 @@ namespace OnlineStore.DeviceLibrary
                     {
                         LogUtil.error(LOGGER, moveAxis.DisplayStr + "目标位置[" + targetPosition + "]当前位置[" + outCount +
                          "]，误差过大，重新开始运动，剩余[" + StoreMove.CanWhileCount + "]次");
-                        ACServerManager.SuddenStop(moveAxis);
+                        ACServerManager.SuddenStop(moveAxis.DeviceName,moveAxis.GetAxisValue());
                         Thread.Sleep(2000);
                         ACServerManager.AbsMove(moveAxis.DeviceName, moveAxis.GetAxisValue(), targetPosition, targetSpeed);
                         StoreMove.CanWhileCount--;