姚云青 3 tahun lalu
induk
melakukan
0a84e9d60d

+ 9 - 6
imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionResourceCenter/service/impl/ZZoneServiceImpl.java

@@ -186,8 +186,9 @@ public class ZZoneServiceImpl extends SuperServiceImpl<ZZoneMapper, ZZone> imple
         String runMode = zZone.getRunMode();
         isFalse(oriRunMode.equals(runMode), "切换的产线不能和原产线雷同");
 
+        oriZone.setRunMode(data.getRunMode());
 
-        updateById(zZone);
+        updateById(oriZone);
         //重新排产
         orderService.reschedulingPlanTasks();
 
@@ -203,11 +204,13 @@ public class ZZoneServiceImpl extends SuperServiceImpl<ZZoneMapper, ZZone> imple
                 if("2".equals(oriZone.getRunMode())) {
                     JSONObject jsonObject = new JSONObject();
                     List<TaskNode> taskNodeList = taskNodeMapper.selectList(Wraps.<TaskNode>lbQ().eq(TaskNode::getCompleteBatchNo, t.getCompleteBatchNo()).eq(TaskNode::getExeStatus,"1").orderByAsc(TaskNode::getCompleteBatchSort));
-                    TaskNode taskNode = taskNodeList.get(0);
-                    jsonObject.put("taskNodeId",taskNode.getId().toString());
-                    jsonObject.put("bizType", BizConstant.MQ_TASK_NODE_TYPE_COMMON);
-                    log.info("推送mq队列{}消息{}",taskNode.getResourceId().toString(),jsonObject.toString());
-                    dynamicRabbitMq.sendMsg(taskNode.getResourceId().toString(),jsonObject.toString());
+                    if(CollectionUtil.isNotEmpty(taskNodeList)){
+                        TaskNode taskNode = taskNodeList.get(0);
+                        jsonObject.put("taskNodeId",taskNode.getId().toString());
+                        jsonObject.put("bizType", BizConstant.MQ_TASK_NODE_TYPE_COMMON);
+                        log.info("推送mq队列{}消息{}",taskNode.getResourceId().toString(),jsonObject.toString());
+                        dynamicRabbitMq.sendMsg(taskNode.getResourceId().toString(),jsonObject.toString());
+                    }
                 }
 
                 t.setExchangeProcedureId(t.getProcedureId());