From 99a13ac3e2c52881577cbf4a69ccc17f349eeec7 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 17 四月 2024 09:22:12 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/LiftCommandService.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/LiftCommandService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/LiftCommandService.java
index 3f67aa7..5e6a8a1 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/LiftCommandService.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/LiftCommandService.java
@@ -63,7 +63,7 @@
ArrayList<LiftCommand> list = new ArrayList<>();
LiftAssignCommand assignCommand = new LiftAssignCommand();
assignCommand.setLiftNo(liftProtocol.getLiftNo());
- assignCommand.setTaskNo(motion.getWrkNo());
+ assignCommand.setTaskNo(motion.getTaskNo());
assignCommand.setCommands(list);
LiftCommand command = new LiftCommand();
@@ -71,11 +71,11 @@
case LIFT_MOVE:
// 濡傛灉宸茬粡鍦ㄧ洰鏍囧眰锛岄偅杈瑰眰杩囨护
if (liftProtocol.getLev().equals(Integer.valueOf(motion.getTarget()))) {
- liftProtocol.setTaskNo(motion.getWrkNo());
+ liftProtocol.setTaskNo(motion.getTaskNo());
break;
}
- command = liftThread.getEmptyMoveCommand(motion.getWrkNo(), Integer.parseInt(motion.getTarget()));
+ command = liftThread.getEmptyMoveCommand(motion.getTaskNo(), Integer.parseInt(motion.getTarget()));
list.add(command);
return liftAction.assignWork(liftThread.getDevice(), assignCommand);
case LIFT_WITH_GOODS:
@@ -93,7 +93,7 @@
return false;
}
- command = liftThread.getMoveWithShuttleCommand(motion.getWrkNo(), Integer.parseInt(motion.getOrigin()), Integer.parseInt(motion.getTarget()));
+ command = liftThread.getMoveWithShuttleCommand(motion.getTaskNo(), Integer.parseInt(motion.getOrigin()), Integer.parseInt(motion.getTarget()));
list.add(command);
return liftAction.assignWork(liftThread.getDevice(), assignCommand);
case LIFT_WITH_GOODS_AND_SHUTTLE:
@@ -209,7 +209,7 @@
return false;
}
- if (liftProtocol.getRun() || liftProtocol.getTaskNo() != motion.getWrkNo().shortValue()) {
+ if (liftProtocol.getRun() || liftProtocol.getTaskNo() != motion.getTaskNo().shortValue()) {
return false;
}
--
Gitblit v1.9.1