fix: 异步

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java

@@ -36,6 +36,7 @@ import java.net.Socket;
 import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.concurrent.CompletableFuture;
 
 import static org.nl.acs.agv.server.impl.NDCAgvServiceImpl.Bytes2HexString;
 
@@ -370,7 +371,19 @@ public class TwoNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
                                 if (ObjectUtil.isNotEmpty(device)) {
                                     if (device.getDeviceDriver() instanceof AgvNdcTwoDeviceDriver) {
                                         agvNdcTwoDeviceDriver = (AgvNdcTwoDeviceDriver) device.getDeviceDriver();
-                                        agvNdcTwoDeviceDriver.processSocket(arr);
+                                        CompletableFuture.runAsync(() -> {
+                                            try {
+                                                agvNdcTwoDeviceDriver.processSocket(arr);
+                                            } catch (Exception e) {
+                                                e.printStackTrace();
+                                                log.error("agv运行逻辑报错:{}", e.getMessage());
+                                                LuceneLogDto logDto = LuceneLogDto.builder()
+                                                        .content("agv运行报错" + "报错原因:" + e.getMessage())
+                                                        .build();
+                                                logDto.setLog_level(4);
+                                                luceneExecuteLogService.deviceExecuteLog(logDto);
+                                            }
+                                        });
                                     } else if (device.getDeviceDriver() instanceof AgvNdcOneDeviceDriver) {
                                         agvNdcOneDeviceDriver = (AgvNdcOneDeviceDriver) device.getDeviceDriver();
                                         agvNdcOneDeviceDriver.processSocket(arr);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java

@@ -984,7 +984,6 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements
                     logServer.deviceExecuteLog(device_code, "", "", "入库输送线任务开始反馈执行中状态,反馈成功,指令号:" + task);
                 }
                 //当货物到达b点,实现完成指令
-
                 if (StrUtil.equals(inst.getInstruction_status(), InstructionStatusEnum.BUSY.getIndex()) || StrUtil.equals(inst.getInstruction_status(), InstructionStatusEnum.READY.getIndex())) {
                     if (StrUtil.equals(this.getDeviceCode(), inst.getNext_device_code())) {
                         inst.setExecute_device_code(this.device_code);