root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/IndoorManipulatorDeviceDriver.java
This commit is contained in:
lishuai
2023-12-27 10:32:42 +08:00
parent 6e5ba08885 adc6d7f74d
commit d53c970bf0
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/IndoorManipulatorDeviceDriver.java
View File

@@ -781,7 +781,7 @@ public class IndoorManipulatorDeviceDriver extends AbstractOpcDeviceDriver imple
if (ObjectUtil.isNotEmpty(taskDtos)) { if (ObjectUtil.isNotEmpty(taskDtos)) {
//按照优先级排序 优先级相等按照创建时间排序 //按照优先级排序 优先级相等按照创建时间排序
taskDtos = this.sortTask(taskDtos); taskDtos = this.sortTask(taskDtos);
TaskDto taskDto = null; TaskDto taskDto = taskDtos.get(0);
//存在行架->暂存的AGV任务 需要过滤 //存在行架->暂存的AGV任务 需要过滤
// 9 行架任务 // 9 行架任务
if (!StrUtil.equals(taskDto.getTask_type(), "9")) { if (!StrUtil.equals(taskDto.getTask_type(), "9")) {
@@ -846,7 +846,6 @@ public class IndoorManipulatorDeviceDriver extends AbstractOpcDeviceDriver imple
}else { }else {
break; break;
} }
} }
// 9 行架任务 // 9 行架任务
if (!StrUtil.equals(task.getTask_type(), "9")) { if (!StrUtil.equals(task.getTask_type(), "9")) {

1
acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java
View File

@@ -418,6 +418,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
@Override @Override
public ApplyManipulatorActionResponse applyManipulatorActionRequest(ApplyManipulatorActionRequest param) { public ApplyManipulatorActionResponse applyManipulatorActionRequest(ApplyManipulatorActionRequest param) {
log.info("向LMS申请反馈,请求参数{}",param);
try { try {
MDC.put(log_file_type, log_type); MDC.put(log_file_type, log_type);
ApplyManipulatorActionResponse applyManipulatorActionResponse = new ApplyManipulatorActionResponse(); ApplyManipulatorActionResponse applyManipulatorActionResponse = new ApplyManipulatorActionResponse();