0126

source/DeviceLibrary/doubleLine/DoubleLineBean_lineShelf.cs

@@ -63,8 +63,8 @@ namespace OnlineStore.DeviceLibrary
 
             if (IOValue(IO_Type.RHigh_StopCheck2).Equals(IO_VALUE.LOW) &&
                 IOValue(IO_Type.RHigh_StopCylinder2).Equals(IO_VALUE.LOW) &&
-                IOValue(IO_Type.RHigh_StopCheck1).Equals(IO_VALUE.HIGH) &&
-                IOValue(IO_Type.RHigh_LineRun).Equals(IO_VALUE.LOW) && RHighProcess.Equals(false)
+                IOValue(IO_Type.RHigh_StopCheck1).Equals(IO_VALUE.HIGH)
+                 && RHighProcess.Equals(false)
                  )
             {
                 if (LineManager.checkWatch(rhighWatch, 3000))

source/DeviceLibrary/packageLine/PackageLine_BenQInShelf.cs

@@ -182,7 +182,7 @@ namespace OnlineStore.DeviceLibrary
                     benQInFromOutStep.Msg = "料架到达右侧提升机上层，准备送出料架";
                     benQInFromOutStep.AddIoWait(IO_Type.R_LeftStopCheck, IO_VALUE.LOW, 5000);
                     benQInFromOutStep.AddIoWait(IO_Type.R_RightStopCheck, IO_VALUE.LOW, 5000);
-                    benQInFromOutStep.AddIoWait(IO_Type.RHigh_FullCheck, IO_VALUE.HIGH, 5000);
+                    benQInFromOutStep.AddIoWait(IO_Type.RHigh_FullCheck, IO_VALUE.HIGH);
                     CheckAndMove(IO_Type.RHigh_LineRun, IO_VALUE.HIGH);//右侧上层链条运行
                     CheckAndMove(IO_Type.R_OutLineBackRun, IO_VALUE.HIGH);
                     IOMove(IO_Type.R_RightStopCylinder, IO_VALUE.HIGH, 5000);
@@ -193,7 +193,7 @@ namespace OnlineStore.DeviceLibrary
             else if (benQInFromOutStep.IsStep(BenQ_IN_FROM_OUT_STEP.SHELF_ENTER))
             {
                 bool noShelf = IOManager.IOValue(IO_Type.R_LeftStopCheck).Equals(IO_VALUE.LOW) && 
-                    IOManager.IOValue(IO_Type.R_RightStopCheck).Equals(IO_VALUE.LOW) && IOManager.IOValue(IO_Type.RHigh_FullCheck).Equals(IO_VALUE.HIGH);
+                    IOManager.IOValue(IO_Type.R_RightStopCheck).Equals(IO_VALUE.LOW);
                 if (noShelf && benQInFromOutStep.IsFinished())//料盘进入完成
                 {
                     IOMove(IO_Type.R_RightStopCylinder, IO_VALUE.LOW);
@@ -206,11 +206,12 @@ namespace OnlineStore.DeviceLibrary
                     CylinderMove(MoveInfo, IO_Type.R_Updown_Up, IO_Type.R_Updown_Down);
                     benQInFromOutStep.AddTimeWait(5000);
                 }
-                else
+                else if(benQInFromOutStep.IsTimeOut(10000))
                 {
                     KeepLineRun(IO_Type.RHigh_LineRun);
-                    CheckAndMove(IO_Type.R_RightStopCylinder, IO_VALUE.HIGH);
-                    CheckAndMove(IO_Type.R_LeftStopCylinder, IO_VALUE.HIGH);
+                    CheckAndMove(IO_Type.R_OutLineBackRun, IO_VALUE.HIGH);
+                    IOMove(IO_Type.R_RightStopCylinder, IO_VALUE.HIGH,5000);
+                    IOMove(IO_Type.R_LeftStopCylinder, IO_VALUE.HIGH,5000);
                 }
             }
             else if (benQInFromOutStep.IsStep(BenQ_IN_FROM_OUT_STEP.SHELF_DOWN))