#

Junjie

2024-04-13 dd3fb4ab39ede8427e3f106fc5c654ea6562365c

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/ShuttleAction.java

@@ -78,7 +78,7 @@
                    return false;
                }
            }
            shuttleProtocol.setTaskNo(assignCommand.getTaskNo());
            shuttleProtocol.setSyncTaskNo(assignCommand.getTaskNo());
            return true;
        }
        return false;
@@ -112,9 +112,17 @@
        }

        //判断设备是否空闲
        if (!shuttleThread.isIdle(() -> {
            return shuttleProtocol.getTaskNo().equals(taskNo);
        })) {
        if (!shuttleThread.isDeviceIdle()) {
            return false;
        }
//        if (!shuttleThread.isIdle(() -> {
//            return shuttleProtocol.getTaskNo().equals(taskNo);
//        })) {
//            return false;
//        }

        //判断工作号是否相同
        if (!shuttleProtocol.getTaskNo().equals(taskNo)) {
            return false;
        }

@@ -200,7 +208,7 @@
                    //手动模式不抛出等待状态，直接复位空闲状态
                    shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.IDLE);
                    //任务号清零
                    shuttleProtocol.setTaskNo(0);
                    shuttleProtocol.setSyncTaskNo(0);
                    //标记复位
                    shuttleProtocol.setPakMk(true);
                    News.info("四向穿梭车手动任务执行完成，穿梭车号={}，任务数据={}", shuttleProtocol.getShuttleNo(), JSON.toJSON(command));