在重试移动时，打印轴状态，上报消息修改

DeviceLibrary/DeviceLibrary/AxisManager.cs

@@ -114,7 +114,10 @@ namespace DeviceLibrary
         {
         {
             return instance.GetLimitNegativeSingle(portName, slvAddr);
             return instance.GetLimitNegativeSingle(portName, slvAddr);
         }
         }
-
+        public static string GetAxisSts(string portName, short slvAddr)
+        {
+            return instance.GetAxisSts(portName, slvAddr);
+        }
         /// <summary>
         /// <summary>
         /// 正极限
         /// 正极限
         /// </summary> 
         /// </summary> 

DeviceLibrary/DeviceLibrary/HC/HCAxisManager.cs

@@ -141,5 +141,11 @@ namespace DeviceLibrary
         {
         {
             return HCBoardManager.GetAxErrCode(slvAddr);
             return HCBoardManager.GetAxErrCode(slvAddr);
         }
         }
+
+        public string GetAxisSts(string portName, short slvAddr)
+        {
+            AxisSts axisS = HCBoardManager.GetAxisSts(slvAddr);
+            return axisS.ToStr();
+        }
     }
     }
 }
 }

DeviceLibrary/DeviceLibrary/IAxisManager.cs

@@ -55,6 +55,6 @@ namespace DeviceLibrary
 
 
         int AxisStsINP(string portName, short slvAddr);
         int AxisStsINP(string portName, short slvAddr);
         short GetErrorCode(string portName, short slvAddr);
         short GetErrorCode(string portName, short slvAddr);
-
+        string GetAxisSts(string portName, short slvAddr);
     }
     }
 }
 }

DeviceLibrary/DeviceLibrary/ServerCommunication.cs

@@ -415,7 +415,7 @@ namespace DeviceLibrary
             //}
             //}
             else
             else
             {
             {
-                LogUtil.info("扫码时状态错误.");
+                LogUtil.info("入库时状态错误.");
             }
             }
 
 
         }
         }

DeviceLibrary/theMachine/AxisBean.cs

@@ -171,7 +171,8 @@ namespace DeviceLibrary
                 if (MoveInfo.CanWhileCount > 0)
                 if (MoveInfo.CanWhileCount > 0)
                 {
                 {
                     var errCode = AxisManager.GetErrorCode(deviceName, axisNo);
                     var errCode = AxisManager.GetErrorCode(deviceName, axisNo);
-                    LogUtil.info($"{MoveInfo.Name} {MoveInfo.MoveStep} {axis.DisplayStr} 报警码:{errCode.ToString("X8")}");
+                   var pos= AxisManager.GetAxisSts(deviceName, axisNo);
+                    LogUtil.info($"{MoveInfo.Name} {MoveInfo.MoveStep} {axis.DisplayStr} 轴状态:{pos}, 报警码:{errCode.ToString("X8")}");
                     string clearMsg = "";
                     string clearMsg = "";
                     //判断轴是否报警
                     //判断轴是否报警
                     if (MoveInfo.CanWhileCount <= 3)
                     if (MoveInfo.CanWhileCount <= 3)

DeviceLibrary/theMachine/InOutDevice_OUT.cs

@@ -105,7 +105,7 @@ namespace DeviceLibrary
                     MoveInfo.NextMoveStep(MoveStep.OutWaitAgv);
                     MoveInfo.NextMoveStep(MoveStep.OutWaitAgv);
                     mainMachine.ServerCM.SendStoreState(MoveInfo.MoveParam.PosID, StoreStatus.OutStoreEnd);
                     mainMachine.ServerCM.SendStoreState(MoveInfo.MoveParam.PosID, StoreStatus.OutStoreEnd);
                     //IOMove(DO_Agv_Rsp, IO_VALUE.HIGH);
                     //IOMove(DO_Agv_Rsp, IO_VALUE.HIGH);
-                    MoveInfo.log($"等待agv接走周转箱");
+                    MoveInfo.log($"等待取走周转箱");
                     break;
                     break;
                 case MoveStep.OutWaitAgv:
                 case MoveStep.OutWaitAgv:
                     Msg.add("等待取走周转箱" + MoveInfo.MoveParam.WareCode, MsgLevel.info);
                     Msg.add("等待取走周转箱" + MoveInfo.MoveParam.WareCode, MsgLevel.info);

DeviceLibrary/theMachine/MainMachine _Store.cs

@@ -93,7 +93,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)) {
                     //    Msg.add(boxTransport.ErrMsgTxt, MsgLevel.warning);
                     //    Msg.add(boxTransport.ErrMsgTxt, MsgLevel.warning);

DeviceLibrary/theMachine/MainMachine.cs

@@ -315,7 +315,7 @@ namespace DeviceLibrary
                     else if(ResetMoveInfo.IsTimeOut(6))
                     else if(ResetMoveInfo.IsTimeOut(6))
                     {
                     {
                         Msg.add("存储机构取料暂停", MsgLevel.warning);//伸缩叉2侧X06/X07检测到有物料无法继续
                         Msg.add("存储机构取料暂停", MsgLevel.warning);//伸缩叉2侧X06/X07检测到有物料无法继续
-                        RobotManage.UserPause("回原时料叉上有物料");
+                        RobotManage.UserPause("再次确认回原时料叉上是否有料");
                         return;
                         return;
                     }
                     }
 
 

DeviceLibrary/theMachine/MoveInfo.cs

@@ -11,7 +11,7 @@ namespace DeviceLibrary
     public class MoveInfo
     public class MoveInfo
     {
     {
         public static List<MoveInfo> List = new List<MoveInfo>();
         public static List<MoveInfo> List = new List<MoveInfo>();
-        public int TimeOutSeconds = 60;
+        public int TimeOutSeconds = 240;
         public MoveInfo(string name, bool addtolist=true)
         public MoveInfo(string name, bool addtolist=true)
         {
         {
             MoveParam = new BoxParam();
             MoveParam = new BoxParam();