From 8c6b691eaa8b7d2268448d0620654b367e44d23a Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Thu, 2 Jul 2026 16:28:33 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/impl/XianGongAgvServiceImpl.java   | 18 ++++++++++++------
 .../wms/service/impl/WmsToAcsServiceImpl.java | 19 +++++++++++--------
 .../org/nl/acs/agv/server/AgvWaitUtil.java    |  2 +-
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java b/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java
index 74d77a0..b57e1f5 100644
--- a/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java
+++ b/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java
@@ -161,14 +161,17 @@ public class XianGongAgvServiceImpl implements XianGongAgvService {
                 driver.setCar_no(reqParam.getString("robot_name"));
 
                 result.put("code", HttpStatus.HTTP_OK);
-                result.put("message", "申请进入设备："+device.getDevice_code()+"成功");
+                result.put("message", "ok");
+//                result.put("message", "申请进入设备："+device.getDevice_code()+"成功");
             } else {
                 result.put("code", HttpStatus.HTTP_BAD_REQUEST);
-                result.put("message", "当前action值为："+driver.getAction()+"不允许进入");
+                result.put("message", "ok");
+//                result.put("message", "当前action值为："+driver.getAction()+"不允许进入");
             }
         } else {
             result.put("code", HttpStatus.HTTP_BAD_REQUEST);
-            result.put("message", "当前设备不属于三色灯！");
+            result.put("message", "ok");
+//            result.put("message", "当前设备不属于三色灯！");
         }
         log.info("getBlockGroup反馈AGV输出参数:{}", result.toString());
         return result;
@@ -207,14 +210,17 @@ public class XianGongAgvServiceImpl implements XianGongAgvService {
                     driver2.setCar_no("");
                 }
                 result.put("code", HttpStatus.HTTP_OK);
-                result.put("message", "申请离开设备："+device.getDevice_code()+"成功");
+//                result.put("message", "申请离开设备："+device.getDevice_code()+"成功");
+                result.put("message", "ok");
             } else {
                 result.put("code", HttpStatus.HTTP_BAD_REQUEST);
-                result.put("message", "当前action值为："+driver.getAction()+"不允许离开");
+//                result.put("message", "当前action值为："+driver.getAction()+"不允许离开");
+                result.put("message", "ok");
             }
         } else {
             result.put("code", HttpStatus.HTTP_BAD_REQUEST);
-            result.put("message", "当前设备不属于三色灯！");
+//            result.put("message", "当前设备不属于三色灯！");
+            result.put("message", "ok");
         }
         log.info("releaseBlockGroup反馈AGV输出参数:{}", result.toString());
         return result;
diff --git a/acs2/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs2/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
index 0570cdd..c7687e8 100644
--- a/acs2/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
+++ b/acs2/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
@@ -402,6 +402,8 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
 
     @Override
     public JSONObject SearchTasks() {
+        // 返回结果
+        JSONObject result = new JSONObject();
         // 需返回mes集合
         List<ResultTaskMesDto> mesDtoList = new ArrayList<>();
         // 获取当前所有任务
@@ -422,13 +424,15 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
             if (ObjectUtil.isNotEmpty(instruction)) {
                 if (instruction.getSend_status().equals("1")) {
                     UnifiedResponse<JSONObject> resp = agvService.queryXZAgvInstStatusByCode(instruction.getInstruction_code(), JSONObject.class);
-                    // 状态
-                    String state = resp.getData().getString("state");
-                    if ("RUNNING".equals(state) || "WAITING".equals(state)) {
-                        TaskStatus = "执行中";
+                    if (ObjectUtil.isNotEmpty(resp) && ObjectUtil.isNotEmpty(resp.getData())) {
+                        // 状态
+                        String state = resp.getData().getString("state");
+                        if ("RUNNING".equals(state) || "WAITING".equals(state)) {
+                            TaskStatus = "执行中";
+                        }
+                        // 车号
+                        ExecutingAGV = resp.getData().getString("vehicle");
                     }
-                    // 车号
-                    ExecutingAGV = resp.getData().getString("vehicle");
                 }
             }
 
@@ -488,8 +492,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
                     .build();
             mesDtoList.add(mesDto);
         }*/
-        // 返回结果
-        JSONObject result = new JSONObject();
+
         result.put("ReturnStatus", 0);
         result.put("MsgTime", DateUtil.now());
         result.put("TaskList", mesDtoList);
diff --git a/acs3/nladmin-system/src/main/java/org/nl/acs/agv/server/AgvWaitUtil.java b/acs3/nladmin-system/src/main/java/org/nl/acs/agv/server/AgvWaitUtil.java
index 7fd532b..5e902c2 100644
--- a/acs3/nladmin-system/src/main/java/org/nl/acs/agv/server/AgvWaitUtil.java
+++ b/acs3/nladmin-system/src/main/java/org/nl/acs/agv/server/AgvWaitUtil.java
@@ -35,7 +35,7 @@ public class AgvWaitUtil {
     @Autowired
     private ConveyorService conveyorService;
 
-    private final String code = "AK001,ZB003,BK001";
+    private final String code = "AK001,ZB004,BK001";
 
     //取货前等待
     public JSONObject waitInGet(String deviceCode) {