From 5fd478fcee23bbdac0fe4fbe9becdd2a28d14c56 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期六, 13 七月 2024 14:27:04 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/ShuttleAction.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/ShuttleAction.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/ShuttleAction.java
index 1be358f..44bcacd 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/ShuttleAction.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/ShuttleAction.java
@@ -323,8 +323,10 @@
shuttleDispatcher.generateMoveTask(device, start.getLocNo());
}else {
//鍦ㄨ捣鐐逛綅缃紝璋冨害鍘荤洰鏍囦綅缃�
- shuttleDispatcher.generateMoveTask(device, target.getLocNo());
- shuttleProtocol.setYCurrent(shuttleProtocol.getYCurrent() + 1);//鍒囨崲y杞�
+ Task task = shuttleDispatcher.generateMoveTask(device, target.getLocNo());
+ if (task != null) {
+ shuttleProtocol.setYCurrent(shuttleProtocol.getYCurrent() + 1);//鍒囨崲y杞�
+ }
if(shuttleProtocol.getYCurrent() > shuttleProtocol.getYTarget()) {
//y杞翠篃璺戝畬浜嗭紝缁撴潫璺戝簱
@@ -362,8 +364,10 @@
shuttleDispatcher.generateMoveTask(device, start.getLocNo());
}else {
//鍦ㄨ捣鐐逛綅缃紝璋冨害鍘荤洰鏍囦綅缃�
- shuttleDispatcher.generateMoveTask(device, target.getLocNo());
- shuttleProtocol.setXCurrent(shuttleProtocol.getXCurrent() + 1);//鍒囨崲x杞�
+ Task task = shuttleDispatcher.generateMoveTask(device, target.getLocNo());
+ if (task != null) {
+ shuttleProtocol.setXCurrent(shuttleProtocol.getXCurrent() + 1);//鍒囨崲x杞�
+ }
if(shuttleProtocol.getXCurrent() > shuttleProtocol.getXTarget()) {
//y杞翠篃璺戝畬浜嗭紝缁撴潫璺戝簱
@@ -486,6 +490,7 @@
return;
}
}
+ return;
}
//璋冨害鍘诲簱浣�
@@ -641,7 +646,11 @@
result = shuttleThread.charge(command);
} else if (command.getMode() == ShuttleCommandModeType.RESET.id) {//澶嶄綅
result = shuttleThread.reset(command);
+ } else if (command.getMode() == ShuttleCommandModeType.UPDATE_LOCATION.id) {//鏇存柊鍧愭爣
+ result = shuttleThread.updateLocation(command);
}
+
+ News.info("鍥涘悜绌挎杞﹀懡浠や笅鍙戯紝绌挎杞﹀彿={}锛屼换鍔℃暟鎹�={}", device.getDeviceNo(), JSON.toJSON(command));
return result;
}
--
Gitblit v1.9.1