#

vincentlu

2025-04-07 ae2f9a18e28a7e223e8831fef82e14fd94e26193

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java

@@ -139,7 +139,7 @@
        if (null == codeId) {
            return null;
        }
        return laneService.search(codeService.getById(codeId).getData());
        return laneService.search(codeService.getCacheById(codeId).getData());
    }

    @Override
@@ -162,7 +162,7 @@
        if (null == codeId) {
            return null;
        }
        return laneService.search(codeService.getById(codeId).getData());
        return laneService.search(codeService.getCacheById(codeId).getData());
    }

    @Override
@@ -188,6 +188,14 @@
        wrapper.in(Task::getTaskSts, TaskStsType.WAITING.val(), TaskStsType.ASSIGN.val(), TaskStsType.PROGRESS.val());
        wrapper.notIn(Task::getTaskType, TaskTypeType.MOVE.val(), TaskTypeType.TO_CHARGE.val(), TaskTypeType.TO_STANDBY.val());
        return this.list(wrapper);
    }

    @Override
    public Integer findTransportTasksCountByAgv(Long agvId) {
        LambdaQueryWrapper<Task> wrapper = new LambdaQueryWrapper<Task>().eq(Task::getAgvId, agvId);
        wrapper.in(Task::getTaskSts, TaskStsType.WAITING.val(), TaskStsType.ASSIGN.val(), TaskStsType.PROGRESS.val());
        wrapper.notIn(Task::getTaskType, TaskTypeType.MOVE.val(), TaskTypeType.TO_CHARGE.val(), TaskTypeType.TO_STANDBY.val());
        return this.count(wrapper);
    }

    @Override
@@ -218,13 +226,13 @@
                oriLoc.setLocSts(complete?LocStsType.IDLE.val():LocStsType.STOCK.val());
                oriLoc.setUpdateTime(now);
                if (!locService.updateById(oriLoc)) {
                    throw new BusinessException("Loc [" + task.getOriLoc$() + "] 库位修改状态失败 ！！！");
                    throw new BusinessException("Loc [" + oriLoc.getLocNo() + "] 库位修改状态失败 ！！！");
                }

                destLoc.setLocSts(complete?LocStsType.STOCK.val():LocStsType.IDLE.val());
                destLoc.setUpdateTime(now);
                if (!locService.updateById(destLoc)) {
                    throw new BusinessException("Loc [" + task.getDestLoc$() + "] 库位修改状态失败 ！！！");
                    throw new BusinessException("Loc [" + destLoc.getLocNo() + "] 库位修改状态失败 ！！！");
                }
                break;
            case LOC_TO_STA:
@@ -232,18 +240,45 @@
                oriLoc.setLocSts(complete?LocStsType.IDLE.val():LocStsType.STOCK.val());
                oriLoc.setUpdateTime(now);
                if (!locService.updateById(oriLoc)) {
                    throw new BusinessException("Loc [" + task.getOriLoc$() + "] 库位修改状态失败 ！！！");
                    throw new BusinessException("Loc [" + oriLoc.getLocNo() + "] 库位修改状态失败 ！！！");
                }

                destSta = staService.getById(task.getDestSta());
                destSta.setStaSts(complete?StaStsType.STOCK.val():StaStsType.IDLE.val());
                destSta.setUpdateTime(now);
                if (!staService.updateById(destSta)) {
                    throw new BusinessException("Sta [" + destSta.getStaNo() + "] 站点修改状态失败 ！！！");
                }
                break;
            case STA_TO_LOC:
                oriSta = staService.getById(task.getOriSta());
                oriSta.setStaSts(complete?StaStsType.IDLE.val():StaStsType.STOCK.val());
                oriSta.setUpdateTime(now);
                if (!staService.updateById(oriSta)) {
                    throw new BusinessException("Sta [" + oriSta.getStaNo() + "] 站点修改状态失败 ！！！");
                }

                destLoc = locService.getById(task.getDestLoc());
                destLoc.setLocSts(complete?LocStsType.STOCK.val():LocStsType.IDLE.val());
                destLoc.setUpdateTime(now);
                if (!locService.updateById(destLoc)) {
                    throw new BusinessException("Loc [" + task.getDestLoc$() + "] 库位修改状态失败 ！！！");
                    throw new BusinessException("Loc [" + destLoc.getLocNo() + "] 库位修改状态失败 ！！！");
                }
                break;
            case STA_TO_STA:
                oriSta = staService.getById(task.getOriSta());
                oriSta.setStaSts(complete?StaStsType.IDLE.val():StaStsType.STOCK.val());
                oriSta.setUpdateTime(now);
                if (!staService.updateById(oriSta)) {
                    throw new BusinessException("Sta [" + oriSta.getStaNo() + "] 站点修改状态失败 ！！！");
                }

                destSta = staService.getById(task.getDestSta());
                destSta.setStaSts(complete?StaStsType.STOCK.val():StaStsType.IDLE.val());
                destSta.setUpdateTime(now);
                if (!staService.updateById(destSta)) {
                    throw new BusinessException("Sta [" + destSta.getStaNo() + "] 站点修改状态失败 ！！！");
                }
                break;
            case TO_CHARGE:
            case TO_STANDBY: