diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/IndoorManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/IndoorManipulatorDeviceDriver.java index 2cfed9f10..64cc7059b 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/IndoorManipulatorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/IndoorManipulatorDeviceDriver.java @@ -781,7 +781,7 @@ public class IndoorManipulatorDeviceDriver extends AbstractOpcDeviceDriver imple if (ObjectUtil.isNotEmpty(taskDtos)) { //按照优先级排序 优先级相等按照创建时间排序 taskDtos = this.sortTask(taskDtos); - TaskDto taskDto = null; + TaskDto taskDto = taskDtos.get(0); //存在行架->暂存的AGV任务 需要过滤 // 9 行架任务 if (!StrUtil.equals(taskDto.getTask_type(), "9")) { @@ -846,7 +846,6 @@ public class IndoorManipulatorDeviceDriver extends AbstractOpcDeviceDriver imple }else { break; } - } // 9 行架任务 if (!StrUtil.equals(task.getTask_type(), "9")) { diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java index f7c9a0318..f33a496bb 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java @@ -418,6 +418,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { @Override public ApplyManipulatorActionResponse applyManipulatorActionRequest(ApplyManipulatorActionRequest param) { + log.info("向LMS申请反馈,请求参数{}",param); try { MDC.put(log_file_type, log_type); ApplyManipulatorActionResponse applyManipulatorActionResponse = new ApplyManipulatorActionResponse();