Przeglądaj źródła

暂停执行任务

localhost 2 lat temu
rodzic
commit
c9110798cd
2 zmienionych plików z 2 dodań i 2 usunięć
  1. 1 1
      WCS.PLC/Equipment/Base_Srm3.cs
  2. 1 1
      WCS.Service/WCS.Service.csproj

+ 1 - 1
WCS.PLC/Equipment/Base_Srm3.cs

@@ -194,7 +194,7 @@ namespace WCS.PLC
                 //               (v.TASK_COMTYPE == (int)TaskTypeEnum.TaskType_StockTransfer && v.TASK_WKSTATUS <= 1) ||
                 //               (v.TASK_COMTYPE == (int)TaskTypeEnum.TaskType_Carry && SrmOutInInfoSet.Any(t => v.TASK_POSIDCUR == t.SRMOUTIN_CONVNO)))).ToList();
                 var taskSet = SugarBase.DB.Queryable<WCS_TASK>().Where(v => v.TASK_SRMNO == PlcName).ToList().Where(v => v.TASK_SRMNO == PlcName &&
-                                ((v.TASK_COMTYPE == (int)TaskTypeEnum.TaskType_OutStorage && v.TASK_WKSTATUS <= 1) ||
+                                ((v.TASK_COMTYPE == (int)TaskTypeEnum.TaskType_OutStorage && v.TASK_WKSTATUS <= 1 && v.TASK_PRIORITY >= 0) ||
                                  (v.TASK_COMTYPE == (int)TaskTypeEnum.TaskType_InStorage && SrmOutInInfoSet.Any(t => v.TASK_POSIDCUR == t.SRMOUTIN_CONVNO)) ||
                                  (v.TASK_COMTYPE == (int)TaskTypeEnum.TaskType_StockTransfer && v.TASK_WKSTATUS <= 1) ||
                                  (v.TASK_COMTYPE == (int)TaskTypeEnum.TaskType_Carry && SrmOutInInfoSet.Any(t => v.TASK_POSIDCUR == t.SRMOUTIN_CONVNO)))).ToList();

+ 1 - 1
WCS.Service/WCS.Service.csproj

@@ -22,6 +22,6 @@
     </None>
   </ItemGroup>
 
-  <ProjectExtensions><VisualStudio><UserProperties appsettings_1json__JsonSchema="" /></VisualStudio></ProjectExtensions>
+  <ProjectExtensions><VisualStudio><UserProperties appsettings_1json__JsonSchema="https://json-schema.org/draft-07/schema" /></VisualStudio></ProjectExtensions>
 
 </Project>