From 3ddc9a3bcb89df880c4d5cf7040b3ba56df3709a Mon Sep 17 00:00:00 2001 From: lishuai <1793460677@qq.com> Date: Wed, 31 Jul 2024 14:51:06 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=A4=9A=E6=AC=A1=E8=B0=83=E7=94=A8lms?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=AE=8C=E6=88=90=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StandardStackerDeviceDriver.java | 24 ------------------- .../task/service/impl/TaskServiceImpl.java | 14 +++++------ 2 files changed, 7 insertions(+), 31 deletions(-) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java index c4ea274e3..4a4b76ec6 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java @@ -402,23 +402,11 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme } break; case 1: - LuceneLogDto logDto = LuceneLogDto.builder() - .device_code(device_code) - .content("取货中") - .build(); - logDto.setLog_level(4); - luceneExecuteLogService.deviceExecuteLog(logDto); message = "universal_delivery"; if (updateCommand("1")) break; break; case 2: - LuceneLogDto logDto1 = LuceneLogDto.builder() - .device_code(device_code) - .content("取货完成") - .build(); - logDto1.setLog_level(4); - luceneExecuteLogService.deviceExecuteLog(logDto1); message = "universal_completed"; if (updateCommand("2")) break; Instruction instruction2 = checkInst(); @@ -466,12 +454,6 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme requireSucess = false; break; case 3: - LuceneLogDto logDto2 = LuceneLogDto.builder() - .device_code(device_code) - .content("放货") - .build(); - logDto2.setLog_level(4); - luceneExecuteLogService.deviceExecuteLog(logDto2); message = "universal_releasing"; if (updateCommand("3")) break; break; @@ -499,12 +481,6 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme requireSucess = false; break; case 5: - LuceneLogDto logDto3 = LuceneLogDto.builder() - .device_code(device_code) - .content("放货完成") - .build(); - logDto3.setLog_level(4); - luceneExecuteLogService.deviceExecuteLog(logDto3); message = "universal_releasing_completed"; Map map = new HashMap<>(); List list5 = new ArrayList(); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java index 78bdc2b7d..f7cfb56a4 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java @@ -836,17 +836,17 @@ public class TaskServiceImpl extends CommonServiceImpl impleme entity.setUpdate_time(now); entity.setUpdate_by(currentUsername); entity.setTask_status(taskIdAndStatus.getTask_status()); - Task task = ConvertUtil.convert(entity, Task.class); taskMapper.updateById(task); - //移除任务缓存信息 this.removeByCodeFromCache(entity.getTask_code()); - //反馈上位系统任务状态 - 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 (!TaskStatusEnum.FINISHED.getIndex().equals(entity.getTask_status())) { + //反馈上位系统任务状态 + 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); + } } }