1

DeviceLibrary/bean/agv/Agv_Info.cs

@@ -189,7 +189,7 @@ namespace DeviceLibrary
             {
             {
                 if (IsDebug)
                 if (IsDebug)
                     return false;
                     return false;
-                if (CurJob == null || ((CurJob is ChargeJob || CurJob is StandyJob) && !IsExistShelf))
+                if (CurJob == null || ((CurJob is ChargeJob || CurJob is StandyJob)))// && !IsExistShelf
                     return true;
                     return true;
                 else
                 else
                     return false;
                     return false;

DeviceLibrary/bean/job/SwitchShelfJob.cs

@@ -219,8 +219,8 @@ namespace DeviceLibrary
                         state = MissionState.等待成品回收;
                         state = MissionState.等待成品回收;
                     }
                     }
                     setMissionState(state);
                     setMissionState(state);
-                    runInfo = $"离开{JobParam.CurTargetNode.AliceName},设置任务状态,并清空任务占用,{missionInfo()}";
                     ResetMissionOccupiedAgv(JobParam.GetMissionInfo());
                     ResetMissionOccupiedAgv(JobParam.GetMissionInfo());
+                    runInfo = $"离开{JobParam.CurTargetNode.AliceName},设置任务状态,并清空任务占用,{missionInfo()}";
                     LeaveLift(agv, JobParam.CurTargetNode.Name);
                     LeaveLift(agv, JobParam.CurTargetNode.Name);
                     JobRunStep.Msg = runInfo;
                     JobRunStep.Msg = runInfo;
                 }
                 }

DeviceLibrary/bean/jobType/BackLiftToLineJobType.cs

@@ -22,8 +22,8 @@ namespace DeviceLibrary.bean.jobType
                     service.model.MissionInfo missionInfo = manager.MissionManager.ShelfBackMission(agv);
                     service.model.MissionInfo missionInfo = manager.MissionManager.ShelfBackMission(agv);
                     if (missionInfo != null)
                     if (missionInfo != null)
                     {
                     {
-                        if (!liftname.Equals(missionInfo?.liftName))
-                            return null;
+                        //if (!liftname.Equals(missionInfo?.liftName))
+                        //    return null;
                         if (CheckHasSameJob(agv,liftname))
                         if (CheckHasSameJob(agv,liftname))
                         {
                         {
                             return null;
                             return null;

DeviceLibrary/bean/jobType/JobType.cs

@@ -4,6 +4,7 @@ using DeviceLibrary.manager;
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq;
+using System.Reflection;
 using System.Security.Cryptography.X509Certificates;
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
@@ -51,19 +52,7 @@ namespace DeviceLibrary
                 {
                 {
                     return true;
                     return true;
                 }
                 }
-                else
-                {
-                    AgvInfo agvInfo = AGVManager.agvInfo.Find(s => s.Auto && !s.IP.Equals(agv.IP)
-                                && agv.Scope.Workshop.Equals(s.Scope.Workshop));
-                    if (agvInfo != null)
-                    {
-                        if (agvInfo?.TaskRunState?.Task?.Name.Contains(targetName) ?? false)
-                        {
-                            return true;
-                        }
-                    }
-                    return false;
-                }
+                return false;
             }
             }
             catch (Exception ex)
             catch (Exception ex)
             {
             {
@@ -73,6 +62,7 @@ namespace DeviceLibrary
         }
         }
         protected bool AUOUsingD2(string liftName)
         protected bool AUOUsingD2(string liftName)
         {
         {
+            if (SettingString.LIFT_C1.Equals(liftName)) return false;
             return SettingString.LIFT_D2.Equals(liftName) && MissionManager.AUOIsUsingD2();
             return SettingString.LIFT_D2.Equals(liftName) && MissionManager.AUOIsUsingD2();
         }
         }
     }
     }

DeviceLibrary/manager/MissionManager.cs

@@ -310,7 +310,7 @@ namespace DeviceLibrary.manager
         static bool CanExecuteLiftMission(MissionInfo mission)
         static bool CanExecuteLiftMission(MissionInfo mission)
         {
         {
             if (SettingString.LIFT_C1.Equals(mission.liftName)) return true;
             if (SettingString.LIFT_C1.Equals(mission.liftName)) return true;
-            return SettingString.LIFT_D2.Equals(mission.liftName) && MissionManager.AUOIsUsingD2();
+            return SettingString.LIFT_D2.Equals(mission.liftName) && !MissionManager.AUOIsUsingD2();
         }
         }
         /// <summary>
         /// <summary>
         /// 获取料架缓存点的任务
         /// 获取料架缓存点的任务
@@ -356,7 +356,7 @@ namespace DeviceLibrary.manager
                 var missions = GetMissionInfos().FindAll(w => w.state != MissionState.中止
                 var missions = GetMissionInfos().FindAll(w => w.state != MissionState.中止
                                  && w.state != MissionState.取消 && w.state != MissionState.完成);
                                  && w.state != MissionState.取消 && w.state != MissionState.完成);
                 missionInfo = missions.Find(s => s.destinationWorkshop.Equals(agv.Scope.Workshop) &&
                 missionInfo = missions.Find(s => s.destinationWorkshop.Equals(agv.Scope.Workshop) &&
-                (s.state >= MissionState.到达电梯 && s.state <= MissionState.电梯到达)
+                ((s.state >= MissionState.到达电梯 && s.state <= MissionState.电梯到达))
                 && agv.Scope.Tasks.Contains(s.projectType.ToString())
                 && agv.Scope.Tasks.Contains(s.projectType.ToString())
                 && !s.projectType.Equals(ProjectType.移远成品入库)
                 && !s.projectType.Equals(ProjectType.移远成品入库)
                 && !s.projectType.Equals(ProjectType.钢网入库)
                 && !s.projectType.Equals(ProjectType.钢网入库)