修复

DeviceLibrary/theMachine/MainMachine _BtnProcess.cs

@@ -28,7 +28,7 @@ namespace DeviceLibrary
             else
             else
             {
             {
                 Msg.add(crc.GetString(L.reset_press_with_sudden, "急停未解除,按下复位按钮尝试复位安全继电器."), MsgLevel.info, ErrInfo.SuddenStop);
                 Msg.add(crc.GetString(L.reset_press_with_sudden, "急停未解除,按下复位按钮尝试复位安全继电器."), MsgLevel.info, ErrInfo.SuddenStop);
-                return;
+                //return;
             }
             }
 
 
             lastSuddenStop = false;
             lastSuddenStop = false;
@@ -36,6 +36,7 @@ namespace DeviceLibrary
 
 
         }
         }
         void Run_BTN() {
         void Run_BTN() {
+            if (lastSuddenStop) return;
             if (!lastSuddenStop && IOValue(IO_Type.SuddenStop_BTN).Equals(IO_VALUE.HIGH))
             if (!lastSuddenStop && IOValue(IO_Type.SuddenStop_BTN).Equals(IO_VALUE.HIGH))
             {
             {
                 if (!RobotManage.isRunning)
                 if (!RobotManage.isRunning)

DeviceLibrary/theMachine/MainMachine_String.cs

@@ -216,12 +216,16 @@ namespace DeviceLibrary
                     {
                     {
                         StringMoveInfo.log($"料串检测为空");
                         StringMoveInfo.log($"料串检测为空");
                         StringState = StringStateE.OutStore;
                         StringState = StringStateE.OutStore;
-                        if (ConfigHelper.Config.Get("Device_String_StandbyAtBottom", true) && OutStoreJobList.Count == 0 && ServerCM.queueTaskCount <= 0 && boxTransport.IsComplateOrFree)
+                        if (ConfigHelper.Config.Get("Device_String_StandbyAtBottom", true) && OutStoreJobList.Count == 0  && boxTransport.IsComplateOrFree)//&& ServerCM.queueTaskCount <= 0
                         {
                         {
                             SetReelHeight(GetHeight(ClampMoveInfo));
                             SetReelHeight(GetHeight(ClampMoveInfo));
                             StringMoveInfo.log($"当前空料串, 并且没有出库任务, 料串下降待机");
                             StringMoveInfo.log($"当前空料串, 并且没有出库任务, 料串下降待机");
                             StringMoveInfo.NextMoveStep(MoveStep.StringOut_01);
                             StringMoveInfo.NextMoveStep(MoveStep.StringOut_01);
                         }
                         }
+                        else
+                        {
+                            StringMoveInfo.log($"料串不下降：{OutStoreJobList.Count}，queueTaskCount={ServerCM.queueTaskCount}，{boxTransport.IsComplateOrFree}");
+                        }
                     }
                     }
                     else if (StringState != StringStateE.OutStore)
                     else if (StringState != StringStateE.OutStore)
                     {
                     {