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

fix:多次调用lms任务完成解决

Browse Source
This commit is contained in:
lishuai
2024-07-31 14:51:06 +08:00
parent 7bc69d49eb
commit 3ddc9a3bcb
2 changed files with 7 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java
View File

@@ -402,23 +402,11 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
} }
break; break;
case 1: case 1:
LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code)
.content("取货中")
.build();
logDto.setLog_level(4);
luceneExecuteLogService.deviceExecuteLog(logDto);
message = "universal_delivery"; message = "universal_delivery";
if (updateCommand("1")) break; if (updateCommand("1")) break;
break; break;
case 2: case 2:
LuceneLogDto logDto1 = LuceneLogDto.builder()
.device_code(device_code)
.content("取货完成")
.build();
logDto1.setLog_level(4);
luceneExecuteLogService.deviceExecuteLog(logDto1);
message = "universal_completed"; message = "universal_completed";
if (updateCommand("2")) break; if (updateCommand("2")) break;
Instruction instruction2 = checkInst(); Instruction instruction2 = checkInst();
@@ -466,12 +454,6 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
requireSucess = false; requireSucess = false;
break; break;
case 3: case 3:
LuceneLogDto logDto2 = LuceneLogDto.builder()
.device_code(device_code)
.content("放货")
.build();
logDto2.setLog_level(4);
luceneExecuteLogService.deviceExecuteLog(logDto2);
message = "universal_releasing"; message = "universal_releasing";
if (updateCommand("3")) break; if (updateCommand("3")) break;
break; break;
@@ -499,12 +481,6 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
requireSucess = false; requireSucess = false;
break; break;
case 5: case 5:
LuceneLogDto logDto3 = LuceneLogDto.builder()
.device_code(device_code)
.content("放货完成")
.build();
logDto3.setLog_level(4);
luceneExecuteLogService.deviceExecuteLog(logDto3);
message = "universal_releasing_completed"; message = "universal_releasing_completed";
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
List list5 = new ArrayList(); List list5 = new ArrayList();

14
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
View File

@@ -836,17 +836,17 @@ public class TaskServiceImpl extends CommonServiceImpl<TaskMapper, Task> impleme
entity.setUpdate_time(now); entity.setUpdate_time(now);
entity.setUpdate_by(currentUsername); entity.setUpdate_by(currentUsername);
entity.setTask_status(taskIdAndStatus.getTask_status()); entity.setTask_status(taskIdAndStatus.getTask_status());
Task task = ConvertUtil.convert(entity, Task.class); Task task = ConvertUtil.convert(entity, Task.class);
taskMapper.updateById(task); taskMapper.updateById(task);
//移除任务缓存信息 //移除任务缓存信息
this.removeByCodeFromCache(entity.getTask_code()); this.removeByCodeFromCache(entity.getTask_code());
//反馈上位系统任务状态 if (!TaskStatusEnum.FINISHED.getIndex().equals(entity.getTask_status())) {
this.feedWmsTaskStatus(entity); //反馈上位系统任务状态
//关闭仙工运单序列 this.feedWmsTaskStatus(entity);
if(StrUtil.equals(task.getTask_type(),TaskTypeEnum.Standard_AGV_Task.getCode()) && (StrUtil.equals(task.getAgv_system_type(), AgvSystemTypeEnum.One_NDC_System_Type.getCode())||StrUtil.equals(task.getAgv_system_type(), AgvSystemTypeEnum.XG_System_Type.getCode()))) { //关闭仙工运单序列
this.markComplete(entity); if (StrUtil.equals(task.getTask_type(), TaskTypeEnum.Standard_AGV_Task.getCode()) && (StrUtil.equals(task.getAgv_system_type(), AgvSystemTypeEnum.One_NDC_System_Type.getCode()) || StrUtil.equals(task.getAgv_system_type(), AgvSystemTypeEnum.XG_System_Type.getCode()))) {
this.markComplete(entity);
}
} }
} }