From 0a2dfed98c00a4937adc3abf5129cc3aaabb6603 Mon Sep 17 00:00:00 2001
From: tuqiang <437016993@qq.com>
Date: Fri, 27 Feb 2026 12:53:18 +0800
Subject: [PATCH] =?UTF-8?q?opt=EF=BC=9A=E5=A5=97=E4=BB=B6=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StandardOrdinarySiteDeviceDriver.java        |  4 ++++
 .../wms/service/impl/NDCToAcsServiceImpl.java    | 16 ++++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java
index edcbb92..beeecd8 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java
@@ -249,6 +249,7 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple
                         } else {
                             //mes下发需要上报放货完成
                             if ("2".equals(task.getCreate_by())) {
+                                log.info("放货完成申请,指令号:"+instruction.getInstruction_code());
                                 JSONObject jo = new JSONObject();
                                 jo.put("taskCode", task.getTask_code());
                                 jo.put("carId", instruction.getCarno());
@@ -263,6 +264,7 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple
                                     return;
                                 } //wms下发需要上报放货完成
                             } else if ("1".equals(task.getCreate_by())) {
+                                log.info("放货完成申请,指令号:"+instruction.getInstruction_code());
                                 JSONObject jo = new JSONObject();
                                 jo.put("taskCode", task.getTask_code());
                                 jo.put("carId", instruction.getCarno());
@@ -277,6 +279,7 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple
                                     return;
                                 }
                             }
+                            log.info("放货完成申请成功,指令号:"+instruction.getInstruction_code());
                             HttpResponse result = acsToNDCService.genAgvSchedulingTask(instruction, 10);
                             if (ObjectUtils.isEmpty(result) || result.getStatus() != 200) {
                                 return;
@@ -289,6 +292,7 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple
             }
         } catch (IOException e) {
             e.printStackTrace();
+            log.info("设备执行失败"+e.getMessage());
         }
     }
 
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/NDCToAcsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/NDCToAcsServiceImpl.java
index 37d67c8..9235ed4 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/NDCToAcsServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/NDCToAcsServiceImpl.java
@@ -62,14 +62,7 @@ public class NDCToAcsServiceImpl implements NDCToAcsService {
                 }
                 instructionService.reload();
             }
-            //taskPhase 任务完成
-            if (TaskStateEnum.COMPLETED.getValue().equals(taskState)){
-                instructionService.finish(instruction.getInstruction_id());
-                resp.put("code", "200");
-                resp.put("message", "完成任务成功");
-                log.info("---响应kit请求---"+resp.toString());
-                return resp;
-            }
+
             //taskPhase 任务取消
             if (TaskStateEnum.CANCELED.getValue().equals(taskState)){
                 instructionService.cancel(instruction.getInstruction_id());
@@ -122,6 +115,13 @@ public class NDCToAcsServiceImpl implements NDCToAcsService {
                         instruction.setExecute_status(taskPhase);
                         instructionService.update(instruction);
                     }
+                    //taskPhase 任务完成
+                    if (TaskStateEnum.COMPLETED.getValue().equals(taskState)){
+                        instructionService.finish(instruction.getInstruction_id());
+                        resp.put("code", "200");
+                        resp.put("message", "完成任务成功");
+                        log.info("---响应kit请求---"+resp.toString());
+                    }
                     break;
                 default:
                     resp.put("code", "400");