到达线体前清除确认信息

DeviceLibrary/bean/Node.cs

@@ -296,25 +296,17 @@ namespace DeviceLibrary
         {
         {
             get
             get
             {
             {
-                if (CanConfirm)
-                {
                     return apiconfirmSig;
                     return apiconfirmSig;
             }
             }
-                else
-                {
-                    return false;
-                }
-            }
             set
             set
             {
             {
-                if (CanConfirm)
+
                 {
                 {
                     apiconfirmSig = value;
                     apiconfirmSig = value;
                 }
                 }
             }
             }
         }
         }
         private bool apiconfirmSig = false;
         private bool apiconfirmSig = false;
-        public bool CanConfirm { get; private set; } = true;
         public ExtendEquip(string ip)
         public ExtendEquip(string ip)
         {
         {
             IP = ip;
             IP = ip;
@@ -325,7 +317,7 @@ namespace DeviceLibrary
         /// </summary>
         /// </summary>
         public void AllowConfirm()
         public void AllowConfirm()
         {
         {
-            CanConfirm = true;
+            Reset();
         }
         }
         public void Reset()
         public void Reset()
         {
         {
@@ -333,6 +325,10 @@ namespace DeviceLibrary
             IOManager.WriteDO(IP, 0, 0);
             IOManager.WriteDO(IP, 0, 0);
             Common.LogUtil.info($"线体确认状态重置[{IP}]：apiconfirmSig={apiconfirmSig}");
             Common.LogUtil.info($"线体确认状态重置[{IP}]：apiconfirmSig={apiconfirmSig}");
         }
         }
+        public string ToState()
+        {
+            return $"【{IP}】【apiconfirmSig={apiconfirmSig}】【ButtonConfirmSig={ButtonConfirmSig}】";
+        }
     }
     }
     /// <summary>
     /// <summary>
     /// 节点状态
     /// 节点状态

DeviceLibrary/bean/agv/Agv_Info.cs

@@ -92,6 +92,9 @@ namespace DeviceLibrary
         /// 小车的状态ID，（从小车获取）
         /// 小车的状态ID，（从小车获取）
         /// </summary>
         /// </summary>
         public eAGVState StateID { set; get; }
         public eAGVState StateID { set; get; }
+        /// <summary>
+        /// 小车异常信息
+        /// </summary>
         public List<Mir_Error> Errors { get; set; }
         public List<Mir_Error> Errors { get; set; }
         /// <summary>
         /// <summary>
         /// 负载
         /// 负载

DeviceLibrary/bean/job/LiftToLinesJob.cs

@@ -152,7 +152,7 @@ namespace DeviceLibrary.bean.job
                     manager.UploadManager.UploadTransportStatus(new service.model.TransportStatus(agv.CurJob.JobParam.GetMissionInfo().missionId,
                     manager.UploadManager.UploadTransportStatus(new service.model.TransportStatus(agv.CurJob.JobParam.GetMissionInfo().missionId,
                     service.model.TransportStatus.TypeStr.status, agv.Name, agv.Place.Name, service.model.TransportStatus.ModeStr.agvButton,
                     service.model.TransportStatus.TypeStr.status, agv.Name, agv.Place.Name, service.model.TransportStatus.ModeStr.agvButton,
                     $"卸货{ JobParam.CurTargetNode.Name }"));
                     $"卸货{ JobParam.CurTargetNode.Name }"));
-                    //关闭按钮确认
+                    //重置确认信息
                     JobParam.CurTargetNode.ExtendEquip.Reset();
                     JobParam.CurTargetNode.ExtendEquip.Reset();
                 }
                 }
                 else if (JobRunStep.IsTimeOut(WaitTimeOut, out double timeoutval))
                 else if (JobRunStep.IsTimeOut(WaitTimeOut, out double timeoutval))

DeviceLibrary/bean/job/LineToLineJob.cs

@@ -90,7 +90,7 @@ namespace DeviceLibrary.bean.job
                     if (JobParam.GetMissionInfo() != null && JobParam.GetMissionInfo().needBack)
                     if (JobParam.GetMissionInfo() != null && JobParam.GetMissionInfo().needBack)
                     {
                     {
                         JobRunStep.ToNextStep(RunStep.SD_LineToLine_05_BackToSrcLine);
                         JobRunStep.ToNextStep(RunStep.SD_LineToLine_05_BackToSrcLine);
-                        runInfo = $"{JobParam.CurTargetNode.AliceName}的人员确认完成,准备返回{JobParam.SrcNode.AliceName}";
+                        runInfo = $"{JobParam.CurTargetNode.AliceName}的人员确认完成，准备返回{JobParam.SrcNode.AliceName}";
                         AllocateTask(agv, $"{JobParam.SrcNode.Name}_{SettingString.TakeShelfOff}");
                         AllocateTask(agv, $"{JobParam.SrcNode.Name}_{SettingString.TakeShelfOff}");
                         //任务状态变更
                         //任务状态变更
                         MissionManager.SetMissionState(JobParam.GetMissionInfo().missionId, service.model.MissionState.返回起始地, out string msg);
                         MissionManager.SetMissionState(JobParam.GetMissionInfo().missionId, service.model.MissionState.返回起始地, out string msg);

DeviceLibrary/service/Service.cs

@@ -161,17 +161,17 @@ namespace DeviceLibrary
                 }
                 }
                 else
                 else
                 {
                 {
-                    if(node.ExtendEquip.CanConfirm)
+                    //if(node.ExtendEquip.CanConfirm)
                     {
                     {
-                        node.ExtendEquip.ApiConfirmSig=true;
                         Log.Info($"线体[{operationFinish.line}]被调用确认接口");
                         Log.Info($"线体[{operationFinish.line}]被调用确认接口");
+                        node.ExtendEquip.ApiConfirmSig=true;
                     }
                     }
-                    else
-                    {
-                        result.code = -1;
-                        result.msg = $"线体[{operationFinish.line}]附近无小车，不允许调用该接口";
-                        Log.Warn(result.msg);
-                    }
+                    //else
+                    //{
+                    //    result.code = -1;
+                    //    result.msg = $"线体[{operationFinish.line}]附近无小车，不允许调用该接口";
+                    //    Log.Warn(result.msg);
+                    //}
                 }
                 }
             }
             }
             return result;
             return result;