连续两个空移远成品回收异常状态修复

DeviceLibrary/lift/LiftContext.cs

@@ -397,8 +397,9 @@ namespace DeviceLibrary.lift
             }
             }
             return false;
             return false;
         }
         }
+
         /// <summary>
         /// <summary>
-        /// 有成品架子需要离开
+        /// 有成品架子需要离开电梯
         /// </summary>
         /// </summary>
         /// <param name="liftId"></param>
         /// <param name="liftId"></param>
         /// <param name="client"></param>
         /// <param name="client"></param>
@@ -407,7 +408,7 @@ namespace DeviceLibrary.lift
         public static bool HasFinishedShelfNeedLeave(string liftId, string client, out LiftStatus liftStatus)
         public static bool HasFinishedShelfNeedLeave(string liftId, string client, out LiftStatus liftStatus)
         {
         {
             liftStatus = GetLiftStatus(liftId);
             liftStatus = GetLiftStatus(liftId);
-            liftStatus.missionId = manager.MissionManager.GetMissionIdByFinishedShelfInLift(liftId);
+            liftStatus.missionId = manager.MissionManager.GetByFinishedShelfNeedLeaveInLift(liftId);
             if (!liftStatus.missionId.Equals(""))
             if (!liftStatus.missionId.Equals(""))
                 return true;
                 return true;
             return false;
             return false;

DeviceLibrary/manager/MissionManager.cs

@@ -134,15 +134,25 @@ namespace DeviceLibrary.manager
                 return m.missionId;
                 return m.missionId;
             return "";
             return "";
         }
         }
-        public static string GetMissionIdByFinishedShelfInLift(string liftId)
+        /// <summary>
+        /// 电梯内的成品料到达楼层
+        /// </summary>
+        /// <param name="liftId"></param>
+        /// <returns></returns>
+        public static string GetByFinishedShelfNeedLeaveInLift(string liftId)
         {
         {
             var m = GetMissionInfos().Find(s => liftId.Equals(s.liftName) && s.projectType.Equals(ProjectType.移远成品入库)
             var m = GetMissionInfos().Find(s => liftId.Equals(s.liftName) && s.projectType.Equals(ProjectType.移远成品入库)
-                       && (s.state.Equals(MissionState.等待成品回收) || s.state == MissionState.电梯运行
+                       && ( s.state == MissionState.电梯运行
                         || s.state == MissionState.返回电梯运行));
                         || s.state == MissionState.返回电梯运行));
             if (m != null)
             if (m != null)
                 return m.missionId;
                 return m.missionId;
             return "";
             return "";
         }
         }
+        /// <summary>
+        ///  D2电梯有空成品料车出来
+        /// </summary>
+        /// <param name="liftId"></param>
+        /// <returns></returns>
         public static string GetMissionIdByEmptyFinishedShelfInLift(string liftId)
         public static string GetMissionIdByEmptyFinishedShelfInLift(string liftId)
         {
         {
             var m = GetMissionInfos().Find(s => liftId.Equals(s.liftName) && s.projectType.Equals(ProjectType.移远成品入库)
             var m = GetMissionInfos().Find(s => liftId.Equals(s.liftName) && s.projectType.Equals(ProjectType.移远成品入库)