盘点差异单功能优化

skyouc

3 天以前 0d692433815cd80bab48091829c427e22d4663d0

 rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.utils.LocUtils;
import com.vincent.rsf.server.common.constant.Constants;
import com.vincent.rsf.server.manager.controller.params.LocToTaskParams;
import com.vincent.rsf.server.manager.enums.LocStsType;
import com.vincent.rsf.server.manager.enums.TaskStsType;
@@ -48,7 +49,6 @@
    private ConfigService configService;
    @Autowired
    private LocServiceImpl locService;

    @Value("${wcs-slave.doubleLocs}")
    private List<Integer> rows;
    @Autowired
@@ -93,14 +93,19 @@

    /**
     * 任务自动下发
     *
     * @throws Exception
     */
//    @Scheduled(cron = "0/5 * * * * ?  ")
    @Scheduled(cron = "0/5 * * * * ?  ")
    @Transactional(rollbackFor = Exception.class)
    public void taskToWCS() throws Exception {
        Long loginUserId = SystemAuthUtils.getLoginUserId();
        List<Integer> list = Arrays.asList(TaskType.TASK_TYPE_IN.type, TaskType.TASK_TYPE_OUT.type);
        List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().in(Task::getTaskType, list).orderByDesc(Task::getSort));
        List<Integer> integers = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
        List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
                .in(Task::getTaskType, list)
                .in(Task::getTaskStatus, integers)
                .orderByDesc(Task::getSort));
        for (Task task : tasks) {
            Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, task.getBarcode()));
            if (Objects.isNull(loc)) {
@@ -121,7 +126,11 @@
                LocToTaskParams params = new LocToTaskParams();
                params.setOrgLoc(shallowLoc).setType(TaskType.TASK_TYPE_LOC_MOVE.type + "");
                //生成移库任务
                locItemService.genMoveTask(params, loginUserId);
                Task moveTask = locItemService.genMoveTask(params, loginUserId);
                moveTask.setSort(!Objects.isNull(task.getSort()) ? task.getSort() + 1 : Constants.TASK_SORT_DEFAULT_VALUE + 1);
                if (!taskService.updateById(moveTask)) {
                    throw new Exception("任务优先级更新失败！！");
                }
            }
            //TODO 调用下发任务接口
        }
@@ -129,25 +138,25 @@

    /**
     * 每五秒校验深库位是否为空，如果浅库位有货，将浅库位移至深库位
     */
    @Scheduled(cron = "0/35 * * * * ?  ")
    @Transactional(rollbackFor = Exception.class)
    public void shallocToDeep() throws Exception {
        List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>()
                .eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type)
                .in(Loc::getRow, rows));
        if (locs.isEmpty()) {
            return;
        }
        for (Loc loc : locs) {
            String shallowLoc = LocUtils.getShallowLoc(loc.getCode());
            Loc one = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, shallowLoc));
            if (Objects.isNull(one) || !one.getUseStatus().equals(LocStsType.LOC_STS_TYPE_F.type)) {
                continue;
            }
            taskService.moveToDeep(SystemAuthUtils.getLoginUserId(), shallowLoc);
        }
    }
     *///TODO 生成移库任务前，需要检查是否有任务前往当前托盘
//    @Scheduled(cron = "0/35 * * * * ?  ")
//    @Transactional(rollbackFor = Exception.class)
//    public void shallocToDeep() throws Exception {
//        List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>()
//                .eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type)
//                .in(Loc::getRow, rows));
//        if (locs.isEmpty()) {
//            return;
//        }
//        for (Loc loc : locs) {
//            String shallowLoc = LocUtils.getShallowLoc(loc.getCode());
//            Loc one = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, shallowLoc));
//            if (Objects.isNull(one) || !one.getUseStatus().equals(LocStsType.LOC_STS_TYPE_F.type)) {
//                continue;
//            }
//            taskService.moveToDeep(SystemAuthUtils.getLoginUserId(), shallowLoc);
//        }
//    }


    /**
@@ -161,7 +170,7 @@
    @Transactional(rollbackFor = Exception.class)
    public void taskLogUpdate() {
        LambdaQueryWrapper<Task> queryWrapper = new LambdaQueryWrapper<Task>();
        Config config = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.ORDER_INOF_REPORT_PLAT));
        Config config = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.ORDER_INOF_REPORT_PLAT));//是否上报平台
        if (!Objects.isNull(config)) {
            if (Boolean.parseBoolean(config.getVal())) {
                queryWrapper.in(Task::getTaskStatus, TaskStsType.REPORT_IN.id);