1

zhang

昨天 2ddf6fc24333df35bd1ac15848b917336d533d53

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/OpenController.java

@@ -56,20 +56,17 @@
    //@PreAuthorize("hasAuthority('open:bus:submit')")
    @PostMapping("/bus/submit")
    @OperationLog("generate task from open api")
    public R save(@RequestBody OpenBusSubmitParam param) {
        if (!configService.getVal("TaskAssignMode", Boolean.class)) {
            for (TaskDto taskDto : param.getTaskList()) {
                if (Cools.isEmpty(taskDto.getSeqNum())) {
                    return R.error("缺失任务号");
                }
                if(Cools.isEmpty(taskDto.getPriority())){
                    taskDto.setPriority(1);
                }
    public synchronized R save(@RequestBody OpenBusSubmitParam param) {
        for (TaskDto taskDto : param.getTaskList()) {
            if (Cools.isEmpty(taskDto.getSeqNum())) {
                return R.error("缺失任务号");
            }
            mainService.generateBusAndTask(param, null);
            return R.ok("generate tasks success");
            if (Cools.isEmpty(taskDto.getPriority())) {
                taskDto.setPriority(1);
            }
        }
        return R.error("generate tasks error");
        mainService.generateBusAndTask(param, null);
        return R.ok("generate tasks success");
    }


@@ -141,45 +138,41 @@
    @PostMapping("/loc/one")
    @OperationLog("one loc")
    public R emptyLoc(@RequestBody Map<String, Object> map) {
        if (!configService.getVal("TaskAssignMode", Boolean.class)) {
            if (configService.getVal("InAndOutMode", Boolean.class, false)) {
                String staNo = map.get("staNo").toString();
                Integer startRow = null;
                Integer endRow = null;
                if (staNo.equals("101-2") || staNo.equals("101-3") || staNo.equals("102-2") || staNo.equals("102-3")) {
                    startRow = Collections.min(LocGroupConstant.FAR_RIGHT_LOC_ROW_LIST);
                    endRow = Collections.max(LocGroupConstant.FAR_RIGHT_LOC_ROW_LIST);
                } else if (staNo.equals("103-2") || staNo.equals("103-3") || staNo.equals("104-2") || staNo.equals("104-3")) {
                    startRow = Collections.min(LocGroupConstant.RIGHT_LOC_ROW_LIST);
                    endRow = Collections.max(LocGroupConstant.RIGHT_LOC_ROW_LIST);
                } else if (staNo.equals("105-2") || staNo.equals("105-3") || staNo.equals("106-2") || staNo.equals("106-3")) {
                    startRow = Collections.min(LocGroupConstant.MIDDLE_LOC_ROW_LIST);
                    endRow = Collections.max(LocGroupConstant.MIDDLE_LOC_ROW_LIST);
                } else if (staNo.equals("107-2") || staNo.equals("107-3") || staNo.equals("108-2") || staNo.equals("108-3")) {
                    startRow = Collections.min(LocGroupConstant.LEFT_LOC_ROW_LIST);
                    endRow = Collections.max(LocGroupConstant.LEFT_LOC_ROW_LIST);
                } else if (staNo.equals("1007") || staNo.equals("1001")) {
                    startRow = Collections.min(LocGroupConstant.FAR_LEFT_LOC_ROW_LIST);
                    endRow = Collections.max(LocGroupConstant.FAR_LEFT_LOC_ROW_LIST);
                } else {
                    return R.error("staNo is not support");
                }
                LambdaQueryWrapper<Loc> idleWrapper = new LambdaQueryWrapper<Loc>().eq(Loc::getLocSts, Long.parseLong(map.get("sts").toString()));
                if (null != startRow) {
                    idleWrapper.ge(Loc::getRow, startRow);
                }
                if (null != endRow) {
                    idleWrapper.le(Loc::getRow, endRow);
                }
                List<Loc> idleList = locService.list(idleWrapper);
                if (Cools.isEmpty(idleList)) {
                    return R.error("没空库位");
                }
                Collections.shuffle(idleList);
                return R.ok().add(idleList.get(0));
            }

        String staNo = map.get("staNo").toString();
        Integer startRow = null;
        Integer endRow = null;
        if (staNo.equals("101-2") || staNo.equals("101-3") || staNo.equals("102-2") || staNo.equals("102-3")) {
            startRow = Collections.min(LocGroupConstant.FAR_RIGHT_LOC_ROW_LIST);
            endRow = Collections.max(LocGroupConstant.FAR_RIGHT_LOC_ROW_LIST);
        } else if (staNo.equals("103-2") || staNo.equals("103-3") || staNo.equals("104-2") || staNo.equals("104-3")) {
            startRow = Collections.min(LocGroupConstant.RIGHT_LOC_ROW_LIST);
            endRow = Collections.max(LocGroupConstant.RIGHT_LOC_ROW_LIST);
        } else if (staNo.equals("105-2") || staNo.equals("105-3") || staNo.equals("106-2") || staNo.equals("106-3")) {
            startRow = Collections.min(LocGroupConstant.MIDDLE_LOC_ROW_LIST);
            endRow = Collections.max(LocGroupConstant.MIDDLE_LOC_ROW_LIST);
        } else if (staNo.equals("107-2") || staNo.equals("107-3") || staNo.equals("108-2") || staNo.equals("108-3")) {
            startRow = Collections.min(LocGroupConstant.LEFT_LOC_ROW_LIST);
            endRow = Collections.max(LocGroupConstant.LEFT_LOC_ROW_LIST);
        } else if (staNo.equals("1007") || staNo.equals("1001")) {
            startRow = Collections.min(LocGroupConstant.FAR_LEFT_LOC_ROW_LIST);
            endRow = Collections.max(LocGroupConstant.FAR_LEFT_LOC_ROW_LIST);
        } else {
            return R.error("staNo is not support");
        }
        return R.error("未开启该模式");
        LambdaQueryWrapper<Loc> idleWrapper = new LambdaQueryWrapper<Loc>().eq(Loc::getLocSts, Long.parseLong(map.get("sts").toString()));
        if (null != startRow) {
            idleWrapper.ge(Loc::getRow, startRow);
        }
        if (null != endRow) {
            idleWrapper.le(Loc::getRow, endRow);
        }
        List<Loc> idleList = locService.list(idleWrapper);
        if (Cools.isEmpty(idleList)) {
            return R.error("没空库位");
        }
        Collections.shuffle(idleList);
        return R.ok().add(idleList.get(0));
    }

}