From c247604d5c65c0a8c5698a6931c8020a3055d88c Mon Sep 17 00:00:00 2001 From: miguannan <53815784+javami888@users.noreply.github.com> Date: Sat, 9 May 2026 13:14:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E8=AF=B7=E6=B1=82=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E4=BD=BF=E7=94=A8=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StandardOrdinarySiteDeviceDriver.java | 7 +++++-- .../src/main/java/org/nl/acs/task/TaskConfig.java | 7 +++++++ .../agvKit/service/impl/AcsToKitServiceImpl.java | 2 +- .../nl/extInterface/wms/controller/WmsToAcsController.java | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/ordinaryDefination/standardOrdinarySite/StandardOrdinarySiteDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/ordinaryDefination/standardOrdinarySite/StandardOrdinarySiteDeviceDriver.java index 8ab8211..8952889 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/ordinaryDefination/standardOrdinarySite/StandardOrdinarySiteDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/ordinaryDefination/standardOrdinarySite/StandardOrdinarySiteDeviceDriver.java @@ -12,9 +12,11 @@ import org.nl.acs.device.deviceDriver.service.defination.ordinaryDefination.Abst import org.nl.acs.device.storageMgt.service.dto.StorageCellDto; import org.nl.acs.device.storageMgt.service.impl.StorageCellServiceImpl; import org.nl.acs.device.device.service.DeviceAppService; +import org.nl.acs.task.TaskConfig; import org.nl.acs.task.instruction.domain.Instruction; import org.nl.acs.task.instruction.service.InstructionService; import org.nl.config.SpringContextHolder; +import org.nl.system.service.param.ISysParamService; import org.nl.extInterface.agvKit.service.AcsToKitService; import org.nl.extInterface.wms.service.AcsToWmsService; import org.nl.extInterface.wms.service.enums.WmsFeedbackStatusEnum; @@ -33,6 +35,7 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractStandardDeviceDriv private final DeviceAppService deviceAppService = SpringContextHolder.getBean(DeviceAppService.class); private final AcsToKitService acsToKitService = SpringContextHolder.getBean(AcsToKitService.class); private final AcsToWmsService acsToWmsService = SpringContextHolder.getBean(AcsToWmsService.class); + private final ISysParamService paramService = SpringContextHolder.getBean(ISysParamService.class); private int flag; @@ -245,8 +248,8 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractStandardDeviceDriv } private Instruction redirectIfNeeded(Instruction instruction) { - - if (!StrUtil.equals(instruction.getNext_point_code(), "7E")) { + String redirectionPoint = paramService.findByCode(TaskConfig.REDIRECTION_POINT).getValue(); + if (!StrUtil.equals(instruction.getNext_point_code(), redirectionPoint)) { return instruction; } JSONObject response = acsToWmsService.taskRedirection(instruction.getTask_code(), instruction.getNext_point_code()); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/TaskConfig.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/TaskConfig.java index a05bae4..0eb2a7f 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/TaskConfig.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/TaskConfig.java @@ -73,6 +73,8 @@ public class TaskConfig { */ public static String WCSURL = "wcsurl"; + public static String KITAGVURL = "kitagvurl"; + public static String HASOTHERSYSTEM = "hasOtherSystem"; public static String ERPURL = "erpurl"; @@ -152,6 +154,11 @@ public class TaskConfig { */ public static String CHOOSE = "choose"; + /** + * 需要重定向的目标点位编码（如 7E） + */ + public static String REDIRECTION_POINT = "redirectionPoint"; + public static String ELECTRIC ="electric"; public static String ELECTRIC2 ="electric2"; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/service/impl/AcsToKitServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/service/impl/AcsToKitServiceImpl.java index 01f1f95..23dc0c8 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/service/impl/AcsToKitServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/service/impl/AcsToKitServiceImpl.java @@ -82,7 +82,7 @@ public class AcsToKitServiceImpl implements AcsToKitService { ja.put("location_name", instruction.getOffSetName()); jo.put("params", ja); } - String wmsurl = paramService.findByCode(TaskConfig.WCSURL).getValue(); + String wmsurl = paramService.findByCode(TaskConfig.KITAGVURL).getValue(); String url = wmsurl; log.info("任务号：{},指令号{},下发agv订单序列下发:{}", instruction.getTask_code(), instruction.getInstruction_code(), JSON.toJSONString(jo)); LuceneLogDto logDto = diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/wms/controller/WmsToAcsController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/wms/controller/WmsToAcsController.java index 53bad58..0055a4f 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/wms/controller/WmsToAcsController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/wms/controller/WmsToAcsController.java @@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequiredArgsConstructor @Api(tags = "wms->ACS") -@RequestMapping({"/api/wms", "/restful/api/v3"}) +@RequestMapping("/api/wms") @Slf4j public class WmsToAcsController { private final WmsToAcsService wmsToAcsService;