From e25dbf6e099f8d94c7a366e99e4657c99a0ac308 Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期五, 09 五月 2025 10:56:00 +0800 Subject: [PATCH] # --- src/main/java/com/zy/core/action/ForkLiftAction.java | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zy/core/action/ForkLiftAction.java b/src/main/java/com/zy/core/action/ForkLiftAction.java index 3c412e4..e7c6a4b 100644 --- a/src/main/java/com/zy/core/action/ForkLiftAction.java +++ b/src/main/java/com/zy/core/action/ForkLiftAction.java @@ -63,10 +63,10 @@ return false; } - WrkMast wrkMast = wrkMastService.selectByWorkNo(taskNo); - if (wrkMast == null) { - return false; - } +// WrkMast wrkMast = wrkMastService.selectByWorkNo(taskNo); +// if (wrkMast == null) { +// return false; +// } LiftRedisCommand redisCommand = JSON.parseObject(obj.toString(), LiftRedisCommand.class); if (redisCommand == null) { @@ -96,7 +96,7 @@ ForkLiftCommand command = commands.get(commandStep); //鍒ゆ柇鎻愬崌鏈烘槸鍚︾┖闂� - if (!forkLiftThread.isIdle()) { + if (!forkLiftThread.isDeviceIdle()) { return false; } @@ -148,6 +148,8 @@ response = forkLiftThread.pickAndPut(command); } else if (command.getMode().intValue() == ForkLiftTaskModeType.SHUTTLE_SWITCH.id) { response = forkLiftThread.shuttleSwitch(command); + } else if (command.getMode().intValue() == ForkLiftTaskModeType.MOVE.id) { + response = forkLiftThread.move(command); } return response; } -- Gitblit v1.9.1