From dcadad678cdcb6d0d44d9acdf4bb53aacf4d50f0 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Fri, 30 Jan 2026 15:43:20 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B5=B7=E5=BA=B7=E4=BA=A4=E4=BA=92?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3-base?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/acs/agv/hk/service/AcsToHkService.java | 2 +- .../service/data/GenAgvSchedulingTaskReq.java | 16 ++++++++--- .../hk/service/impl/HkToAcsServiceImpl.java | 18 ++++++------- .../service/dto/InstructionDto.java | 4 --- .../service/impl/InstructionServiceImpl.java | 27 +++++++++++++++++++ .../nl/acs/task/enums/AgvSystemTypeEnum.java | 6 ++++- 6 files changed, 55 insertions(+), 18 deletions(-) diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/hk/service/AcsToHkService.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/hk/service/AcsToHkService.java index f1917b9..f81a498 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/hk/service/AcsToHkService.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/hk/service/AcsToHkService.java @@ -10,7 +10,7 @@ import org.nl.acs.agv.hk.service.data.BaseReq; public interface AcsToHkService { /** - * 生成任务单 + * 生成任务单 - 下发任务 * * @param type 响应类型 * @param requestParam diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/hk/service/data/GenAgvSchedulingTaskReq.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/hk/service/data/GenAgvSchedulingTaskReq.java index 10ba6cd..9f0b9b1 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/hk/service/data/GenAgvSchedulingTaskReq.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/hk/service/data/GenAgvSchedulingTaskReq.java @@ -1,5 +1,6 @@ package org.nl.acs.agv.hk.service.data; +import lombok.Builder; import lombok.Data; import lombok.experimental.SuperBuilder; @@ -7,18 +8,27 @@ import java.util.List; import java.util.Map; /** - * @Description TODO + * @Description 下发任务实体 * @Author Gengby * @Date 2024/12/28 */ @Data @SuperBuilder public class GenAgvSchedulingTaskReq extends BaseReq{ + /** + * 按需定义 + */ private String taskTyp; - private String ctnrTyp; + @Builder.Default + private String ctnrTyp = "1"; private String ctnrCode; + /** + * 不是必填 + * 载具号 + */ private String ctnrNum; - private String taskMode; + @Builder.Default + private String taskMode = "0"; private String wbCode; private List> positionCodePath; private String podCode; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/hk/service/impl/HkToAcsServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/hk/service/impl/HkToAcsServiceImpl.java index 8d078c1..2765057 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/hk/service/impl/HkToAcsServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/hk/service/impl/HkToAcsServiceImpl.java @@ -99,15 +99,15 @@ public class HkToAcsServiceImpl implements HkToAcsService { instruction.setInstruction_status(InstructionStatusEnum.FINISHED.getIndex()); instruction.setUpdate_time(now); instructionService.finish(instruction); - if (StrUtil.equals(instruction.getIs_wait(), "1") && StrUtil.equals(instruction.getInstruction_type(), InstTypeEnum.CTU_OUT_TASK.getCode())) { - String ctuWaitTime = Optional.ofNullable(sysParamService.findByCode("ctuWaitTime").getValue()).map(Object::toString).orElse("3600"); - GenPreScheduleTaskReq gpsReq = GenPreScheduleTaskReq.builder() - .positionCode(instruction.getStart_device_code()) - .nextTask(ctuWaitTime) - .agvTyp("10") - .build(); - acsToHkService.genPreScheduleTask(gpsReq, null); - } +// if (StrUtil.equals(instruction.getIs_wait(), "1") && StrUtil.equals(instruction.getInstruction_type(), InstTypeEnum.CTU_OUT_TASK.getCode())) { +// String ctuWaitTime = Optional.ofNullable(sysParamService.findByCode("ctuWaitTime").getValue()).map(Object::toString).orElse("3600"); +// GenPreScheduleTaskReq gpsReq = GenPreScheduleTaskReq.builder() +// .positionCode(instruction.getStart_device_code()) +// .nextTask(ctuWaitTime) +// .agvTyp("10") +// .build(); +// acsToHkService.genPreScheduleTask(gpsReq, null); +// } } //method 回调3、任务取消cancel else if (StrUtil.equals(method, "cancel")) { diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/dto/InstructionDto.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/dto/InstructionDto.java index af0ec43..afe3245 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/dto/InstructionDto.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/dto/InstructionDto.java @@ -364,9 +364,5 @@ public class InstructionDto implements Serializable { */ private String to_device_code; - /** - * 任务完成是否等待 - */ - private String is_wait; } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java index a86ab9d..659c2ab 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java @@ -17,6 +17,9 @@ import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapp import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; import org.nl.acs.AcsConfig; +import org.nl.acs.agv.hk.UnifiedResponse; +import org.nl.acs.agv.hk.service.AcsToHkService; +import org.nl.acs.agv.hk.service.data.GenAgvSchedulingTaskReq; import org.nl.acs.agv.server.NDCAgvService; import org.nl.acs.agv.server.XianGongAgvService; import org.nl.acs.auto.initial.ApplicationAutoInitial; @@ -34,6 +37,7 @@ import org.nl.acs.ext.wms.liKuData.*; import org.nl.acs.ext.wms.service.AcsToLiKuService; import org.nl.acs.instruction.domain.Instruction; import org.nl.acs.instruction.domain.InstructionMybatis; +import org.nl.acs.instruction.enums.InstTypeEnum; import org.nl.acs.instruction.enums.InstructionStatusEnum; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.InstructionDto; @@ -46,6 +50,8 @@ import org.nl.acs.route.service.dto.RouteLineDto; import org.nl.acs.route.service.impl.RouteLineServiceImpl; import org.nl.acs.task.TaskInstructionLock; import org.nl.acs.task.domain.Task; +import org.nl.acs.task.enums.AgvSystemTypeEnum; +import org.nl.acs.task.enums.TaskTypeEnum; import org.nl.acs.task.service.TaskService; import org.nl.acs.task.service.dto.TaskDto; import org.nl.acs.task.service.mapper.TaskMapper; @@ -55,6 +61,7 @@ import org.nl.common.exception.BadRequestException; import org.nl.common.utils.CodeUtil; import org.nl.common.utils.FileUtil; import org.nl.common.utils.SecurityUtils; +import org.nl.config.MapOf; import org.nl.config.SpringContextHolder; import org.nl.config.language.LangProcess; import org.nl.system.service.param.ISysParamService; @@ -99,6 +106,8 @@ public class InstructionServiceImpl extends CommonServiceImpl instructions = new CopyOnWriteArrayList(); @@ -429,6 +438,24 @@ public class InstructionServiceImpl extends CommonServiceImpl> positionCodePath = Arrays.asList(MapOf.of("positionCode", dto.getStart_parent_code(), "type", "00"), MapOf.of("positionCode", dto.getNext_parent_code(), "type", "00")); + GenAgvSchedulingTaskReq gasReq = GenAgvSchedulingTaskReq + .builder() + .taskTyp(dto.getInstruction_type()) + .positionCodePath(positionCodePath) + .priority(dto.getPriority()) + .taskCode(dto.getInstruction_code()) + .build(); + UnifiedResponse resp = acsToHkService.genAgvSchedulingTask(gasReq, String.class); + if (!resp.isSuccess()) { + dto.setRemark(resp.getMessage()); + dto.setSend_status("2"); + } else { + dto.setSend_status("1"); + } + } //判断是否是仙工AGV /* if(CommonFinalParam.ONE.equals(route.getType())){ HttpResponse response = xiangGongAgvService.sendOrderSequencesToXZ(dto); diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/AgvSystemTypeEnum.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/AgvSystemTypeEnum.java index 6acfbbe..659ef32 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/AgvSystemTypeEnum.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/AgvSystemTypeEnum.java @@ -21,7 +21,11 @@ public enum AgvSystemTypeEnum { /** * 仙工AGV系统 */ - XG_System_Type("3", "3", "仙工AGV系统"); +// XG_System_Type("3", "3", "仙工AGV系统"); + /** + * 海康调度系统 + */ + Hik_System_Type("3", "3", "HIK AGV系统"); /** * 索引