模式切换重调度时判断当前是否有正常进行的订单，没有的话不进行排产

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/OrderServiceImpl.java

@@ -777,6 +777,10 @@ public class OrderServiceImpl extends SuperServiceImpl<OrderMapper, Order> imple
         planWrapper.eq("plan_status", "2");
         List<Plan> plans = planMapper.selectList(planWrapper);
 
+        if(plans.size() == 0){
+            msgUtil.redis_del(YunjianConstant.YUNJIAN_SHEDULE_FLAG);
+            return R.success();
+        }
         List<Long> planIds = plans.stream().map(p -> p.getId()).collect(Collectors.toList());
         List<Long> orderIds = plans.stream().map(p -> p.getOrderId()).collect(Collectors.toList());
 

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/TaskNodeServiceImpl.java

@@ -1382,13 +1382,8 @@ public class TaskNodeServiceImpl extends SuperServiceImpl<TaskNodeMapper, TaskNo
         //websocket推送TODO临时注释
 //        msgUtil.pushTask(task);
 
-        // 判断当前是手动模式还是自动模式，如果是自动模式继续走下一个节点，如果是手动模式，判断当前节点是否是该工序最后一个节点
-        TaskNode currProcedureLastNode =  baseMapper.selectOne(Wraps.<TaskNode>lbQ().eq(TaskNode::getTaskId, task.getId()).orderByDesc(TaskNode::getCompleteBatchSort).last("limit 1"));
-
-        if(!currProcedureLastNode.getId().equals(taskNode.getId())){
-            //推送到消息队列
-            msgUtil.pushToNextMq(taskNode, task, taskNodeList, n, callBackJson,currWorkpiece);
-        }
+        //推送到消息队列
+        msgUtil.pushToNextMq(taskNode, task, taskNodeList, n, callBackJson,currWorkpiece);
     }
 
     /**