From 861cdfea72c9e59c6a791a9609626c002f5e90b4 Mon Sep 17 00:00:00 2001 From: ldj_willow Date: Thu, 18 Aug 2022 16:54:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/acs/agv/server/impl/AgvServiceImpl.java | 3 --- .../org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java | 7 ------- .../org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java | 5 ----- .../nl/acs/agv/server/impl/XianGongAgvServiceImpl.java | 4 ---- .../org/nl/acs/task/service/impl/TaskServiceImpl.java | 9 +++++---- 5 files changed, 5 insertions(+), 23 deletions(-) diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java index 48f8502..aa6c668 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java @@ -12,7 +12,6 @@ import org.nl.acs.config.AcsConfig; import org.nl.acs.config.server.AcsConfigService; import org.nl.acs.device_driver.lnsh.lnsh_station.LnshStationDeviceDriver; import org.nl.acs.device_driver.standard_autodoor.StandardAutodoorDeviceDriver; -import org.nl.acs.ext.erp.service.AcsToErpService; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.log.service.DeviceExecuteLogService; @@ -42,8 +41,6 @@ public class AgvServiceImpl implements AgvService { @Autowired AcsConfigService acsConfigService; @Autowired - AcsToErpService acsToErpService; - @Autowired AcsToWmsService acsToWmsService; private final DeviceExecuteLogService logServer; diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java index 0ca215a..b2f4096 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java @@ -18,16 +18,13 @@ import org.nl.acs.device_driver.standard_autodoor.StandardAutodoorDeviceDriver; import org.nl.acs.device_driver.standard_inspect_site.StandardInspectSiteDeviceDriver; import org.nl.acs.device_driver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver; import org.nl.acs.device_driver.standard_storage.StandardStorageDeviceDriver; -import org.nl.acs.ext.erp.service.AcsToErpService; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.Instruction; -import org.nl.acs.log.service.DeviceExecuteLogService; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceAppService; import org.nl.acs.opc.DeviceAppServiceImpl; import org.nl.acs.opc.DeviceType; -import org.nl.acs.task.service.TaskService; import org.nl.exception.BadRequestException; import org.nl.utils.SpringContextHolder; import org.slf4j.MDC; @@ -42,13 +39,9 @@ import java.util.*; @RequiredArgsConstructor public class MagicAgvServiceImpl implements MagicAgvService { private final DeviceAppService deviceAppService; - private final TaskService taskService; - private final InstructionService instructionService; private final AcsConfigService acsConfigService; - private final AcsToErpService acsToErpService; private final AcsToWmsService acsToWmsService; - private final DeviceExecuteLogService logServer; Map AGVDeviceStatus = new HashMap(); diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java index ecc7da1..73860fa 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java @@ -13,7 +13,6 @@ import org.nl.acs.config.server.AcsConfigService; import org.nl.acs.device.service.DeviceService; import org.nl.acs.device.service.impl.DeviceServiceImpl; import org.nl.acs.device_driver.standard_autodoor.StandardAutodoorDeviceDriver; -import org.nl.acs.ext.erp.service.AcsToErpService; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.Instruction; @@ -22,7 +21,6 @@ import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceAppService; import org.nl.acs.opc.DeviceAppServiceImpl; import org.nl.acs.opc.DeviceType; -import org.nl.acs.task.service.TaskService; import org.nl.exception.BadRequestException; import org.nl.utils.SpringContextHolder; import org.slf4j.MDC; @@ -38,10 +36,7 @@ import java.util.Map; public class NDCAgvServiceImpl implements NDCAgvService { private final DeviceAppService deviceAppService; - private final TaskService taskService; - private final InstructionService instructionService; private final AcsConfigService acsConfigService; - private final AcsToErpService acsToErpService; private final AcsToWmsService acsToWmsService; private final DeviceExecuteLogService logServer; diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java index 10c8193..5e45841 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java @@ -15,7 +15,6 @@ import org.nl.acs.config.server.AcsConfigService; import org.nl.acs.device_driver.standard_autodoor.StandardAutodoorDeviceDriver; import org.nl.acs.device_driver.standard_inspect_site.StandardInspectSiteDeviceDriver; import org.nl.acs.device_driver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver; -import org.nl.acs.ext.erp.service.AcsToErpService; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.Instruction; @@ -37,10 +36,7 @@ import java.util.*; @RequiredArgsConstructor public class XianGongAgvServiceImpl implements XianGongAgvService { private final DeviceAppService deviceAppService; - private final TaskService taskService; - private final InstructionService instructionService; private final AcsConfigService acsConfigService; - private final AcsToErpService acsToErpService; private final AcsToWmsService acsToWmsService; private final DeviceExecuteLogService logServer; diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java index ce5d3aa..5287ed3 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java @@ -47,6 +47,7 @@ import org.nl.utils.SpringContextHolder; import org.nl.wql.WQL; import org.nl.wql.core.bean.WQLObject; import org.nl.wql.util.WqlUtil; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -75,8 +76,8 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { private final RouteLineService routelineserver; private final AcsToWmsService acstowmsService; - - private final TaskFeedbackService taskFeedbackService; + @Autowired + private TaskFeedbackService taskFeedbackService; private final AcsConfigService acsConfigService; @@ -84,8 +85,8 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { private final RouteLineService routeLineService; private final DeviceAssignedService deviceAssignedService; - - private final InstructionService instructionService; + @Autowired + private InstructionService instructionService; private final StorageCellService storageCellService;