From c47395fe29493062a3f0bc2cf1d02a2946b20b88 Mon Sep 17 00:00:00 2001
From: zyh <zyh@123>
Date: 星期日, 04 一月 2026 08:41:35 +0800
Subject: [PATCH] 修改了判断空库位，查询语句的bug,和摄像头的连接
---
src/main/java/com/zy/asrs/service/impl/RcsServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/RcsServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/RcsServiceImpl.java
index e77e4a2..28a4102 100644
--- a/src/main/java/com/zy/asrs/service/impl/RcsServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/RcsServiceImpl.java
@@ -233,7 +233,7 @@
RcsReturn rcsReturn = JSONObject.parseObject(response, RcsReturn.class);
if("SUCCESS".equals(rcsReturn.getCode())||"200".equals(rcsReturn.getCode())) {
JSONObject data = rcsReturn.getData();
- String robotTaskCode = data.getString("RobotTaskCode");
+ String robotTaskCode = data.getString("robotTaskCode");
if (robotTaskCode.equals(rcsTaskSubmit.getRobotTaskCode())){
return 1;
}
@@ -327,6 +327,8 @@
String robotTaskCode = rcsReporterTask.getRobotTaskCode();
String singleRobotCode = rcsReporterTask.getSingleRobotCode();
+ String[] split = robotTaskCode.split("-");
+ robotTaskCode = split[0];
//鍗庢檽AGV鐘舵�佸弽棣堬紝鍙婄敵璇�
if(Cools.isEmpty(rcsReporterTask.getExtra())){
if(Cools.isEmpty(rcsReporterTask.getMethod())){
@@ -445,7 +447,7 @@
String slotCode = values.getString("slotCode");
try {
// q3,q8=1
- if ("1".equals(carrierType)) { //AGV
+
EntityWrapper<Task> wrapper = new EntityWrapper<>();
wrapper.eq("task_no", robotTaskCode);
Task task = taskService.selectOne(wrapper);
@@ -561,7 +563,7 @@
}
break;
}
- }
+
// 杩斿洖RCS
rcsReturn.setCode("SUCCESS");
rcsReturn.setMessage("");
--
Gitblit v1.9.1