From c889784b65c6dd8ad089c25444f1ce3d404b868a Mon Sep 17 00:00:00 2001 From: zhangzq Date: Thu, 12 Feb 2026 14:47:12 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=A5=97=E4=BB=B6=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...DCToAcsController.java => KitToAcsController.java} | 11 +++++------ .../org/nl/acs/ext/wms/rest/LiKuToACSController.java | 2 -- .../acs/ext/wms/service/impl/AcsToNDCServiceImpl.java | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) rename acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/{NDCToAcsController.java => KitToAcsController.java} (80%) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/NDCToAcsController.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/KitToAcsController.java similarity index 80% rename from acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/NDCToAcsController.java rename to acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/KitToAcsController.java index c303825..4fe30d7 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/NDCToAcsController.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/KitToAcsController.java @@ -6,7 +6,6 @@ import io.swagger.annotations.Api; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.ext.wms.log.OthersToInterfaceLog; -import org.nl.acs.ext.wms.service.AcsToNDCService; import org.nl.acs.ext.wms.service.NDCToAcsService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -17,17 +16,17 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequiredArgsConstructor -@Api(tags = "ndc接口") -@RequestMapping("/ndcToAcs") +@Api(tags = "acs套件回传接口") +@RequestMapping("/api/kitToAcs") @Slf4j -public class NDCToAcsController { +public class KitToAcsController { private final NDCToAcsService ndcToAcsService; @SaIgnore - @PostMapping("/agv/agvCallbackService/agvCallback") - @OthersToInterfaceLog("NDC->ACS") + @PostMapping("/agvCallback") + @OthersToInterfaceLog("kit->ACS") public ResponseEntity agvCallback(@RequestBody JSONObject requestParam) throws Exception{ return new ResponseEntity<>(ndcToAcsService.agvCallback(requestParam), HttpStatus.OK); } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/LiKuToACSController.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/LiKuToACSController.java index e140f01..7e5eefe 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/LiKuToACSController.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/LiKuToACSController.java @@ -5,11 +5,9 @@ package org.nl.acs.ext.wms.rest; import cn.dev33.satoken.annotation.SaIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import jdk.nashorn.internal.ir.annotations.Ignore; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.ext.wms.liKuData.*; -import org.nl.acs.ext.wms.service.AcsToLiKuService; import org.nl.acs.ext.wms.service.LiKuToAcsService; import org.nl.modules.logging.InterfaceLogType; import org.nl.modules.logging.annotation.Log; diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToNDCServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToNDCServiceImpl.java index a7ca0b1..2492bd1 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToNDCServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToNDCServiceImpl.java @@ -82,7 +82,7 @@ public class AcsToNDCServiceImpl implements AcsToNDCService { .timeout(20000) .execute(); LuceneLogDto logDto1 = LuceneLogDto.builder() - .device_code("下发科聪任务") + .device_code("下发ACS套件") .content("任务号:" + instruction.getTask_code() + ",指令号:" + instruction.getInstruction_code() + ",下发wcs任务序列反馈参数:" + jo) .build(); logDto1.setLog_level(4);