From c19dbfe11d2be3b583b2da6b733830b22d3cf503 Mon Sep 17 00:00:00 2001 From: yanps Date: Wed, 22 May 2024 17:33:39 +0800 Subject: [PATCH] =?UTF-8?q?opt:=20=E8=B4=A7=E4=BD=8D=E5=9C=B0=E5=9D=80,rgv?= =?UTF-8?q?=E7=9B=91=E6=8E=A7,=E5=88=9B=E5=BB=BA=E6=8C=87=E4=BB=A4?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../agv/server/impl/NDCAgvServiceImpl.java | 3 ++- .../device_driver/rgv/RgvDeviceDriver.java | 8 +++---- .../service/impl/InstructionServiceImpl.java | 24 +++++++++++++------ .../service/impl/StorageCellServiceImpl.java | 12 ++++++++++ .../service/quartz/task/CreateDDJInst.java | 5 ++-- 5 files changed, 38 insertions(+), 14 deletions(-) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java index d5b88d4bb..a28a12359 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java @@ -363,7 +363,8 @@ public class NDCAgvServiceImpl implements NDCAgvService { }; - log.info("反馈agv动作数据--index:" + hexToString(indexhigh & 0xFF) + hexToString(indexlow & 0xFF) + ",phase:" + hexToString(phasehigh & 0xFF) + hexToString(phaselow & 0xFF)); + log.info("反馈agv动作数据--index:" + hexToString(indexhigh & 0xFF) + hexToString(indexlow & 0xFF) + ",phase:" + + hexToString(phasehigh & 0xFF) + hexToString(phaselow & 0xFF)+",是否侧移: "+(offset == 1?"侧移":"不测移") + ",偏离量: " + quantity); System.out.println("反馈agv动作数据:" + Bytes2HexString(b)); return b; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/rgv/RgvDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/rgv/RgvDeviceDriver.java index c7f5fc870..0b360c6cb 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/rgv/RgvDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/rgv/RgvDeviceDriver.java @@ -207,15 +207,15 @@ public class RgvDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDr if (mode == 4 && move == 1 && !requireSucess) { applyTask(); } else { - if (mode == 2) { + if (mode == 4) { //if (!requireSucess) { String remark = ""; ; if (mode != 2) { remark = "universal_remark2"; } - if (move != 0) { - remark = "universal_remark3"; + if (move != 1) { + remark = "universal_no"; } if (task != 0) { remark = LangProcess.msg("universal_remark4"); @@ -226,7 +226,7 @@ public class RgvDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDr if (requireSucess) { remark = LangProcess.msg("universal_remark5"); } - this.setNotCreateTaskMessage(remark); + this.setFeedMessage(remark); //} } } 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 29cda07f2..01b6a3253 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 @@ -68,6 +68,8 @@ import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.mapper.InstructionMapper; import org.nl.common.utils.SecurityUtils; import org.nl.config.language.LangProcess; +import org.nl.config.lucene.service.LuceneExecuteLogService; +import org.nl.config.lucene.service.dto.LuceneLogDto; import org.nl.system.service.param.ISysParamService; import org.nl.common.utils.CodeUtil; import org.nl.config.SpringContextHolder; @@ -114,6 +116,8 @@ public class InstructionServiceImpl extends CommonServiceImpl instructions = new CopyOnWriteArrayList(); @@ -368,7 +372,7 @@ public class InstructionServiceImpl extends CommonServiceImpl 0 && StrUtil.equals(shortPathsList.get(0).getType(), CommonFinalParam.ONE) && dto.getAgv_system_type().equals(CommonFinalParam.TWO)) { // 0为输送、立库任务 1 1楼叉车系统 2 2楼1区域AGV系统 3 2楼2区域AGV系统 if (!StrUtil.equals(task.getAgv_system_type(), "0") && ObjectUtil.isNotEmpty(task.getAgv_system_type())) { @@ -496,7 +500,7 @@ public class InstructionServiceImpl extends CommonServiceImpl 0 && StrUtil.equals(shortPathsList.get(0).getType(), CommonFinalParam.ONE) && dto.getAgv_system_type().equals(CommonFinalParam.ONE)) { Device deviceByCode = deviceAppService.findDeviceByCode(dto.getStart_device_code()); if (StrUtil.equals(task.getRequest_again_success(), "1")) { //追加订单 @@ -526,8 +530,14 @@ public class InstructionServiceImpl extends CommonServiceImpl queryAll(StorageCellQueryParam query, Pageable pageable) { IPage queryPage = PageUtil.toMybatisPage(pageable); @@ -217,6 +222,13 @@ public class StorageCellServiceImpl extends CommonServiceImpl allStorageCellFromCache = deviceServiceImpl.findAllStorageCellFromCache(); + allStorageCellFromCache.forEach(storageCellDto -> { + if(storageCellDto.getStorage_id().equals(storageCell.getStorage_id())){ + storageCellDto.setAddress(storageCell.getAddress()); + } + }); } @Override diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/CreateDDJInst.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/CreateDDJInst.java index e868fabbd..3efc26b70 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/CreateDDJInst.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/CreateDDJInst.java @@ -120,7 +120,7 @@ public class CreateDDJInst { StandardStackerDeviceDriver standardStackerDeviceDriver; if (deviceByCode.getDeviceDriver() instanceof StandardStackerDeviceDriver) { standardStackerDeviceDriver = (StandardStackerDeviceDriver) deviceByCode.getDeviceDriver(); - if (standardStackerDeviceDriver.getMode() != 3 || standardStackerDeviceDriver.getMove() == 1 || standardStackerDeviceDriver.getCommand() != 0) { + if (standardStackerDeviceDriver.getMode() != 3 || standardStackerDeviceDriver.getForkCargo() == 1 || standardStackerDeviceDriver.getCommand() != 0) { log.error("堆垛机,{}未联机或者在执行中", deviceByCode.getDevice_code()); ((StandardStackerDeviceDriver) deviceByCode.getDeviceDriver()).setNotCreateInstMessage("堆垛机,{}未联机或者在执行中"); return; @@ -285,7 +285,8 @@ public class CreateDDJInst { instructionService.create(instdto); } catch (Exception e) { taskDto.setRemark(e.getMessage()); - taskserver.updateByCodeFromCache(taskDto); + taskserver.update(taskDto); + return; } //创建指令后修改任务状态 taskDto.setTask_status(TaskStatusEnum.BUSY.getIndex());