优化一些提示

DeviceLibrary/theMachine/AxisBean.cs

@@ -230,6 +230,9 @@ namespace DeviceLibrary
                     LogUtil.error(msg);
                     LogUtil.error(msg);
                 }
                 }
             }
             }
+            bool isOk = AxisManager.GetBusyStatus(axis.DeviceName, axis.GetAxisValue()).Equals(0);
+            if (!isOk)
+                MoveInfo.LastSetpTime = DateTime.Now;
             return false;
             return false;
         }
         }
 
 

DeviceLibrary/theMachine/InOutDevice_OUT.cs

@@ -108,7 +108,7 @@ namespace DeviceLibrary
                     MoveInfo.log($"等待agv接走周转箱");
                     MoveInfo.log($"等待agv接走周转箱");
                     break;
                     break;
                 case MoveStep.OutWaitAgv:
                 case MoveStep.OutWaitAgv:
-                    Msg.add("等待AGV接走周转箱" + MoveInfo.MoveParam.WareCode, MsgLevel.info);
+                    Msg.add("等待取走周转箱" + MoveInfo.MoveParam.WareCode, MsgLevel.info);
                     if (IOValue(IO_AgvOut_Req).Equals(IO_VALUE.HIGH))
                     if (IOValue(IO_AgvOut_Req).Equals(IO_VALUE.HIGH))
                     {
                     {
                         MoveInfo.NextMoveStep(MoveStep.Out08);
                         MoveInfo.NextMoveStep(MoveStep.Out08);
@@ -123,11 +123,11 @@ namespace DeviceLibrary
                         RobotManage.mainMachine.IsClearWarnMsg = true;
                         RobotManage.mainMachine.IsClearWarnMsg = true;
                         MoveInfo.EndMove();
                         MoveInfo.EndMove();
                     }
                     }
-                    else if (MoveInfo.IsTimeOut(60 * ConfigHelper.Config.Get("OutWaitAgvLeaveTimeout", 5)))
-                    {
-                        Msg.add($"出口料箱未下降", MsgLevel.warning);//等待周转箱[{MoveInfo.MoveParam.WareCode}]离开超时
-                        RobotManage.mainMachine.IsClearWarnMsg = false;
-                    }
+                    //else if (MoveInfo.IsTimeOut(60 * ConfigHelper.Config.Get("OutWaitAgvLeaveTimeout", 5)))
+                    //{
+                    //    Msg.add($"等待取走周转箱", MsgLevel.warning);//等待周转箱[{MoveInfo.MoveParam.WareCode}]离开超时
+                    //    RobotManage.mainMachine.IsClearWarnMsg = false;
+                    //}
                     break;
                     break;
                 case MoveStep.Out08:
                 case MoveStep.Out08:
                     if (IOValue(IO_F_Stop_Out).Equals(IO_VALUE.LOW)
                     if (IOValue(IO_F_Stop_Out).Equals(IO_VALUE.LOW)

DeviceLibrary/theMachine/MainMachine _Store.cs

@@ -129,7 +129,7 @@ namespace DeviceLibrary
                     }
                     }
                     else
                     else
                     {
                     {
-                        Msg.add($"{CurrentSide}:出料线等待周转箱到达", MsgLevel.info);
+                        Msg.add($"{(CurrentSide== InOutSideE.Left?"左侧": "右侧")}:出料线等待周转箱到达", MsgLevel.info);
                     }
                     }
                     //if (string.IsNullOrEmpty(boxTransport.ErrMsgTxt))
                     //if (string.IsNullOrEmpty(boxTransport.ErrMsgTxt))
                     //{
                     //{

DeviceLibrary/theMachine/MainMachine.cs

@@ -312,7 +312,7 @@ namespace DeviceLibrary
                         ResetMoveInfo.log("正在回原 ,升降轴,回原");
                         ResetMoveInfo.log("正在回原 ,升降轴,回原");
                         ResetMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
                         ResetMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
                     }
                     }
-                    else
+                    else if(ResetMoveInfo.IsTimeOut(6))
                     {
                     {
                         Msg.add("存储机构取料暂停", MsgLevel.warning);//伸缩叉2侧X06/X07检测到有物料无法继续
                         Msg.add("存储机构取料暂停", MsgLevel.warning);//伸缩叉2侧X06/X07检测到有物料无法继续
                         RobotManage.UserPause("回原时料叉上有物料");
                         RobotManage.UserPause("回原时料叉上有物料");
@@ -444,6 +444,7 @@ namespace DeviceLibrary
             if (!lastSafeCheckStatus && ok)
             if (!lastSafeCheckStatus && ok)
             {
             {
                 SafetyDevice.ResumeAll();
                 SafetyDevice.ResumeAll();
+                MoveInfo.List.ForEach((m) => { m.LastSetpTime = DateTime.Now; });
             }
             }
             lastSafeCheckStatus = ok;
             lastSafeCheckStatus = ok;
             return ok;
             return ok;