#

Junjie

2023-09-18 b79a7ba5f841d203dc3e374692c781442f52c85c

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

@@ -117,6 +117,7 @@
            NyShuttleHttpCommand readStatusCommand = NyHttpUtils.getReadStatusCommand(slave.getId());
            JSONObject jsonObject = NyHttpUtils.requestCommand(socket, readStatusCommand);
            if (jsonObject == null) {
                shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.OFFLINE);
                OutputQueue.SHUTTLE.offer(MessageFormat.format("【{0}】四向穿梭车Socket状态信息失败 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
            }else {
                //手动状态/自动状态
@@ -393,10 +394,10 @@
            return false;//小车状态忙，禁止执行命令
        }

        //检测小车是否要进提升机，如需要进提升机则调度提升机
        if (!checkLiftStation(wrkNo)) {
            return false;
        }
//        //检测小车是否要进提升机，如需要进提升机则调度提升机
//        if (!checkLiftStation(wrkNo)) {
//            return false;
//        }

        //检测穿梭车是否在提升机内
        if (!checkShuttleInTheLift(wrkNo)) {
@@ -437,7 +438,8 @@
                    null,
                    null,
                    JSON.toJSONString(command),
                    null
                    null,
                    JSON.toJSONString(shuttleProtocol)
            );
            shuttleOptService.insert(opt);
        }