From bd646840ea6b9b7a5127853ab047550088e6db68 Mon Sep 17 00:00:00 2001 From: tuqiang <437016993@qq.com> Date: Mon, 27 Jan 2025 09:29:49 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E7=8E=B0=E5=9C=BA=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PullTailManipulatorDeviceDriver.java | 44 ++++++++++--------- .../service/impl/InstructionServiceImpl.java | 8 ++-- .../service/quartz/task/AutoCreateInst.java | 5 +++ 3 files changed, 32 insertions(+), 25 deletions(-) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_tail_manipulator/PullTailManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_tail_manipulator/PullTailManipulatorDeviceDriver.java index bbfea0f06..3d26db293 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_tail_manipulator/PullTailManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_tail_manipulator/PullTailManipulatorDeviceDriver.java @@ -229,8 +229,8 @@ public class PullTailManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp } //反馈重量 - if (mode == 3 && action == 5 && move == 0 && StrUtil.isNotEmpty(sub_volume_no) && !requireSucess) { - logServer.deviceExecuteLog(this.device_code,"","","反馈重量"); + if (mode == 3 && action == 5 && move == 0 && weight > 0 && StrUtil.isNotEmpty(sub_volume_no) && !requireSucess) { + logServer.deviceExecuteLog(this.device_code, "", "", "反馈重量"); ApplyfeedbackSubVolumeWeightRequest applyfeedbackSubVolumeWeightRequest = new ApplyfeedbackSubVolumeWeightRequest(); ApplyfeedbackSubVolumeWeightResponse applyfeedbackSubVolumeWeightResponse; applyfeedbackSubVolumeWeightRequest.setSub_volume(sub_volume_no); @@ -247,7 +247,7 @@ public class PullTailManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp luceneExecuteLogService.deviceExecuteLog(logDto); logServer.deviceExecuteLog(this.device_code, "", "", "反馈重量,参数:" + param); applyfeedbackSubVolumeWeightResponse = acsToWmsService.applyfeedbackSubVolumeWeight(applyfeedbackSubVolumeWeightRequest); - if(applyfeedbackSubVolumeWeightResponse.getCode() == CommonFinalParam.STATUS_OPEN){ + if (applyfeedbackSubVolumeWeightResponse.getCode() == CommonFinalParam.STATUS_OPEN) { Map map = new LinkedHashMap<>(); //todo:反馈重量 map.put("to_command", "5"); @@ -259,13 +259,13 @@ public class PullTailManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp logDto2.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto2); this.requireSucess = true; - }else{ + } else { LuceneLogDto logDto1 = LuceneLogDto.builder() .device_code(device_code) - .content("反馈LMS子卷重量失败:"+ applyfeedbackSubVolumeWeightResponse.getData()) + .content("反馈LMS子卷重量失败:" + applyfeedbackSubVolumeWeightResponse.getData()) .build(); logDto1.setLog_level(4); - message = "反馈LMS子卷重量失败:"+ applyfeedbackSubVolumeWeightResponse.getMessage(); + message = "反馈LMS子卷重量失败:" + applyfeedbackSubVolumeWeightResponse.getMessage(); luceneExecuteLogService.deviceExecuteLog(logDto1); } } else { @@ -279,10 +279,10 @@ public class PullTailManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp if (move != 1) { feedMessage = feedMessage + "move不为有货状态,"; } - if(StrUtil.isEmpty(sub_volume_no)){ + if (StrUtil.isEmpty(sub_volume_no)) { feedMessage = feedMessage + "子卷号为空,"; } - if(requireSucess){ + if (requireSucess) { feedMessage = feedMessage + "请求动作未复位!"; } } @@ -338,7 +338,8 @@ public class PullTailManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp } else { if (mode == 2) { //if (!requireSucess) { - String remark = "";; + String remark = ""; + ; if (mode != 2) { remark = remark + "工作模式(mode)不是待机状态,"; } @@ -502,12 +503,13 @@ public class PullTailManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp instructionService.create(instdto); } catch (Exception e) { notCreateInstMessage = e.getMessage(); - LuceneLogDto logDto = LuceneLogDto.builder() - .device_code(device_code) - .content(device_code+"创建指令时出现异常:" + e.getMessage()) - .build(); - logDto.setLog_level(3); - luceneExecuteLogService.deviceExecuteLog(logDto); return false; + LuceneLogDto logDto = LuceneLogDto.builder() + .device_code(device_code) + .content(device_code + "创建指令时出现异常:" + e.getMessage()) + .build(); + logDto.setLog_level(3); + luceneExecuteLogService.deviceExecuteLog(logDto); + return false; } //创建指令后修改任务状态 task.setTask_status(TaskStatusEnum.BUSY.getIndex()); @@ -546,8 +548,8 @@ public class PullTailManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp } - private void toDevice(String toOrder,String signal,Map map){ - if(ObjectUtil.isNotEmpty(toOrder)){ + private void toDevice(String toOrder, String signal, Map map) { + if (ObjectUtil.isNotEmpty(toOrder)) { map.put(signal, toOrder); } } @@ -645,14 +647,14 @@ public class PullTailManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp action = LangProcess.msg("universal_releasing"); } else if (this.getAction() == 4) { action = LangProcess.msg("universal_releasing_completed"); - }else if (this.getAction() == 5){ + } else if (this.getAction() == 5) { action = "反馈子卷重量"; - }else if (this.getAction() == 0){ + } else if (this.getAction() == 0) { action = "无动作"; } - if(error == 0 && this.itemProtocol.isError){ + if (error == 0 && this.itemProtocol.isError) { iserror = true; - }else if(error == 0 && !(this.itemProtocol.isError)){ + } else if (error == 0 && !(this.itemProtocol.isError)) { iserror = false; } map.put("device_name", this.getDevice().getDevice_name()); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java index 64e483e4e..d0034f1d5 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java @@ -587,7 +587,7 @@ public class InstructionServiceImpl extends CommonServiceImpl