生成任务校验优化

WPFWCSDemo.sln

@@ -5,8 +5,6 @@ VisualStudioVersion = 17.7.34003.232
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WPFWCSDemo", "WPFWCSDemo\WPFWCSDemo.csproj", "{604005A1-35A4-48E2-8011-20C38F2AC571}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestProject1", "TestProject1\TestProject1.csproj", "{BD8D724A-5381-4BBD-BB94-240AD27DD2A7}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -17,10 +15,6 @@ Global
 		{604005A1-35A4-48E2-8011-20C38F2AC571}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{604005A1-35A4-48E2-8011-20C38F2AC571}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{604005A1-35A4-48E2-8011-20C38F2AC571}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BD8D724A-5381-4BBD-BB94-240AD27DD2A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BD8D724A-5381-4BBD-BB94-240AD27DD2A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BD8D724A-5381-4BBD-BB94-240AD27DD2A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BD8D724A-5381-4BBD-BB94-240AD27DD2A7}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

WPFWCSDemo/Schedules/CircleRGV/Check.cs

@@ -45,7 +45,7 @@ namespace WPFWCSDemo.Schedules.CircleRGV
 
             //校验---如果已经存在处于【取货阶段】的某个【空托】任务
             //由于【空托任务】输送线的源站点唯一，因此必须等待该任务取货完成才能生成新的【空托】任务
-            if (!IsPalletConvHasGettingTask()) return false;
+            if (!IsPalletLineHasTask()) return false;
 
             //校验---当前输送线存在【空托】任务
             if (!GetRGVTaskForPalletsIsExist(targetLocation)) return false;
@@ -134,6 +134,7 @@ namespace WPFWCSDemo.Schedules.CircleRGV
             }
         }
 
+
         /// <summary>
         /// 防错机制【用于避免请求延迟的重复下发】--- 检测上一条【空托】任务放货时间(完成时间)与当前时间是否相差x秒以上
         /// </summary>
@@ -141,7 +142,7 @@ namespace WPFWCSDemo.Schedules.CircleRGV
         /// <returns> true-相差大于x秒  false-相差小于x秒</returns>
         public static bool CheckSendTaskTimeInterval(int location, int num)
         {
-            int diff = -30;
+            int diff = -num;
 
             using var context = new AppDbContext();
 
@@ -160,8 +161,9 @@ namespace WPFWCSDemo.Schedules.CircleRGV
             }
         }
 
+
         /// <summary>
-        /// 防错机制【重复下发】--- 检测已经生成但未下发的任务是否存在
+        /// 防错机制【重复下发】--- 检测是否有已经生成但未取货的实垛任务
         /// </summary>
         /// <param name="sourceLocation">源站点</param>
         /// <returns> true-同目标站点生成任务时间间隔合法  false-时间间隔过短</returns>
@@ -175,7 +177,7 @@ namespace WPFWCSDemo.Schedules.CircleRGV
                 //生成的上一条【实垛】任务且同一个源站点 ---> 查找符合条件的记录
                 var count = context
                     .Set<TaskRT>()
-                    .Where(t => t.SourceLocation == location.ToString() && (t.ScheduleState==ScheduleStateCode.Trans_CircleRGV_Ready || t.ScheduleState == ScheduleStateCode.Trans_CircleRGV_Picking))
+                    .Where(t => t.SourceLocation == location.ToString() && (t.ScheduleState==ScheduleStateCode.Trans_CircleRGV_Ready || t.ScheduleState == ScheduleStateCode.Trans_CircleRGV_PickOnTheWay || t.ScheduleState == ScheduleStateCode.Trans_CircleRGV_Picking))
                     .Count();
 
                 if (count < 1)
@@ -205,10 +207,11 @@ namespace WPFWCSDemo.Schedules.CircleRGV
 
 
 
+        static int sum;
 
         /// <summary>
         /// 计算某个输送口请求的值的和---用于确定该输送口在一定时间内请求是否已经复位
-        /// 用于避免信号也许存在的不稳定(跳变)的情况
+        /// 用于避免信号可能的不稳定(跳变)的情况
         /// </summary>
         /// <param name="Location">源站点/目标站点---表示对应列</param>
         /// <param name="count">计算的时间间隔（单位：秒）</param>
@@ -281,7 +284,7 @@ namespace WPFWCSDemo.Schedules.CircleRGV
                 return false;
             }
 
-            int sum = 0;
+            sum = 0;
 
             //计算源站点对应某列3行请求（允许）值的和
             for (int i = 0; i < dt.Rows.Count; i++)
@@ -392,7 +395,7 @@ namespace WPFWCSDemo.Schedules.CircleRGV
             // 任务处于【取货阶段】
             // 无【允许下发】---表示小车在工作中
             var count = states
-                .Where(a => a.Read_SourceLocation == (sourceLocation - 1000).ToString() && a.Read_Phase < 3 && a.Read_Phase > 0 && !a.Read_Permission)
+                .Where(a => a.Read_SourceLocation == (sourceLocation - 1000).ToString() && a.Read_Phase < 3 && !a.Read_Permission)
                 .Count();
 
             if (count > 0)
@@ -411,7 +414,7 @@ namespace WPFWCSDemo.Schedules.CircleRGV
         /// 检查是否存在已经生成的处于【取货阶段】的【栈板】任务 --- 源站点每次请求仅生成一条任务
         /// </summary>
         /// <returns>true-无符合条件的任务(即可生成新任务) false-存在符合条件的任务</returns>
-        public static bool IsPalletConvHasGettingTask()
+        public static bool IsPalletLineHasTask()
         {
             var context = new AppDbContext();