From 05f2733c4cdc4ea0765e08d61273728aebb70d16 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 18 三月 2025 15:51:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/ForkLiftThread.java | 2 +-
src/main/java/com/zy/core/thread/impl/LfdZyForkLiftSlaveThread.java | 16 +++++++++++-----
src/main/resources/application.yml | 8 ++++----
src/main/java/com/zy/core/thread/impl/ZyForkLiftThread.java | 16 +++++++++++-----
4 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/ForkLiftThread.java b/src/main/java/com/zy/core/thread/ForkLiftThread.java
index 6ae81a1..866de88 100644
--- a/src/main/java/com/zy/core/thread/ForkLiftThread.java
+++ b/src/main/java/com/zy/core/thread/ForkLiftThread.java
@@ -44,6 +44,6 @@
List<ForkLiftCommand> getPickAndPutCommand(Integer taskNo, Integer pick, Integer put);//鍙栨斁璐ф寚浠�
- List<ForkLiftCommand> getShuttleSwitchCommand(Integer taskNo, Integer originLev, Integer targetLev);//灏忚溅鎹㈠眰
+ List<ForkLiftCommand> getShuttleSwitchCommand(Integer taskNo, Integer pick, Integer put);//灏忚溅鎹㈠眰
}
diff --git a/src/main/java/com/zy/core/thread/impl/LfdZyForkLiftSlaveThread.java b/src/main/java/com/zy/core/thread/impl/LfdZyForkLiftSlaveThread.java
index f5ad17e..a46d4c7 100644
--- a/src/main/java/com/zy/core/thread/impl/LfdZyForkLiftSlaveThread.java
+++ b/src/main/java/com/zy/core/thread/impl/LfdZyForkLiftSlaveThread.java
@@ -369,13 +369,16 @@
@Override
public List<ForkLiftCommand> getPickAndPutCommand(Integer taskNo, Integer pick, Integer put) {
+ Integer realPick = pick % 1000;
+ Integer realPut = put % 1000;
+
List<ForkLiftCommand> commands = new ArrayList<>();
ForkLiftCommand command = new ForkLiftCommand();
command.setLiftNo(slave.getId());
command.setTaskNo(taskNo.shortValue());
command.setMode(ForkLiftTaskModeType.PICK_PUT.id.shortValue());
- command.setPick(pick.shortValue());
- command.setPut(put.shortValue());
+ command.setPick(realPick.shortValue());
+ command.setPut(realPut.shortValue());
command.setConfirm((short) 1);
commands.add(command);
@@ -383,14 +386,17 @@
}
@Override
- public List<ForkLiftCommand> getShuttleSwitchCommand(Integer taskNo, Integer originLev, Integer targetLev) {
+ public List<ForkLiftCommand> getShuttleSwitchCommand(Integer taskNo, Integer pick, Integer put) {
+ Integer realPick = pick % 1000;
+ Integer realPut = put % 1000;
+
List<ForkLiftCommand> commands = new ArrayList<>();
ForkLiftCommand command = new ForkLiftCommand();
command.setLiftNo(slave.getId());
command.setTaskNo(taskNo.shortValue());
command.setMode(ForkLiftTaskModeType.SHUTTLE_SWITCH.id.shortValue());
- command.setPick(originLev.shortValue());
- command.setPut(targetLev.shortValue());
+ command.setPick(realPick.shortValue());
+ command.setPut(realPut.shortValue());
command.setConfirm((short) 1);
commands.add(command);
diff --git a/src/main/java/com/zy/core/thread/impl/ZyForkLiftThread.java b/src/main/java/com/zy/core/thread/impl/ZyForkLiftThread.java
index 10900c0..a23d30f 100644
--- a/src/main/java/com/zy/core/thread/impl/ZyForkLiftThread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZyForkLiftThread.java
@@ -365,13 +365,16 @@
@Override
public List<ForkLiftCommand> getPickAndPutCommand(Integer taskNo, Integer pick, Integer put) {
+ Integer realPick = pick % 1000;
+ Integer realPut = put % 1000;
+
List<ForkLiftCommand> commands = new ArrayList<>();
ForkLiftCommand command = new ForkLiftCommand();
command.setLiftNo(slave.getId());
command.setTaskNo(taskNo.shortValue());
command.setMode(ForkLiftTaskModeType.PICK_PUT.id.shortValue());
- command.setPick(pick.shortValue());
- command.setPut(put.shortValue());
+ command.setPick(realPick.shortValue());
+ command.setPut(realPut.shortValue());
command.setConfirm((short) 1);
commands.add(command);
@@ -379,14 +382,17 @@
}
@Override
- public List<ForkLiftCommand> getShuttleSwitchCommand(Integer taskNo, Integer originLev, Integer targetLev) {
+ public List<ForkLiftCommand> getShuttleSwitchCommand(Integer taskNo, Integer pick, Integer put) {
+ Integer realPick = pick % 1000;
+ Integer realPut = put % 1000;
+
List<ForkLiftCommand> commands = new ArrayList<>();
ForkLiftCommand command = new ForkLiftCommand();
command.setLiftNo(slave.getId());
command.setTaskNo(taskNo.shortValue());
command.setMode(ForkLiftTaskModeType.SHUTTLE_SWITCH.id.shortValue());
- command.setPick(originLev.shortValue());
- command.setPut(targetLev.shortValue());
+ command.setPick(realPick.shortValue());
+ command.setPut(realPut.shortValue());
command.setConfirm((short) 1);
commands.add(command);
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index cc24188..4a6afa3 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -80,18 +80,18 @@
staRow: 9
staBay: 6
sta[0]:
- staNo: 1
+ staNo: 1001
lev: 1
liftNo: ${wcs-slave.forkLift[0].id}
sta[1]:
- staNo: 2
+ staNo: 1002
lev: 2
liftNo: ${wcs-slave.forkLift[0].id}
sta[2]:
- staNo: 3
+ staNo: 1003
lev: 3
liftNo: ${wcs-slave.forkLift[0].id}
sta[3]:
- staNo: 4
+ staNo: 1004
lev: 4
liftNo: ${wcs-slave.forkLift[0].id}
\ No newline at end of file
--
Gitblit v1.9.1