右侧提升机入空料架，正好右侧有出满料的。提升机不上升问题

source/DeviceLibrary/agvClient/AgvClient_Dbline.cs

@@ -131,7 +131,6 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             else if (name.Equals("A6"))
             else if (name.Equals("A6"))
             {
             {
-                A6_InProcess = true;
                 A6_ReadyEnter = true;
                 A6_ReadyEnter = true;
             }
             }
             LogUtil.info("收到 AgvClient_ReadyEnter [" + name + "]");
             LogUtil.info("收到 AgvClient_ReadyEnter [" + name + "]");
@@ -146,7 +145,6 @@ namespace OnlineStore.DeviceLibrary
             //SetStatus(name, "", ClientAction.ReadyLeave);
             //SetStatus(name, "", ClientAction.ReadyLeave);
             if (name.Equals("A6"))
             if (name.Equals("A6"))
             {
             {
-                A6_InProcess = true;
                 A6_ReadyLeave = true;
                 A6_ReadyLeave = true;
             }
             }
             LogUtil.info("收到 AgvClient_ReadyLeave [" + name + "] ");
             LogUtil.info("收到 AgvClient_ReadyLeave [" + name + "] ");
@@ -196,7 +194,7 @@ namespace OnlineStore.DeviceLibrary
         /// <summary>
         /// <summary>
         /// 右侧料架可以出去
         /// 右侧料架可以出去
         /// </summary>
         /// </summary>
-        public bool A6_ReadyLeave { private set; get; }
+        public bool A6_ReadyLeave { set; get; }
         public void MayEnter(string name)
         public void MayEnter(string name)
         {
         {
             SetStatus(name, "", ClientAction.MayEnter);
             SetStatus(name, "", ClientAction.MayEnter);
@@ -207,6 +205,7 @@ namespace OnlineStore.DeviceLibrary
             else if (name.Equals("A6"))
             else if (name.Equals("A6"))
             {
             {
                 A6_ReadyEnter = false;
                 A6_ReadyEnter = false;
+                A6_InProcess = true;
             }
             }
         }
         }
 
 
@@ -216,6 +215,7 @@ namespace OnlineStore.DeviceLibrary
             if (name.Equals("A6"))
             if (name.Equals("A6"))
             {
             {
                 A6_ReadyLeave = false;
                 A6_ReadyLeave = false;
+                A6_InProcess = true;
             }
             }
         }
         }
 
 

source/DeviceLibrary/packageLine/LineAGVProcess.cs

@@ -312,6 +312,7 @@ namespace OnlineStore.DeviceLibrary
                         if (isRightUpdownDown && noShelfLeft && noShelfRight)
                         if (isRightUpdownDown && noShelfLeft && noShelfRight)
                         {
                         {
                             benQOutStep.ToNextStep(BenQ_OUT_STEP.SHELF_TO_UPDOWN);
                             benQOutStep.ToNextStep(BenQ_OUT_STEP.SHELF_TO_UPDOWN);
+                            agvClient_Dbline.MayLeave("A6");
                             benQOutStep.AddIoWait(IO_Type.R_StopCylinder2, IO_VALUE.HIGH);
                             benQOutStep.AddIoWait(IO_Type.R_StopCylinder2, IO_VALUE.HIGH);
                             benQOutStep.AddIoWait(IO_Type.R_RightStopCheck, IO_VALUE.HIGH);
                             benQOutStep.AddIoWait(IO_Type.R_RightStopCheck, IO_VALUE.HIGH);
                             KeepLineRun(IO_Type.R_LineRun);
                             KeepLineRun(IO_Type.R_LineRun);
@@ -321,12 +322,12 @@ namespace OnlineStore.DeviceLibrary
                             IOMove(IO_Type.R_OutLineRun, IO_VALUE.HIGH);
                             IOMove(IO_Type.R_OutLineRun, IO_VALUE.HIGH);
                             IOMove(IO_Type.R_StopCylinder2, IO_VALUE.HIGH);
                             IOMove(IO_Type.R_StopCylinder2, IO_VALUE.HIGH);
                             benQOutStep.Msg = "AGV已到达出料口, 打开链条,准备送出料架[" + agvClient_Dbline.A6_RFID + "]";
                             benQOutStep.Msg = "AGV已到达出料口, 打开链条,准备送出料架[" + agvClient_Dbline.A6_RFID + "]";
-                            agvClient_Dbline.MayLeave("A6");
 
 
                         }
                         }
                         else
                         else
                         {
                         {
                             benQOutStep.Msg = "右侧升降机不在下方/提升机上有料，暂不送出";
                             benQOutStep.Msg = "右侧升降机不在下方/提升机上有料，暂不送出";
+                            agvClient_Dbline.A6_ReadyLeave = false;
                             benQOutStep.ToNextStep(BenQ_OUT_STEP.WAIT_AGV);
                             benQOutStep.ToNextStep(BenQ_OUT_STEP.WAIT_AGV);
                         }
                         }
                     }
                     }

source/DeviceLibrary/packageLine/PackageLine_BenQInShelf.cs

@@ -86,7 +86,7 @@ namespace OnlineStore.DeviceLibrary
                     //    IOMove(IO_Type.R_OutLineBackRun, IO_VALUE.HIGH);
                     //    IOMove(IO_Type.R_OutLineBackRun, IO_VALUE.HIGH);
                     //}
                     //}
                     //else 
                     //else 
-                    if (hasShelfRight && !noShelfLeft && benQOutStep.GetCurStep() < BenQ_OUT_STEP.WAIT_AGV && chainNoRun && !agvClient_Dbline.A6_InProcess)//准备送满料，但提升机上有架子
+                    if (hasShelfRight && !noShelfLeft && benQOutStep.GetCurStep() <= BenQ_OUT_STEP.WAIT_AGV && chainNoRun && !agvClient_Dbline.A6_InProcess)//准备送满料，但提升机上有架子
                     {
                     {
                         benQInFromOutStep.ToNextStep(BenQ_IN_FROM_OUT_STEP.SHELF_TO_UPDOWN);
                         benQInFromOutStep.ToNextStep(BenQ_IN_FROM_OUT_STEP.SHELF_TO_UPDOWN);
                         benQInFromOutStep.Msg = "检测到右侧提升机有料架,提升机上升";
                         benQInFromOutStep.Msg = "检测到右侧提升机有料架,提升机上升";