From de27c6f2d428632ed21a015dc6bfb73cc07f31a3 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 30 三月 2023 10:43:55 +0800
Subject: [PATCH] 四向穿梭车入库模式完善
---
src/main/java/com/zy/asrs/controller/ShuttleController.java | 27 ++-------------------------
1 files changed, 2 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ShuttleController.java b/src/main/java/com/zy/asrs/controller/ShuttleController.java
index 38b1212..bb931f7 100644
--- a/src/main/java/com/zy/asrs/controller/ShuttleController.java
+++ b/src/main/java/com/zy/asrs/controller/ShuttleController.java
@@ -73,7 +73,7 @@
vo.setBatteryPower(shuttleProtocol.getBatteryPower$() == null ? "" : shuttleProtocol.getBatteryPower$() + "%");//鐢垫睜鐢甸噺
vo.setBatteryTemp(shuttleProtocol.getBatteryTemp$() == null ? "" : shuttleProtocol.getBatteryTemp$() + "掳");//鐢垫睜娓╁害
if (!Cools.isEmpty(shuttleProtocol.getErrorCode())) {
-// vo.setErrorCode(shuttleProtocol.getErrorCodeType().desc);//閿欒缂栧彿
+ vo.setErrorCode(shuttleProtocol.getErrorCodeType().desc);//閿欒缂栧彿
}
vo.setPlcOutputStatusIO(shuttleProtocol.getPlcOutputStatusIO());//Plc杈撳嚭鐘舵�両O
if (!Cools.isEmpty(shuttleProtocol.getStatusErrorCode())) {
@@ -164,9 +164,6 @@
vo.setShuttleNo(shuttleSlave.getId());
BasShuttle basShuttle = basShuttleService.selectById(shuttleSlave.getId());
if (!Cools.isEmpty(basShuttle)) {
- vo.setRow(basShuttle.getRow());
- vo.setBay(basShuttle.getBay());
- vo.setLev(basShuttle.getLev());
vo.setWorkNo(basShuttle.getWrkNo());
vo.setPakMk(basShuttle.getPakMk());
}
@@ -195,23 +192,6 @@
// 绌挎杞﹀紓甯� -----------
// 绌挎杞︽彁绀轰俊鎭� ----------------------
-
- // 浠诲姟淇℃伅 ----------------
- vo.setPakInTask(shuttleProtocol.isPakInTask());
- vo.setPakOutTask(shuttleProtocol.isPakOutTask());
- vo.setPakMoveTask(shuttleProtocol.isPakMoveTask());
- vo.setGoHpTask(shuttleProtocol.isGoHpTask());
- vo.setGoOHpTask(shuttleProtocol.isGoOHpTask());
- vo.setGoHpAvoid(shuttleProtocol.isGoHpAvoid());
- vo.setGoOHpAvoid(shuttleProtocol.isGoOHpAvoid());
- vo.setPakInEmpty(shuttleProtocol.isPakInEmpty());
- vo.setPakInFinish(shuttleProtocol.isPakInFinish());
- vo.setPakOutEmpty(shuttleProtocol.isPakOutEmpty());
- vo.setPakOutFinish(shuttleProtocol.isPakOutFinish());
- vo.setGoHpAvoidFinish(shuttleProtocol.isGoHpAvoidFinish());
- vo.setGoOHpAvoidFinish(shuttleProtocol.isGoOHpAvoidFinish());
- vo.setGoHpAvoidErr(shuttleProtocol.isGoHpAvoidErr());
- vo.setGoOHpAvoidErr(shuttleProtocol.isGoOHpAvoidErr());
// 鐘舵�佷俊鎭� -------------
@@ -245,9 +225,6 @@
} else {
throw new CoolException("鍛戒护涓嬪彂澶辫触");
}
- basShuttle.setRow(vo.getRow());
- basShuttle.setBay(vo.getBay());
- basShuttle.setLev(vo.getLev());
basShuttle.setPakMk(vo.getPakMk());
basShuttle.setWrkNo(vo.getWorkNo());
@@ -289,7 +266,7 @@
command.setShuttleNo(shuttleSlave.getId().shortValue()); // 鍥涘悜绌挎杞︾紪鍙�
command.setTaskMode(shuttleTaskModeType.id.shortValue());
command.setSourceLocNo(param.getSourceLocNo());
- command.setDistLocNo(param.getDistLocNo());
+ command.setLocNo(param.getDistLocNo());
command.setTaskNo((short) 9999);
if (MessageQueue.offer(SlaveType.Shuttle, shuttleSlave.getId(), new Task(3, command))) {
--
Gitblit v1.9.1