IO断开时急停

source/DeviceLibrary/LineConfig/Config_FeedingEquip_1.csv

@@ -6,6 +6,7 @@ PRO,0,对应的横移模块,SidesWayNum,1,,,,,
 PRO,0,是否是用来出料,IsCanOut,0,,,,,
 PRO,0,是否是用来出料,IsCanOut,0,,,,,
 PRO,0,上料流水线入口AGV小车站号名称,AgvInName,C5,,,,,
 PRO,0,上料流水线入口AGV小车站号名称,AgvInName,C5,,,,,
 PRO,0,上料流水线出口AGV小车站号名称,AgvOutName,C6,,,,,
 PRO,0,上料流水线出口AGV小车站号名称,AgvOutName,C6,,,,,
+PRO,0,最后一盘料补充高度（mm）,LastReel_AHeight,5,,,,,
 ,,,,,,,,,
 ,,,,,,,,,
 AXIS,0,轴二提升上料轴,Batch_Axis,1,COM1,0,,,
 AXIS,0,轴二提升上料轴,Batch_Axis,1,COM1,0,,,
 PRO,0,提升上料轴上升待机点 P1,BatchAxisP1,6504500,,,,,
 PRO,0,提升上料轴上升待机点 P1,BatchAxisP1,6504500,,,,,

source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs

@@ -911,9 +911,10 @@ namespace OnlineStore.DeviceLibrary
                 else
                 else
                 {
                 {
                     SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_01_StopDownWait);
                     SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_01_StopDownWait);
-                    CheckLog("托盘阻挡" + SecondMoveInfo.SLog + "   前阻挡检测消失后再等待300ms上升阻挡,最多等待5秒");
-                    //SecondMoveInfo.OneWaitCanEndStep = true;
+                    CheckLog("托盘阻挡" + SecondMoveInfo.SLog + "   再次等待前阻挡检测消失或托盘到达");
+                    SecondMoveInfo.OneWaitCanEndStep = true;
                     SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Check1, IO_VALUE.LOW));
                     SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Check1, IO_VALUE.LOW));
+                    SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Check2, IO_VALUE.HIGH));
                     //SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(30000));
                     //SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(30000));
                 }
                 }
             }
             }

source/DeviceLibrary/deviceLibrary/IO/AIOBOX/AIOBOXManager.cs

@@ -386,7 +386,7 @@ namespace OnlineStore.DeviceLibrary
             try
             try
             {
             {
                 AIOBOX aioBox = getAIO(ioIp);
                 AIOBOX aioBox = getAIO(ioIp);
-                if (aioBox != null)
+                if (aioBox != null && aioBox.IsConn)
                 {
                 {
                     Box_Sta[] allDi = aioBox.ReadDI(0, LineManager.Config.GetDILength(ioIp));
                     Box_Sta[] allDi = aioBox.ReadDI(0, LineManager.Config.GetDILength(ioIp));
                     UpdateAllDI(ioIp, allDi);
                     UpdateAllDI(ioIp, allDi);
@@ -402,7 +402,7 @@ namespace OnlineStore.DeviceLibrary
             try
             try
             {
             {
                 AIOBOX aioBox = getAIO(ioIp);
                 AIOBOX aioBox = getAIO(ioIp);
-                if (aioBox != null)
+                if (aioBox != null && aioBox.IsConn)
                 {
                 {
                     // int startIndex = StoreManager.Config.GetDILength(ioIp);
                     // int startIndex = StoreManager.Config.GetDILength(ioIp);
                     Box_Sta[] allDO = aioBox.ReadDO(0, LineManager.Config.GetDOLength(ioIp));
                     Box_Sta[] allDO = aioBox.ReadDO(0, LineManager.Config.GetDOLength(ioIp));
@@ -416,7 +416,11 @@ namespace OnlineStore.DeviceLibrary
         }
         }
         public override IO_VALUE GetDOValue(string ioIP, byte slaveId, ushort StartAddress)
         public override IO_VALUE GetDOValue(string ioIP, byte slaveId, ushort StartAddress)
         {
         {
-            IO_VALUE value = IO_VALUE.None;
+            IO_VALUE value = IO_VALUE.LOW;
+            if (!IsConnect(ioIP))
+            {
+                return value;
+            }
             try
             try
             {
             {
                 AIOBOX aioBox = getAIO(ioIP);
                 AIOBOX aioBox = getAIO(ioIP);
@@ -448,7 +452,11 @@ namespace OnlineStore.DeviceLibrary
 
 
         public override IO_VALUE GetDIValue(string ioIP, byte slaveId, ushort StartAddress)
         public override IO_VALUE GetDIValue(string ioIP, byte slaveId, ushort StartAddress)
         {
         {
-            IO_VALUE value = IO_VALUE.None;
+            IO_VALUE value = IO_VALUE.LOW;
+            if (!IsConnect(ioIP))
+            {
+                return value;
+            }
             for (int i = 1; i <= 3; i++)
             for (int i = 1; i <= 3; i++)
             {
             {
                 try
                 try