1

DeviceLibrary/manager/MissionManager.cs

@@ -26,7 +26,7 @@ namespace DeviceLibrary.manager
         /// <returns></returns>
         public static bool AUOIsUsingD2()
         {
-            return AUOResult?.code== 0;
+            return AUOResult?.code == 0;
         }
         public static void InitMission()
         {
@@ -210,7 +210,7 @@ namespace DeviceLibrary.manager
 
         public static bool AddSteelMission(MissionInfo mission)
         {
-            var find = GetMissionInfos().Find(w => w.missionId.Substring(0,3).Equals(mission.missionId.Substring(0, 3)));
+            var find = GetMissionInfos().Find(w => w.missionId.Substring(0, 3).Equals(mission.missionId.Substring(0, 3)));
             if (find == null)
             {
                 Log.Info($"新建任务：{JsonHelper.SerializeObject(mission)}");
@@ -255,10 +255,10 @@ namespace DeviceLibrary.manager
                 && w.state != MissionState.取消 && w.state != MissionState.完成).ToList();
                 missionInfo = missions.Where(s => s.sourceWorkshop.Equals(agv.Scope.Workshop) &&
                                 s.state.Equals(MissionState.创建) && (s.projectType.Equals(ProjectType.钢网入库) || s.projectType.Equals(ProjectType.钢网领用)) &&
-                                agv.Scope.Tasks.Contains(s.projectType.ToString())).FirstOrDefault();
-                if (missionInfo != null && AgvCanGetMission(missionInfo))
+                                agv.Scope.Tasks.Contains(s.projectType.ToString()) && AgvCanGetMission(s)).FirstOrDefault();
+                if (missionInfo != null)//&& AgvCanGetMission(missionInfo)
                 {
-                    liftname = MissionManager.GetLiftName(missionInfo);
+                    liftname = missionInfo.liftName;//MissionManager.GetLiftName(missionInfo);
                     if (liftname.Equals(""))
                     {
                         return null;
@@ -274,7 +274,7 @@ namespace DeviceLibrary.manager
             return null;
         }
         /// <summary>
-        /// 获取取料架任务，以准备执行 LineToLiftJobType
+        /// 获取LineToLiftJob
         /// </summary>
         /// <param name="missionType"></param>
         /// <returns></returns>
@@ -289,10 +289,10 @@ namespace DeviceLibrary.manager
 
                 missionInfo = missions.Find(s => s.sourceWorkshop.Equals(agv.Scope.Workshop) && !s.sourceWorkshop.Equals(s.destinationWorkshop) &&
                                 s.state.Equals(MissionState.创建) && !s.projectType.Equals(ProjectType.钢网入库) &&
-                                agv.Scope.Tasks.Contains(s.projectType.ToString()));
-                if (missionInfo != null && AgvCanGetMission(missionInfo))
+                                agv.Scope.Tasks.Contains(s.projectType.ToString()) && AgvCanGetMission(s)&& CanExecuteLiftMission(s));
+                if (missionInfo != null)// && AgvCanGetMission(missionInfo)
                 {
-                    liftname = MissionManager.GetLiftName(missionInfo);
+                    liftname = missionInfo.liftName;//MissionManager.GetLiftName(missionInfo);
                     if (liftname.Equals(""))
                     {
                         return null;
@@ -303,10 +303,15 @@ namespace DeviceLibrary.manager
             }
             catch (Exception e)
             {
-                Log.Error("GetF1DeliverMission", e);
+                Log.Error("GetLineToLiftMission", e);
             }
             return null;
         }
+        static bool CanExecuteLiftMission(MissionInfo mission)
+        {
+            if (SettingString.LIFT_C1.Equals(mission.liftName)) return true;
+            return SettingString.LIFT_D2.Equals(mission.liftName) && MissionManager.AUOIsUsingD2();
+        }
         /// <summary>
         /// 获取料架缓存点的任务
         /// </summary>
@@ -352,7 +357,7 @@ namespace DeviceLibrary.manager
                                  && w.state != MissionState.取消 && w.state != MissionState.完成);
                 missionInfo = missions.Find(s => s.destinationWorkshop.Equals(agv.Scope.Workshop) &&
                 (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.钢网领用));
@@ -380,7 +385,7 @@ namespace DeviceLibrary.manager
                 var missions = GetMissionInfos().FindAll(w => w.state != MissionState.中止
                                  && w.state != MissionState.取消 && w.state != MissionState.完成);
                 missionInfo = missions.Find(s => s.destinationWorkshop.Equals(SettingString._4C) &&
-                s.sourceWorkshop.Equals(SettingString._3D)&&
+                s.sourceWorkshop.Equals(SettingString._3D) &&
                 (s.state >= MissionState.到达电梯 && s.state <= MissionState.电梯到达)
                 && agv.Scope.Tasks.Contains(s.projectType.ToString()) && s.projectType.Equals(ProjectType.空台车领用));
                 if (missionInfo != null && AgvCanGetMission(missionInfo))
@@ -705,7 +710,7 @@ namespace DeviceLibrary.manager
                                 mission.liftName = item.liftName;
                                 mission.occupiedAgv = item.occupiedAgv;
                                 mission.destinationPoint = item.destinationPoint;
-                                mission.sourcePoint= item.sourcePoint;
+                                mission.sourcePoint = item.sourcePoint;
                             }
                         }
                         ctx.SaveChanges();

DeviceLibrary/service/Service.cs

@@ -60,9 +60,12 @@ namespace DeviceLibrary
                 else if (!MissionManager.Contains(createMissionInfo))
                 {
                     createMissionInfo.state = MissionState.创建;
+                    MissionManager.GetLiftName(createMissionInfo);
                     bool rtn = MissionManager.AddMission(createMissionInfo);
                     if (rtn)
+                    {
                         Log.Info($"创建任务成功:{s}");
+                    }
                     else
                     {
                         result.code = -1;
@@ -216,11 +219,12 @@ namespace DeviceLibrary
                 MissionInfo missionInfo = new MissionInfo()
                 {
                     state = MissionState.创建,
-                    missionId = $"P150" + DateTime.Now.ToString("yyyyMMddhhmmss"),
+                    missionId = $"P150" + DateTime.Now.ToString("yyyyMMddHHmmss"),
                     sourcePoint = "3dwash",
                     destinationPoint = "storage",
                     needBack = true
                 };
+                MissionManager.GetLiftName(missionInfo);
                 bool rtn = MissionManager.AddSteelMission(missionInfo);
                 if (!rtn)
                     Log.Error($"已呼叫钢网出库，忽略");