From 2db722e23d7e5d1d2e719174938f354d804644af Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 23 四月 2024 08:13:52 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/LiftCommandService.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 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..4fb2d5f 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
@@ -19,7 +19,6 @@
import org.springframework.stereotype.Service;
import java.util.ArrayList;
-import java.util.Date;
import java.util.Objects;
/**
@@ -63,7 +62,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 +70,11 @@
case LIFT_MOVE:
// 濡傛灉宸茬粡鍦ㄧ洰鏍囧眰锛岄偅杈瑰眰杩囨护
if (liftProtocol.getLev().equals(Integer.valueOf(motion.getTarget()))) {
- liftProtocol.setTaskNo(motion.getWrkNo());
+ liftThread.setSyncTaskNo(motion.getTaskNo());
break;
}
- command = liftThread.getEmptyMoveCommand(motion.getWrkNo(), Integer.parseInt(motion.getTarget()));
+ command = liftThread.getMoveCommand(motion.getTaskNo(), 0, Integer.parseInt(motion.getTarget()), null);
list.add(command);
return liftAction.assignWork(liftThread.getDevice(), assignCommand);
case LIFT_WITH_GOODS:
@@ -93,7 +92,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()), null);
list.add(command);
return liftAction.assignWork(liftThread.getDevice(), assignCommand);
case LIFT_WITH_GOODS_AND_SHUTTLE:
@@ -209,7 +208,7 @@
return false;
}
- if (liftProtocol.getRun() || liftProtocol.getTaskNo() != motion.getWrkNo().shortValue()) {
+ if (liftProtocol.getRun() || liftProtocol.getTaskNo() != motion.getTaskNo().shortValue()) {
return false;
}
@@ -339,7 +338,7 @@
return false;
}
- liftProtocol.setTaskNo(0);//娓呴浂宸ヤ綔鍙�
+ liftThread.setSyncTaskNo(0);//娓呴浂宸ヤ綔鍙�
return true;
}
--
Gitblit v1.9.1