From 252929edb3e2c288ea98b465d1c153b01066e0ee Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Wed, 26 Apr 2023 15:09:15 +0800
Subject: [PATCH] =?UTF-8?q?rev=20=E5=8F=96=E6=B6=88=E6=8C=87=E4=BB=A4?=
 =?UTF-8?q?=E4=B8=8B=E5=8F=91=E8=B0=83=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java  | 6 +++---
 .../org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java  | 5 +++--
 .../instruction/service/impl/InstructionServiceImpl.java    | 1 +
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java
index 09eb276..799bd63 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java
@@ -63,7 +63,7 @@ public class NDCAgvServiceImpl implements NDCAgvService {
             };
             log.info("下发删除AGV指令--{}", Bytes2HexString(b));
 
-//                NDCSocketConnectionAutoRun.write(b);
+            OneNDCSocketConnectionAutoRun.write(b);
             System.out.println("下发删除agv指令数据:" + Bytes2HexString(b));
         }
 
@@ -214,9 +214,9 @@ public class NDCAgvServiceImpl implements NDCAgvService {
         };
         log.info("下发AGV充电任务--{}", str1);
 
-        try{
+        try {
             OneNDCSocketConnectionAutoRun.write(b);
-        } catch (Exception e){
+        } catch (Exception e) {
             e.getMessage();
             return false;
         }
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java b/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java
index d758f97..25d9c0c 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java
@@ -154,6 +154,7 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
                             inst.setAgv_jobno(String.valueOf(index));
                             inst.setSend_status("1");
                             instructionService.update(inst);
+                            log.info("开始上报执行中,指令号:{}", ikey);
                         }
                         data = NDCAgvService.sendAgvOneModeInst(phase, index, 0);
                     }
@@ -163,10 +164,10 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
                         if (!ObjectUtil.isEmpty(inst)) {
                             instructionService.finish(inst.getInstruction_id());
                         } else {
-                            log.warn("指令号:{},未反馈wms任务完成，因为agv上报指令号查询指令为空!");
+                            log.warn("指令号:{},未反馈wms任务完成，因为agv上报指令号查询指令为空!", ikey);
                         }
                         data = NDCAgvService.sendAgvOneModeInst(phase, index, 0);
-                        log.info("指令号:{},已反馈agv任务完成!");
+                        log.info("指令号:{},已反馈agv任务完成!", ikey);
                     }
                     //请求删除任务
                     //(需要WCS反馈)
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
index 97bd083..68fff65 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
@@ -366,6 +366,7 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
                 NDCAgvService ndcAgvService = SpringContextHolder.getBean(NDCAgvService.class);
                 ndcAgvService.sendAgvInstToNDC(task.getAgv_system_type(), dto);
             }
+            dto.setSend_status("1");
         } catch (Exception e) {
             dto.setSend_status("2");
             e.printStackTrace();