#

Junjie

2025-05-09 3d1ed275f9d9915a69b790e05610aba6ee6287e6

#

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -1922,6 +1922,12 @@
                continue;
            }

            //存在调度锁
            Object object = redisUtil.get(RedisKeyType.OUT_TASK_PREVIEW_DISPATCH_FORKLIFT.key + forkLiftProtocol.getLiftNo());
            if (object != null) {
                continue;
            }

            //判断提升机是否有其他任务
            WrkMast liftWrkMast = wrkMastService.selectLiftWrkMast(wrkMast.getLiftNo());
            if (liftWrkMast != null) {
@@ -1953,6 +1959,8 @@
            assignCommand.setTaskMode(ForkLiftTaskModeType.MOVE.id.shortValue());

            forkLiftAction.assignWork(forkLiftProtocol.getLiftNo(), assignCommand);

            redisUtil.set(RedisKeyType.OUT_TASK_PREVIEW_DISPATCH_FORKLIFT.key + forkLiftProtocol.getLiftNo(), "lock", 30);//30秒不再调度
        }
    }


 src/main/java/com/zy/core/enums/RedisKeyType.java

@@ -12,6 +12,7 @@
    QUEUE_FORK_LIFT("queue_fork_lift_"),
    QUEUE_TASK("queue_task_"),
    FORK_LIFT_PUT_COMPLETE("fork_lift_put_complete_"),
    OUT_TASK_PREVIEW_DISPATCH_FORKLIFT("out_task_preview_dispatch_forklift_"),
    ;

    public String key;

 src/main/java/com/zy/core/thread/impl/NyShuttleThread.java

@@ -721,6 +721,19 @@
            }
        }

        //***************判断是否满充校准***************
        Config shuttleMaxPowerVerifyConfig = configService.selectOne(new EntityWrapper<Config>()
                .eq("code", "shuttleMaxPowerVerify")
                .eq("status", 1));
        if (shuttleMaxPowerVerifyConfig != null) {
            if (shuttleMaxPowerVerifyConfig.getValue().equals("true")) {
                if (this.shuttleProtocol.getBatteryVoltage() < 5630) {
                    return false;//电压不够继续充电
                }
            }
        }
        //***************判断是否满充校准***************

        if (this.shuttleProtocol.getHasCharge() == null) {
            return false;
        }