From f375928943ad4b9fe6d8508e151971dcdc23e982 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期一, 05 一月 2026 16:18:36 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/DualCrnController.java | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/DualCrnController.java b/src/main/java/com/zy/asrs/controller/DualCrnController.java
index 7262f27..1d9123d 100644
--- a/src/main/java/com/zy/asrs/controller/DualCrnController.java
+++ b/src/main/java/com/zy/asrs/controller/DualCrnController.java
@@ -56,15 +56,11 @@
vo.setLoading(p.getLoaded() != null && p.getLoaded() == 1 ? "鏈夌墿" : "鏃犵墿");
vo.setLoadingTwo(p.getLoadedTwo() != null && p.getLoadedTwo() == 1 ? "鏈夌墿" : "鏃犵墿");
vo.setBay(p.getBay());
- vo.setBayTwo(p.getBayTwo());
vo.setLev(p.getLevel());
- vo.setLevTwo(p.getLevelTwo());
vo.setForkOffset(p.getForkPosType() == null ? "-" : p.getForkPosType().desc);
vo.setForkOffsetTwo(p.getForkPosTypeTwo() == null ? "-" : p.getForkPosTypeTwo().desc);
vo.setLiftPos(p.getLiftPosType() == null ? "-" : p.getLiftPosType().desc);
- vo.setLiftPosTwo(p.getLiftPosTypeTwo() == null ? "-" : p.getLiftPosTypeTwo().desc);
vo.setWalkPos(p.getWalkPos() != null && p.getWalkPos() == 0 ? "鍦ㄥ畾浣�" : "涓嶅湪瀹氫綅");
- vo.setWalkPosTwo(p.getWalkPosTwo() != null && p.getWalkPosTwo() == 0 ? "鍦ㄥ畾浣�" : "涓嶅湪瀹氫綅");
vo.setTaskReceive(p.getTaskReceive() != null && p.getTaskReceive() == 1 ? "鎺ユ敹" : "鏃犱换鍔�");
vo.setTaskReceiveTwo(p.getTaskReceiveTwo() != null && p.getTaskReceiveTwo() == 1 ? "鎺ユ敹" : "鏃犱换鍔�");
vo.setXspeed(p.getXSpeed());
@@ -159,7 +155,7 @@
}
DualCrnCommand command = crnThread.getMoveCommand(targetLocNo, 9999, crnNo);
if (station != null) {
- command.setStation(station.shortValue());
+ command.setStation(station);
}
MessageQueue.offer(SlaveType.DualCrn, crnNo, new Task(3, command));
return R.ok();
--
Gitblit v1.9.1