添加仓库类型 单据添加上报完成类型

skyouc

昨天 e6cf7f032bee1cef9c49258746da44d66ca85c6c

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

@@ -146,16 +146,24 @@
     * @description: 自动生成任务
     * @version 1.0
     */
    @Scheduled(cron = "0/5 * * * * ?")
    @Scheduled(cron = "0/15 * * * * ?")
    public void genRun() {
        Config config = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.AUTO_RUN_CHECK_ORDERS));
        if (!Boolean.parseBoolean(config.getVal())) {
            return;
        }

        Integer maxThread = 30;
        Config confNum = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.AUTO_RUN_MOVE_THEAD_MAX));
        if (!Objects.isNull(confNum)) {
            maxThread = Integer.valueOf(confNum.getVal());
        }


        //获取任务列表中，为盘点出库的任务
        List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
                .in(Task::getTaskType, Arrays.asList(TaskType.TASK_TYPE_CHECK_OUT.type, TaskType.TASK_TYPE_CHECK_IN.type)));
        if (tasks.size() >= 30) {
        if (tasks.size() >= maxThread) {
            return;
        }
        String autoRunArea = configService.getVal("AUTO_RUN_AREA", String.class);
@@ -210,7 +218,7 @@
                }
                DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>()
                        .in(DeviceSite::getSite, stationNames)
                        .eq(DeviceSite::getType, TaskType.TASK_TYPE_CHECK_OUT.type), false);
                        .eq(DeviceSite::getType, TaskType.TASK_TYPE_CHECK_OUT.type).last("limit 1"));
                if (Cools.isEmpty(deviceSite)) {
                    throw new CoolException("无可用路径！！");
                }
@@ -271,18 +279,24 @@
     * @param
     */
    // 移库
    @Scheduled(cron = "0/7 * * * * ?")
    @Scheduled(cron = "0/23 * * * * ?")
    @Transactional(rollbackFor = Exception.class)
    public void runLocToLoc() {
        Config config = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.AUTO_RUN_CHECK_ORDERS));
        if (!Boolean.parseBoolean(config.getVal())) {
            return;
        }
        Integer maxThread = 50;
        Config confNum = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.AUTO_RUN_MOVE_THEAD_MAX));
        if (!Objects.isNull(confNum)) {
            maxThread = Integer.valueOf(confNum.getVal());
        }

        List<Integer> locGroupList = new ArrayList<>();
        //获取任务列表中，为盘点出库的任务
        List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
                .eq(Task::getTaskType, TaskType.TASK_TYPE_LOC_MOVE.type));
        if (!tasks.isEmpty() && tasks.size() >= 10) {
        if (!tasks.isEmpty() && tasks.size() >= maxThread) {
            return;
        }
        String autoRunArea = configService.getVal("AUTO_RUN_AREA", String.class);