1

zhang

昨天 2ddf6fc24333df35bd1ac15848b917336d533d53

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java

@@ -137,6 +137,7 @@
            throw new BusinessException("Internal Server Error!");
        }
        Boolean locStaStatusCheck = configService.getVal("LOC_STA_STATUS_CHECK", Boolean.class, true);
        Integer locStaTaskNum = configService.getVal("LOC_STA_TASK_NUM", Integer.class, 2);


        // 保存任务
@@ -190,6 +191,11 @@
                        if (locStaStatusCheck && !destSta.getStaSts().equals(StaStsType.IDLE.val())) {
                            throw new BusinessException("destSta：" + task.getDestSta$() + " is not in IDLE status");
                        }
                    } else {
                        List<Task> list = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getDestSta, destSta.getId()).in(Task::getTaskSts, TaskStsType.INIT.val(), TaskStsType.WAITING.val(), TaskStsType.ASSIGN.val(), TaskStsType.PROGRESS.val()));
                        if (!Cools.isEmpty(list) && list.size() >= locStaTaskNum) {
                            throw new BusinessException("destSta：" + task.getDestSta$() + " task more");
                        }
                    }
                    destSta.setStaSts(StaStsType.READY_RELEASE.val());
                    destSta.setUpdateTime(now);
@@ -237,6 +243,11 @@
                    if (destSta.getStaTypeIsCheck() != 1) {
                        if (locStaStatusCheck && !destSta.getStaSts().equals(StaStsType.IDLE.val())) {
                            throw new BusinessException("destSta：" + task.getDestSta$() + " is not in IDLE status");
                        }
                    } else {
                        List<Task> list = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getDestSta, destSta.getId()).in(Task::getTaskSts, TaskStsType.INIT.val(), TaskStsType.WAITING.val(), TaskStsType.ASSIGN.val(), TaskStsType.PROGRESS.val()));
                        if (!Cools.isEmpty(list) && list.size() >= locStaTaskNum) {
                            throw new BusinessException("destSta：" + task.getDestSta$() + " task more");
                        }
                    }
                    destSta.setStaSts(StaStsType.READY_RELEASE.val());
@@ -1633,6 +1644,9 @@
                    log.error("Task [{}] 更新失败 ！！！", task.getSeqNum());
                } else {
                    report(task, null, TaskReportStsType.END);
                    if (task.getSeqNum() != null && task.getSeqNum().contains("SSX-CK")) {
                        report(task, "1001", TaskReportStsType.COMPLETED);
                    }
                }
            }
        }
@@ -1676,7 +1690,7 @@
        }
        List<TaskReport> list = taskReportService.list(new LambdaQueryWrapper<TaskReport>().eq(TaskReport::getSeqNum, task.getSeqNum()).eq(TaskReport::getBusNo, task.getBusId$()).eq(TaskReport::getTaskSts, taskReportStsType.status));
        if (!Cools.isEmpty(list)) {
            log.info("TaskReport [{}] 已重复，不再插入 ==========>> ", JSON.toJSONString(task));
            log.info("TaskReport [{},{}] 已重复，不再插入 ==========>> ", taskReportStsType, JSON.toJSONString(task));
            return;
        }
        TaskReport taskReport = new TaskReport();
@@ -1691,6 +1705,7 @@
        taskReport.setEventType(taskReportStsType.name);
        taskReport.setSeqNum(task.getSeqNum());
        taskReport.setZpallet(task.getZpallet());

        if (!taskReportService.save(taskReport)) {
            log.info("TaskReport [{}] 插入失败 ==========>> ", JSON.toJSONString(taskReport));
        } else {