From 0143cc146be484ab3f41e15ec2fc4dab21ebc65f Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 14 一月 2025 14:13:28 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ShuttleController.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ShuttleController.java b/src/main/java/com/zy/asrs/controller/ShuttleController.java
index 7c9c950..d2c475c 100644
--- a/src/main/java/com/zy/asrs/controller/ShuttleController.java
+++ b/src/main/java/com/zy/asrs/controller/ShuttleController.java
@@ -39,6 +39,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
/**
@@ -185,7 +186,16 @@
return R.error("鎸囦护涓嶅瓨鍦�");
}
ShuttleRedisCommand redisCommand = JSON.parseObject(o.toString(), ShuttleRedisCommand.class);
- return R.ok().add(redisCommand);
+ ShuttleAssignCommand assignCommand = redisCommand.getAssignCommand();
+ List<ShuttleCommand> commands = assignCommand.getCommands();
+
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("commands", commands);
+ map.put("shuttleNo", redisCommand.getShuttleNo());
+ map.put("commandStep", redisCommand.getCommandStep());
+ map.put("wrkNo", redisCommand.getWrkNo());
+
+ return R.ok().add(map);
}
//鍥為��鍛戒护
@@ -367,7 +377,7 @@
return R.error("plc宸叉帀绾�");
}
if (workNo != null) {
- shuttleThread.setTaskNo(workNo);
+ shuttleThread.setSyncTaskNo(workNo);
}
if (pakMk != null) {
shuttleThread.setPakMk(pakMk.equals("Y"));
--
Gitblit v1.9.1