Merge remote-tracking branch 'origin/dev' into dev

mes/src/main/java/com/ximai/mes/pro/schedule/impl/AlgorithmDataSourceThXMImpl.java

@@ -213,6 +213,7 @@ public class AlgorithmDataSourceThXMImpl implements AlgorithmDataSource {
         List<Calendar> algCalendar = new ArrayList<Calendar>();
         QueryWrapper<CalPlanWorkunit> calPlanWorkunitQuery = new QueryWrapper<CalPlanWorkunit>();
         calPlanWorkunitQuery.eq("rest_flag", 0);
+        calPlanWorkunitQuery.eq("is_work", 1);
         calPlanWorkunitQuery.gt("start_date", schedulingStartedDate);
         calPlanWorkunitQuery.orderByAsc("start_date");
         //查询可用工作日历

mes/src/main/java/com/ximai/mes/pro/service/impl/task/ProTaskServiceImpl.java

@@ -1018,6 +1018,7 @@ public class ProTaskServiceImpl implements IProTaskService {
 
         //暂停更新记录
         if (proTask.getStatus().equals(TaskStatusEnum.PAUSE.getStatus())) {
+            proTaskWorkunitService.updateProTaskWorkunitState(proTaskWorkunit, TaskStatusEnum.PAUSE);
             proTask.setPurseType(ProStartWorkEnum.SUSPENDED.getType());
             proStartWorkService.updateObj(proTask);
         }