#

luxiaotao1123

2024-09-27 6df1b6a36e02657c6e91ead1a5c9de4a95fd548d

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

@@ -93,7 +93,11 @@

    @SuppressWarnings("all")
    @Transactional
    public void generateBusAndTask(OpenBusSubmitParam busSubmitParam, String memo) {
    public Bus generateBusAndTask(OpenBusSubmitParam busSubmitParam, String memo) {
        String errorMsg = busService.checkoutValid(busSubmitParam);
        if (!Cools.isEmpty(errorMsg)) {
            throw new BusinessException(errorMsg);
        }
        String batch = busSubmitParam.getBatch();
        List<TaskDto> taskDtoList = busSubmitParam.getTaskList();
        if (Cools.isEmpty(taskDtoList)) {
@@ -183,7 +187,7 @@
            }

        }

        return bus;
    }

    /**
@@ -281,8 +285,9 @@
                    return 0;
                }
            });
            if (taskList.size() > agv.getStage()) {
                taskList = taskList.subList(0, agv.getStage());
            Integer backpack = agvService.getBackpack(agv);
            if (taskList.size() > backpack) {
                taskList = taskList.subList(0, backpack);
            }

            /**
@@ -349,7 +354,7 @@

                }

                if (backpackLev > agv.getStage()) {
                if (backpackLev > backpack) {
                    throw new BusinessException("解析Task失败,AGV背篓已满......");
                }

@@ -994,6 +999,7 @@
            }
            for (Action action : actionList) {
                action.setActionSts(ActionStsType.ISSUED.val());
                action.setStartTime(now);
                action.setUpdateTime(now);
                if (!actionService.updateById(action)) {
                    throw new BusinessException(action.getPriority() + " - " + action.getName() + "动作更新失败");
@@ -1143,6 +1149,7 @@

                            if (null != action) {
                                action.setActionSts(ActionStsType.FINISH.val());
                                action.setEndTime(now);
                                action.setUpdateTime(now);
                                if (!actionService.updateById(action)) {
                                    log.error("Action [{}] 更新失败 ！！！", action.getPriority() + " - " + action.getName());
@@ -1175,6 +1182,7 @@
                            );
                            if (null != action) {
                                action.setActionSts(ActionStsType.FINISH.val());
                                action.setEndTime(now);
                                action.setUpdateTime(now);
                                if (!actionService.updateById(action)) {
                                    log.error("Action [{}] 更新失败 ！！！", action.getPriority() + " - " + action.getName());
@@ -1249,6 +1257,7 @@
                );
                for (Action action : actionList) {
                    action.setActionSts(ActionStsType.FINISH.val());
                    action.setEndTime(now);
                    action.setUpdateTime(now);
                    if (!actionService.updateById(action)) {
                        log.error("Action [{}] 更新失败 ！！！", action.getPriority() + " - " + action.getName());