From 14f054c393c442cbb67503d53f357da052256565 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期五, 12 四月 2024 15:26:44 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayShuttleThread.java | 19 ++++++++++++++-----
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/ShuttleThread.java | 2 ++
2 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/ShuttleThread.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/ShuttleThread.java
index 13544ee..2e9c880 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/ShuttleThread.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/ShuttleThread.java
@@ -36,6 +36,8 @@
List<NavigateNode> getMoveAdvancePath();//鑾峰彇绌挎杞︿换鍔¤矾寰�
+ int generateDeviceTaskNo(int taskNo);//鐢熸垚纭欢璁惧宸ヤ綔鍙�
+
//***************鑾峰彇鍛戒护*****************
ShuttleCommand getMoveCommand(Integer taskNo, String startCodeNum, String distCodeNum, Integer allDistance, Integer runDirection, Integer runSpeed);//鑾峰彇绉诲姩鍛戒护
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayShuttleThread.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayShuttleThread.java
index 600cd12..9e59b6c 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayShuttleThread.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayShuttleThread.java
@@ -244,9 +244,9 @@
for (NavigateNode node : sectionNodes) {
HashMap<String, Object> map = new HashMap<>();
- map.put("nodexX", node.getX());
- map.put("nodexY", node.getY());
- map.put("nodexZ", node.getZ());
+ map.put("nodeX", node.getX());
+ map.put("nodeY", node.getY());
+ map.put("nodeZ", node.getZ());
if (flag) {
map.put("oper", oper);
flag = false;
@@ -260,7 +260,7 @@
param.put("messageName", "runRoute");
param.put("msgTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
param.put("deviceNo", device.getDeviceNo());
- param.put("taskId", taskNo);
+ param.put("taskId", generateDeviceTaskNo(taskNo));
param.put("nodeNum", nodes.size());
param.put("modes", modes);
String response = new HttpHandler.Builder()
@@ -488,12 +488,21 @@
}
@Override
+ public int generateDeviceTaskNo(int taskNo) {
+ int no = taskNo % 255;
+ if (no <= 1) {
+ no = 2;
+ }
+ return no;
+ }
+
+ @Override
public ShuttleCommand getMoveCommand(Integer taskNo, String startCodeNum, String distCodeNum, Integer allDistance, Integer runDirection, Integer runSpeed) {
HashMap<String, Object> body = new HashMap<>();
body.put("messageName", "runOrder");
body.put("msgTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
body.put("deviceNo", Integer.parseInt(this.device.getDeviceNo()));
- body.put("taskId", taskNo);
+ body.put("taskId", generateDeviceTaskNo(taskNo));
LocService locService = SpringUtils.getBean(LocService.class);
Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>()
--
Gitblit v1.9.1