From 3494dd089e4cee3fcb61ec3db28c74af790a0635 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 17 十月 2024 14:10:03 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/ShuttleAction.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/ShuttleAction.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/ShuttleAction.java
index 6bcfefc..5d825f1 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/ShuttleAction.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/ShuttleAction.java
@@ -79,10 +79,10 @@
redisCommand.setAssignCommand(assignCommand);//鍛戒护
//浠诲姟鏁版嵁淇濆瓨鍒皉edis
if (redisUtil.set(DeviceRedisConstant.SHUTTLE_WORK_FLAG + assignCommand.getTaskNo(), JSON.toJSONString(redisCommand, SerializerFeature.DisableCircularReferenceDetect))) {
- if (assignCommand.getTaskMode() == ShuttleTaskModeType.PAK_IN.id
- || assignCommand.getTaskMode() == ShuttleTaskModeType.PAK_OUT.id
- || assignCommand.getTaskMode() == ShuttleTaskModeType.MOVE_LOC_NO.id
- || assignCommand.getTaskMode() == ShuttleTaskModeType.SHUTTLE_MOVE_LOC_NO.id) {
+ if (assignCommand.getTaskMode() == ShuttleTaskModeType.SHUTTLE_MOVE.id
+ || assignCommand.getTaskMode() == ShuttleTaskModeType.TRANSPORT.id
+ || assignCommand.getTaskMode() == ShuttleTaskModeType.MOVE_PALLET_LIFT.id
+ || assignCommand.getTaskMode() == ShuttleTaskModeType.MOVE_PALLET_DOWN.id) {
//涓嬪彂琛岄┒璺緞
CommandResponse response = shuttleThread.movePath(assignCommand.getNodes(), assignCommand.getDeviceTaskNo());
Boolean result = response.getResult();
@@ -270,7 +270,7 @@
basShuttleOpt.setTaskNo(redisCommand.getTaskNo());
basShuttleOpt.setShuttleNo(Integer.parseInt(device.getDeviceNo()));
- basShuttleOpt.setMode(ShuttleCommandModeType.get(command.getMode()).desc);
+ basShuttleOpt.setMode(ShuttleTaskModeType.get(assignCommand.getTaskMode()).desc);
basShuttleOpt.setSourceLocNo(assignCommand.getSourceLocNo());
basShuttleOpt.setDistLocNo(assignCommand.getLocNo());
basShuttleOpt.setCommand(JSON.toJSONString(command));
--
Gitblit v1.9.1