#

Junjie

2024-06-16 2a7b97eddbe3d24a47389a58dde46fe6175b6971

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java

@@ -82,6 +82,15 @@
            return R.error("库位状态不满足入库条件");
        }

        Task one = taskService.getOne(new LambdaQueryWrapper<Task>()
                .eq(Task::getTaskCtg, taskCtg.getId())
                .eq(Task::getOriginSite, param.getOriginSite())
                .eq(Task::getDestSite, param.getDestSite())
                .eq(Task::getDestLoc, param.getDestLoc()));
        if (one != null) {
            return R.error("任务已存在");
        }

        //优先级
        Integer priority = 10;
        if (param.getPriority() != null) {
@@ -91,6 +100,7 @@
        Task task = new Task();
        task.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
        task.setTaskNo(String.valueOf(Utils.getTaskNo("IN")));
        task.setWmsTaskNo(param.getTaskNo());
        task.setTaskSts(TaskStsType.NEW_INBOUND.sts);
        task.setTaskCtg(taskCtg.getId());
        task.setPriority(priority);
@@ -140,6 +150,15 @@
            return R.error("库位状态不满足出库条件");
        }

        Task one = taskService.getOne(new LambdaQueryWrapper<Task>()
                .eq(Task::getTaskCtg, taskCtg.getId())
                .eq(Task::getOriginSite, param.getOriginSite())
                .eq(Task::getOriginLoc, param.getOriginLoc())
                .eq(Task::getDestSite, param.getDestSite()));
        if (one != null) {
            return R.error("任务已存在");
        }

        //优先级
        Integer priority = 10;
        if (param.getPriority() != null) {
@@ -149,6 +168,7 @@
        Task task = new Task();
        task.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
        task.setTaskNo(String.valueOf(Utils.getTaskNo("OUT")));
        task.setWmsTaskNo(param.getTaskNo());
        task.setTaskSts(TaskStsType.NEW_OUTBOUND.sts);
        task.setTaskCtg(taskCtg.getId());
        task.setPriority(priority);
@@ -182,6 +202,14 @@
            return R.error("任务类型异常");
        }

        Task one = taskService.getOne(new LambdaQueryWrapper<Task>()
                .eq(Task::getTaskCtg, taskCtg.getId())
                .eq(Task::getOriginLoc, param.getOriginLoc())
                .eq(Task::getDestLoc, param.getDestLoc()));
        if (one != null) {
            return R.error("任务已存在");
        }

        //优先级
        Integer priority = 10;
        if (param.getPriority() != null) {
@@ -191,6 +219,7 @@
        Task task = new Task();
        task.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
        task.setTaskNo(String.valueOf(Utils.getTaskNo("OUT")));
        task.setWmsTaskNo(param.getTaskNo());
        task.setTaskSts(TaskStsType.NEW_MANUAL.sts);
        task.setTaskCtg(taskCtg.getId());
        task.setPriority(priority);
@@ -244,6 +273,13 @@
            return R.error("穿梭车和目标位置不在同一楼层");
        }

        Task one = taskService.getOne(new LambdaQueryWrapper<Task>()
                .eq(Task::getTaskCtg, taskCtg.getId())
                .eq(Task::getDestLoc, param.getDestLoc()));
        if (one != null) {
            return R.error("任务已存在");
        }

        //优先级
        Integer priority = 10;
        if (param.getPriority() != null) {
@@ -253,13 +289,14 @@
        Task task = new Task();
        task.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
        task.setTaskNo(String.valueOf(Utils.getTaskNo("OUT")));
        task.setWmsTaskNo(param.getTaskNo());
        task.setTaskSts(TaskStsType.NEW_MOVE.sts);
        task.setTaskCtg(taskCtg.getId());
        task.setPriority(priority);
        task.setOriginSite(null);
        task.setOriginLoc(null);
        task.setDestSite(param.getDestLoc());
        task.setDestLoc(null);
        task.setDestSite(null);
        task.setDestLoc(param.getDestLoc());
        task.setIoTime(new Date());
        task.setStartTime(new Date());
        task.setStatus(1);