From 49379100e381557f383f601616b2f6835295786d Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 20 九月 2023 13:39:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ShuttleController.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ShuttleController.java b/src/main/java/com/zy/asrs/controller/ShuttleController.java
index bb39709..1ddba1b 100644
--- a/src/main/java/com/zy/asrs/controller/ShuttleController.java
+++ b/src/main/java/com/zy/asrs/controller/ShuttleController.java
@@ -21,6 +21,7 @@
import com.zy.common.utils.NyHttpUtils;
import com.zy.common.utils.NyShuttleOperaUtils;
import com.zy.common.utils.RedisUtil;
+import com.zy.common.utils.ShuttleDispatchUtils;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
@@ -62,6 +63,8 @@
private CommonService commonService;
@Autowired
private RedisUtil redisUtil;
+ @Autowired
+ private ShuttleDispatchUtils shuttleDispatchUtils;
@PostMapping("/table/shuttle/state")
@ManagerAuth(memo = "鍥涘悜绌挎杞︿俊鎭〃")
@@ -77,7 +80,9 @@
NyShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
JSONObject shuttleData = JSON.parseObject(JSON.toJSONString(shuttleProtocol));
if (shuttleProtocol == null || shuttleProtocol.getShuttleNo()==null) {
- list.add(shuttleData);
+ if (shuttleData != null) {
+ list.add(shuttleData);
+ }
continue;
}
@@ -337,6 +342,10 @@
ArrayList<NyShuttleHttpCommand> commands = new ArrayList<>();
commands.add(suspendCommand);
assignCommand.setCommands(commands);
+ } else if (shuttleTaskModeType == ShuttleTaskModeType.MOVE_LOC_NO_WRK_MAST) {
+ //绉诲姩鍒扮洰鏍囧簱浣�(鐢熸垚绉诲姩浠诲姟)
+ shuttleDispatchUtils.dispatchShuttle(commonService.getWorkNo(3), param.getDistLocNo(), param.getShuttleNo());
+ return R.ok();
} else {
throw new CoolException("鏈煡鍛戒护");
}
--
Gitblit v1.9.1