From d93e2bdc27b4ca58e3b41ac7ea898825625bbc20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B1=9F=E7=8E=AE?= Date: Fri, 4 Aug 2023 09:01:29 +0800 Subject: [PATCH] Update WmsToAcsServiceImpl.java --- .../ext/wms/service/impl/WmsToAcsServiceImpl.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index 2f2b003..cd89606 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -88,11 +88,11 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { // if (StrUtil.equals(cancelTaskCheck, "1")) { // taskService.cancelNoSendWms(taskDto.getTask_id()); // } else if (StrUtil.equals(cancelTaskCheck, "0")) { - Instruction inst = instructionService.findByTaskcode(task_code); - if (inst != null) { - instructionService.cancel(inst.getInstruction_id()); - } - taskService.cancelNoSendWms(taskDto.getTask_id()); + Instruction inst = instructionService.findByTaskcode(task_code); + if (inst != null) { + instructionService.cancel(inst.getInstruction_id()); + } + taskService.cancelNoSendWms(taskDto.getTask_id()); // } else { // throw new RuntimeException("指令正在执行中,操作失败!"); // } @@ -644,7 +644,6 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { (byte) 0X00, (byte) 0X01 }; OneNDCSocketConnectionAutoRun.write(bytes1); - System.out.println("下发agv指令数据:" + NDCAgvServiceImpl.Bytes2HexString(bytes1)); break; case "2": // 恢复急停AGV车辆 @@ -661,7 +660,6 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { (byte) 0X00, (byte) 0X00 }; OneNDCSocketConnectionAutoRun.write(bytes2); - System.out.println("下发agv指令数据:" + NDCAgvServiceImpl.Bytes2HexString(bytes2)); break; case "3": ParamDto sysParam3 = paramService.findByCode(AcsConfig.SEND_INST); @@ -681,6 +679,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { resultJSON.put("status", HttpStatus.OK.value()); resultJSON.put("message", "操作成功"); + log.info("deviceOption-----输出参数{}", resultJSON); return resultJSON; } finally { MDC.remove(log_file_type);