取出出库料串按钮修复

DeviceLibrary/DeviceLibrary/ServerCommunication.cs

@@ -449,12 +449,7 @@ namespace DeviceLibrary
             var step = RobotManage.mainMachine.StringMoveInfo.MoveStep;
             if ((step >= MoveStep.StringLoad_04 && step < MoveStep.StringOut_01))
             {
-                if (RobotManage.mainMachine.StringState.Equals(StringStateE.OutStore) && RobotManage.mainMachine.ServerCM.queueTaskCount == 0)
-                {
-                    map[ParamDefine.takeOutReel] = ParamDefine.enable;
-                }
-                else
-                    map[ParamDefine.takeOutReel] = ParamDefine.enable;
+                map[ParamDefine.takeOutReel] = ParamDefine.enable;
             }
             if (RobotManage.mainMachine.IOValue(IO_Type.NGDoor_Open).Equals(IO_VALUE.HIGH))
             {

DeviceLibrary/theMachine/MainMachine _IOMonitor.cs

@@ -24,6 +24,7 @@ namespace DeviceLibrary
             if ((StringState >= StringStateE.OutStore) && IOValue(IO_Type.DoorClose_LoadMaterial).Equals(IO_VALUE.LOW))
             {
                 MaterialDoorOpen = true;
+                RequestTakeOutReel = false;
                 StringState = StringStateE.None;
             }
             else if (IOValue(IO_Type.DoorClose_LoadMaterial).Equals(IO_VALUE.HIGH) && StringMoveInfo.MoveStep == MoveStep.Wait)

DeviceLibrary/theMachine/MainMachine_ServerControl.cs

@@ -28,18 +28,17 @@ namespace DeviceLibrary
         public string doTakeOutReel()
         {
             LogUtil.info("请求下降出库料串");
-            var step = RobotManage.mainMachine.StringMoveInfo.MoveStep;
+            var stringStep = RobotManage.mainMachine.StringMoveInfo.MoveStep;
             var clampstep = RobotManage.mainMachine.ClampMoveInfo.MoveStep;
-            if (step == MoveStep.StringReadyGet && clampstep >= MoveStep.ReelClamp_GetHeight)
+            if (stringStep == MoveStep.StringReadyGet && clampstep >= MoveStep.ReelClamp_GetHeight)
             {
                 RobotManage.mainMachine.StringMoveInfo.NextMoveStep(MoveStep.StringOut_01);
                 StringState = StringStateE.ManualOut;
                 return crc.GetString(L.string_begin_release, "开始释放料串");
             }
-            if (step == MoveStep.StringReadyPut)
+            if (stringStep == MoveStep.StringReadyPut)
             {
-                RobotManage.mainMachine.StringMoveInfo.NextMoveStep(MoveStep.StringOut_01);
-                StringState = StringStateE.ManualOut;
+                RequestTakeOutReel = true;
                 return crc.GetString(L.string_begin_release, "开始释放料串");
             }
             LogUtil.info($"料串无法释放,料仓正在出入库中:{StringMoveInfo.MoveStep}");

DeviceLibrary/theMachine/MainMachine_Store.cs

@@ -107,7 +107,7 @@ namespace DeviceLibrary
                         else
                             boxTransport.IgnoreX09 = false;
                         TurnToOut();
-                        if (IsPutReelReady && OutStoreJobList.Dequeue(out JobInfo jobInfo))
+                        if (IsPutReelReady && !RequestTakeOutReel && OutStoreJobList.Dequeue(out JobInfo jobInfo))
                         {
                             StoreMoveInfo.NewMove(MoveStep.StoreOut10);
                             StoreMoveInfo.MoveParam.PosID = jobInfo.PosId;

DeviceLibrary/theMachine/MainMachine_String.cs

@@ -30,6 +30,11 @@ namespace DeviceLibrary
             get => StringMoveInfo.MoveStep == MoveStep.StringReadyPut;
         }
         /// <summary>
+        /// 请求取出出库料盘
+        /// 当前出库料盘出完，不出下一盘
+        /// </summary>
+        public bool RequestTakeOutReel = false;
+        /// <summary>
         /// 通知料盘已取走
         /// </summary>
         void ReelGetted(bool success = true)
@@ -328,6 +333,20 @@ namespace DeviceLibrary
                         StringMoveInfo.log($"当前服务器反馈没有出库任务, 料串下降待机");
                         StringMoveInfo.NextMoveStep(MoveStep.StringOut_01);
                     }
+                    else if(RequestTakeOutReel)
+                    {
+                        StringMoveInfo.log($"请求取出出库料盘,料串下降");
+                        RobotManage.mainMachine.StringMoveInfo.NextMoveStep(MoveStep.StringOut_01);
+                        StringState = StringStateE.ManualOut;
+                    }
+                    else if(ServerCM.queueTaskCount != 0)
+                    {
+                        StringMoveInfo.log($"当前服务器反馈有出库任务：{ServerCM.queueTaskCount}");
+                    }
+                    else if (!boxTransport.IsComplateOrFree)
+                    {
+                        StringMoveInfo.log($"等待料盘转移完成");
+                    }
                     break;
                 case MoveStep.StringReelPut:
                     if (Setting_Init.Device_OutStoreStringReelCheck) {
@@ -408,6 +427,7 @@ namespace DeviceLibrary
                     break;
                 case MoveStep.StringOut_01:
                     StringMoveInfo.NextMoveStep(MoveStep.StringOut_Released);
+                    RequestTakeOutReel = false;
                     StringMoveInfo.log($"料串下降到P1点");
                     Batch_Axis.AbsMove(StringMoveInfo, Config.Batch_P1, Config.Batch_P1_speed);                    
                     StringMoveInfo.WaitList.Add(WaitResultInfo.WaitMsg("料串正在下降", MsgLevel.warning));