From 1ab6715791a771a1ce8aeabb51216bb6cacff0dd Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Thu, 16 Jul 2026 14:50:26 +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

---
 .../agvDefination/ndc/AgvNdcOneDeviceDriver.java          | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/agvDefination/ndc/AgvNdcOneDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/agvDefination/ndc/AgvNdcOneDeviceDriver.java
index d81f519..62572e7 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/agvDefination/ndc/AgvNdcOneDeviceDriver.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/agvDefination/ndc/AgvNdcOneDeviceDriver.java
@@ -141,7 +141,7 @@ public class AgvNdcOneDeviceDriver extends AbstractStandardDeviceDriver {
             // 二次分配处理
             data = ndcAgvService.sendAgvOneModeInst(phase, index, 0);
             // 判断是否需要二次分配
-            if ("A".equals(inst.getStart_device_code())) {
+            if ("10".equals(inst.getStart_device_code())) {
                 // 向WMS申请新点位
                 JSONObject response = acsToWmsService.taskRedirection(task.getTask_code(), inst.getStart_device_code());
                 if (response != null && response.getInteger("responseCode") == 0
@@ -169,6 +169,8 @@ public class AgvNdcOneDeviceDriver extends AbstractStandardDeviceDriver {
                     // 返回NDC更换新位置
                     data = ndcAgvService.sendAgvOneModeInstDis(phase, index, response.getString("locationNew"));
                 }
+            } else {
+                data = null;
             }
             //(需要WCS反馈)
         } else if (phase == 0x03) {
@@ -280,7 +282,7 @@ public class AgvNdcOneDeviceDriver extends AbstractStandardDeviceDriver {
             // 二次分配处理
             data = ndcAgvService.sendAgvOneModeInst(phase, index, 0);
             // 判断是否需要二次分配
-            if ("A".equals(inst.getNext_device_code())) {
+            if ("10".equals(inst.getNext_device_code())) {
                 // 向WMS申请新点位
                 JSONObject response = acsToWmsService.taskRedirection(task.getTask_code(), inst.getNext_device_code());
                 if (response != null && response.getInteger("responseCode") == 0
@@ -306,6 +308,8 @@ public class AgvNdcOneDeviceDriver extends AbstractStandardDeviceDriver {
                     instructionService.update(inst);
                     // 返回NDC更换新位置
                     data = ndcAgvService.sendAgvOneModeInstDis(phase, index, response.getString("locationNew"));
+                } else {
+                    data = null;
                 }
             }
         } else if (phase == 0x07) {