From 0cb07d83d9e1c2f0478ba422a557bd21b02781a8 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期二, 14 四月 2026 16:47:04 +0800
Subject: [PATCH] lsh#

---
 asrs-schedule/src/main/java/com/vincent/rsf/schedule/manager/service/impl/OutStockServiceImpl.java |    4 ++--
 asrs-schedule/src/main/java/com/vincent/rsf/schedule/schedules/AutoRunSchedules.java               |    2 +-
 asrs-schedule/src/main/java/com/vincent/rsf/schedule/api/service/impl/AgvServiceImpl.java          |    2 +-
 asrs-schedule/src/main/java/com/vincent/rsf/schedule/api/service/impl/InBoundServiceImpl.java      |    2 +-
 asrs-schedule/src/main/java/com/vincent/rsf/schedule/schedules/TaskSchedules.java                  |    8 ++++----
 asrs-schedule/src/main/java/com/vincent/rsf/schedule/common/config/BeanConfig.java                 |    8 +-------
 asrs-schedule/src/main/java/com/vincent/rsf/schedule/manager/service/impl/LocItemServiceImpl.java  |   14 +++++++-------
 asrs-schedule/src/main/java/com/vincent/rsf/schedule/manager/service/impl/TaskServiceImpl.java     |    2 +-
 asrs-schedule/src/main/java/com/vincent/rsf/schedule/manager/utils/LocManageUtil.java              |    4 ++--
 asrs-schedule/src/main/java/com/vincent/rsf/schedule/api/service/impl/WcsServiceImpl.java          |    6 +++---
 10 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/asrs-schedule/src/main/java/com/vincent/rsf/schedule/api/service/impl/AgvServiceImpl.java b/asrs-schedule/src/main/java/com/vincent/rsf/schedule/api/service/impl/AgvServiceImpl.java
index 134f456..eda3cb9 100644
--- a/asrs-schedule/src/main/java/com/vincent/rsf/schedule/api/service/impl/AgvServiceImpl.java
+++ b/asrs-schedule/src/main/java/com/vincent/rsf/schedule/api/service/impl/AgvServiceImpl.java
@@ -281,7 +281,7 @@
         if (Cools.isEmpty(area)) {
             throw new CoolException("鐩爣搴撳尯涓嶈兘涓虹┖");
         }
-        boolean isItAvailable = SpringUtils.getBean(WarehouseLocationRetrievalUtil.class).queryPathIsItAvailableInArea(sta, area, waitPakinPda.getBarcode(), "in");
+        boolean isItAvailable = new WarehouseLocationRetrievalUtil().queryPathIsItAvailableInArea(sta, area, waitPakinPda.getBarcode(), "in");
 //        DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>()
 //                .eq(DeviceSite::getSite, sta)
 //                .eq(DeviceSite::getAreaIdEnd, Long.parseLong(area))
diff --git a/asrs-schedule/src/main/java/com/vincent/rsf/schedule/api/service/impl/InBoundServiceImpl.java b/asrs-schedule/src/main/java/com/vincent/rsf/schedule/api/service/impl/InBoundServiceImpl.java
index 4e514a1..bd413af 100644
--- a/asrs-schedule/src/main/java/com/vincent/rsf/schedule/api/service/impl/InBoundServiceImpl.java
+++ b/asrs-schedule/src/main/java/com/vincent/rsf/schedule/api/service/impl/InBoundServiceImpl.java
@@ -216,7 +216,7 @@
 //                throw new CoolException("鏈壘鍒版墍灞炲簱鍖轰俊鎭�");
             }
 
-            boolean isItAvailable = SpringUtils.getBean(WarehouseLocationRetrievalUtil.class).queryPathIsItAvailableInArea(station.getStationName(),  warehouseArea.getId(), param.getContainerNo(), TaskType.TASK_TYPE_EMPTY_IN.type);
+            boolean isItAvailable = new WarehouseLocationRetrievalUtil().queryPathIsItAvailableInArea(station.getStationName(),  warehouseArea.getId(), param.getContainerNo(), TaskType.TASK_TYPE_EMPTY_IN.type);
 //            DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>()
 //                    .eq(DeviceSite::getSite, )
 //                    .eq(DeviceSite::getAreaIdEnd,)
diff --git a/asrs-schedule/src/main/java/com/vincent/rsf/schedule/api/service/impl/WcsServiceImpl.java b/asrs-schedule/src/main/java/com/vincent/rsf/schedule/api/service/impl/WcsServiceImpl.java
index 7838878..2934cfc 100644
--- a/asrs-schedule/src/main/java/com/vincent/rsf/schedule/api/service/impl/WcsServiceImpl.java
+++ b/asrs-schedule/src/main/java/com/vincent/rsf/schedule/api/service/impl/WcsServiceImpl.java
@@ -772,7 +772,7 @@
 
         if (loc != null) {
             //鏌ユ壘璺緞
-            boolean available = SpringUtils.getBean(WarehouseLocationRetrievalUtil.class).queryPathIsItAvailableInArea(sourceStaNo, loc.getAreaId().toString() ,loc.getBarcode(),"in");
+            boolean available = new WarehouseLocationRetrievalUtil().queryPathIsItAvailableInArea(sourceStaNo, loc.getAreaId().toString() ,loc.getBarcode(),"in");
 //            DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>()
 //                    .eq(DeviceSite::getType, ioType)
 //                    .eq(DeviceSite::getSite, sourceStaNo)
@@ -914,7 +914,7 @@
 
         if (loc != null) {
             //鏌ユ壘璺緞
-            boolean available = SpringUtils.getBean(WarehouseLocationRetrievalUtil.class).queryPathIsItAvailableInArea(sourceStaNo, loc.getAreaId().toString() ,loc.getBarcode(),"in");
+            boolean available = new WarehouseLocationRetrievalUtil().queryPathIsItAvailableInArea(sourceStaNo, loc.getAreaId().toString() ,loc.getBarcode(),"in");
 //            DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>()
 //                    .eq(DeviceSite::getType, ioType)
 //                    .eq(DeviceSite::getSite, sourceStaNo)
@@ -995,7 +995,7 @@
         //鏌ユ壘璺緞
         if (loc != null) {
             //鏌ユ壘璺緞
-            boolean available = SpringUtils.getBean(WarehouseLocationRetrievalUtil.class).queryPathIsItAvailableInArea(sourceStaNo, loc.getAreaId().toString() ,loc.getBarcode(),"in");
+            boolean available = new WarehouseLocationRetrievalUtil().queryPathIsItAvailableInArea(sourceStaNo, loc.getAreaId().toString() ,loc.getBarcode(),"in");
 //            DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>()
 //                    .eq(DeviceSite::getType, ioType)
 //                    .eq(DeviceSite::getSite, sourceStaNo)
diff --git a/asrs-schedule/src/main/java/com/vincent/rsf/schedule/common/config/BeanConfig.java b/asrs-schedule/src/main/java/com/vincent/rsf/schedule/common/config/BeanConfig.java
index 08d68e1..ce0874e 100644
--- a/asrs-schedule/src/main/java/com/vincent/rsf/schedule/common/config/BeanConfig.java
+++ b/asrs-schedule/src/main/java/com/vincent/rsf/schedule/common/config/BeanConfig.java
@@ -1,6 +1,5 @@
 package com.vincent.rsf.schedule.common.config;
 
-import com.vincent.rsf.framework.common.SnowflakeIdWorker;
 import com.vincent.rsf.schedule.common.domain.QueueTask;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -12,17 +11,12 @@
  * Created by vincent on 12/19/2023
  */
 @Configuration
-@ComponentScan(value = "com.vincent.rsf.schedule.common.config")
+@ComponentScan(value = {"com.vincent.rsf.schedule.common.config", "com.vincent.rsf.common.config"})
 public class BeanConfig {
 
     @Bean
     public LinkedBlockingQueue<QueueTask> unlockTaskQueue() {
         return new LinkedBlockingQueue<>();
-    }
-
-    @Bean
-    public SnowflakeIdWorker snowflakeIdWorker() {
-        return new SnowflakeIdWorker();
     }
 
 }
diff --git a/asrs-schedule/src/main/java/com/vincent/rsf/schedule/manager/service/impl/LocItemServiceImpl.java b/asrs-schedule/src/main/java/com/vincent/rsf/schedule/manager/service/impl/LocItemServiceImpl.java
index 77b7922..d8b6fd1 100644
--- a/asrs-schedule/src/main/java/com/vincent/rsf/schedule/manager/service/impl/LocItemServiceImpl.java
+++ b/asrs-schedule/src/main/java/com/vincent/rsf/schedule/manager/service/impl/LocItemServiceImpl.java
@@ -118,7 +118,7 @@
                 .setMemo(map.getMemo());
 
         if (map.getType().equals(Constants.TASK_TYPE_OUT_STOCK_EMPTY)) {//绌哄鍣ㄥ嚭搴�
-            boolean available = SpringUtils.getBean(WarehouseLocationRetrievalUtil.class).queryPathIsItAvailableOutArea(loc.getAreaId().toString(), siteNo, loc.getBarcode(),TaskType.TASK_TYPE_EMPTY_OUT.type.toString());
+            boolean available = new WarehouseLocationRetrievalUtil().queryPathIsItAvailableOutArea(loc.getAreaId().toString(), siteNo, loc.getBarcode(),TaskType.TASK_TYPE_EMPTY_OUT.type.toString());
             if (!available) {
                 throw new CoolException("绔欑偣涓嶆敮鎸佺┖瀹瑰櫒鍑哄簱锛侊紒");
             }
@@ -222,7 +222,7 @@
                     || map.getType().equals(Constants.TASK_TYPE_WAVE_OUT_STOCK)) {
                 if (orgQty.compareTo(outQty) > 0) {
                     //鎷f枡鍑哄簱 -- 鐩樼偣鍑哄簱
-                    boolean available = SpringUtils.getBean(WarehouseLocationRetrievalUtil.class).queryPathIsItAvailableOutArea(loc.getAreaId().toString(), siteNo, loc.getBarcode(),TaskType.TASK_TYPE_PICK_AGAIN_OUT.type);
+                    boolean available = new WarehouseLocationRetrievalUtil().queryPathIsItAvailableOutArea(loc.getAreaId().toString(), siteNo, loc.getBarcode(),TaskType.TASK_TYPE_PICK_AGAIN_OUT.type);
                     if (!available) {
                         throw new CoolException("绔欑偣涓嶆敮鎸佹瀹瑰櫒鎷i�夊嚭搴擄紒锛�");
                     }
@@ -231,7 +231,7 @@
                 } else {
                     if (resouce.equals(TaskResouceType.TASK_RESOUCE_STOCK_NOT_OUT.val)){
                         //鍏ㄦ澘鍑哄簱
-                        boolean available = SpringUtils.getBean(WarehouseLocationRetrievalUtil.class).queryPathIsItAvailableOutArea(loc.getAreaId().toString(), siteNo, loc.getBarcode(),TaskType.TASK_TYPE_CROSS_DOCKING_OUT.type);
+                        boolean available = new WarehouseLocationRetrievalUtil().queryPathIsItAvailableOutArea(loc.getAreaId().toString(), siteNo, loc.getBarcode(),TaskType.TASK_TYPE_CROSS_DOCKING_OUT.type);
                         if (!available) {
                             throw new CoolException("绔欑偣涓嶆敮鎸佽秺搴擄紒锛�");
                         }
@@ -239,7 +239,7 @@
                         task.setTaskType(TaskType.TASK_TYPE_CROSS_DOCKING_OUT.type).setWarehType(warehouseAreas.getType());//瓒婂簱
                     } else {
                         //鍏ㄦ澘鍑哄簱
-                        boolean available = SpringUtils.getBean(WarehouseLocationRetrievalUtil.class).queryPathIsItAvailableOutArea(loc.getAreaId().toString(), siteNo, loc.getBarcode(),TaskType.TASK_TYPE_OUT.type);
+                        boolean available = new WarehouseLocationRetrievalUtil().queryPathIsItAvailableOutArea(loc.getAreaId().toString(), siteNo, loc.getBarcode(),TaskType.TASK_TYPE_OUT.type);
                         if (!available) {
                             throw new CoolException("绔欑偣涓嶆敮鎸佸叏鏉垮嚭搴擄紒锛�");
                         }
@@ -250,7 +250,7 @@
                 }
             } else if (map.getType().equals(Constants.TASK_TYPE_OUT_CHECK)) {
                 //鐩樼偣鍑哄簱
-                boolean available = SpringUtils.getBean(WarehouseLocationRetrievalUtil.class).queryPathIsItAvailableOutArea(loc.getAreaId().toString(), siteNo, loc.getBarcode(),TaskType.TASK_TYPE_CHECK_OUT.type);
+                boolean available = new WarehouseLocationRetrievalUtil().queryPathIsItAvailableOutArea(loc.getAreaId().toString(), siteNo, loc.getBarcode(),TaskType.TASK_TYPE_CHECK_OUT.type);
                 if (!available) {
                     throw new CoolException("褰撳墠绔欑偣涓嶆敮鎸佺洏鐐瑰嚭搴擄紒锛�");
                 }
@@ -441,7 +441,7 @@
         if (Objects.isNull(map.getTarLoc()) || StringUtils.isBlank(map.getTarLoc())) {
             //鐩爣搴撲綅涓虹┖锛岃嚜鍔ㄨ幏鍙栨柊搴撲綅
 
-            List<String> outWarehouseAreasByReservoirAreaAndContainer = SpringUtils.getBean(WarehouseLocationRetrievalUtil.class).getOutWarehouseAreasByReservoirAreaAndContainer(orgLoc.getAreaId(), orgLoc.getBarcode(), TaskType.TASK_TYPE_LOC_MOVE.type);
+            List<String> outWarehouseAreasByReservoirAreaAndContainer = new WarehouseLocationRetrievalUtil().getOutWarehouseAreasByReservoirAreaAndContainer(orgLoc.getAreaId(), orgLoc.getBarcode(), TaskType.TASK_TYPE_LOC_MOVE.type);
             if (!Cools.isEmpty(outWarehouseAreasByReservoirAreaAndContainer) || outWarehouseAreasByReservoirAreaAndContainer.isEmpty()) {
                 throw new CoolException("鏈壘鍒板彲鐢ㄧ洰鏍囧簱鍖猴紒锛侊紒婧愬簱鍖猴細"+orgLoc.getAreaId());
             }
@@ -450,7 +450,7 @@
                 List<LocItem> locItems = this.list(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocCode, orgLoc.getCode()));
                 boolean sign = false;
                 for (LocItem locItem : locItems) {
-                    if (!SpringUtils.getBean(WarehouseLocationRetrievalUtil.class).retrieveMatnrIsItAvailable(areaId, locItem.getMatnrId())){
+                    if (!new WarehouseLocationRetrievalUtil().retrieveMatnrIsItAvailable(areaId, locItem.getMatnrId())){
                         sign = true;
                         break;
                     }
diff --git a/asrs-schedule/src/main/java/com/vincent/rsf/schedule/manager/service/impl/OutStockServiceImpl.java b/asrs-schedule/src/main/java/com/vincent/rsf/schedule/manager/service/impl/OutStockServiceImpl.java
index d0ae821..fd28512 100644
--- a/asrs-schedule/src/main/java/com/vincent/rsf/schedule/manager/service/impl/OutStockServiceImpl.java
+++ b/asrs-schedule/src/main/java/com/vincent/rsf/schedule/manager/service/impl/OutStockServiceImpl.java
@@ -833,7 +833,7 @@
                         OrderOutItemDto orderOutItemDto = new OrderOutItemDto();
 //                        orderOutItemDto.setLocItem(locItem);
                         orderOutItemDto.getLocItemList().add(locItem);
-                        List<String> outboundSiteByReservoirAreaAndContainer = SpringUtils.getBean(WarehouseLocationRetrievalUtil.class).getOutboundSiteByReservoirAreaAndContainer(loc.getAreaId(), loc.getBarcode(),itemList.size() == 1 ? TaskType.TASK_TYPE_OUT.type.toString() : TaskType.TASK_TYPE_PICK_AGAIN_OUT.type.toString());
+                        List<String> outboundSiteByReservoirAreaAndContainer = new WarehouseLocationRetrievalUtil().getOutboundSiteByReservoirAreaAndContainer(loc.getAreaId(), loc.getBarcode(),itemList.size() == 1 ? TaskType.TASK_TYPE_OUT.type.toString() : TaskType.TASK_TYPE_PICK_AGAIN_OUT.type.toString());
                         if (!outboundSiteByReservoirAreaAndContainer.isEmpty()) {
                             List<OrderOutItemDto.staListDto> maps = new ArrayList<>();
                             for (String staNo : outboundSiteByReservoirAreaAndContainer) {
@@ -918,7 +918,7 @@
                         locItem.setBarcode(loc.getBarcode());
                         OrderOutItemDto orderOutItemDto = new OrderOutItemDto();
                         orderOutItemDto.getLocItemList().add(locItem);
-                        List<String> outboundSiteByReservoirAreaAndContainer = SpringUtils.getBean(WarehouseLocationRetrievalUtil.class).getOutboundSiteByReservoirAreaAndContainer(loc.getAreaId(), loc.getBarcode(),itemList.size() == 1 ? TaskType.TASK_TYPE_OUT.type : TaskType.TASK_TYPE_PICK_AGAIN_OUT.type);
+                        List<String> outboundSiteByReservoirAreaAndContainer = new WarehouseLocationRetrievalUtil().getOutboundSiteByReservoirAreaAndContainer(loc.getAreaId(), loc.getBarcode(),itemList.size() == 1 ? TaskType.TASK_TYPE_OUT.type : TaskType.TASK_TYPE_PICK_AGAIN_OUT.type);
                         if (!outboundSiteByReservoirAreaAndContainer.isEmpty()) {
                             List<OrderOutItemDto.staListDto> maps = new ArrayList<>();
                             for (String staNo : outboundSiteByReservoirAreaAndContainer) {
diff --git a/asrs-schedule/src/main/java/com/vincent/rsf/schedule/manager/service/impl/TaskServiceImpl.java b/asrs-schedule/src/main/java/com/vincent/rsf/schedule/manager/service/impl/TaskServiceImpl.java
index e6fbc9f..4728cac 100644
--- a/asrs-schedule/src/main/java/com/vincent/rsf/schedule/manager/service/impl/TaskServiceImpl.java
+++ b/asrs-schedule/src/main/java/com/vincent/rsf/schedule/manager/service/impl/TaskServiceImpl.java
@@ -203,7 +203,7 @@
                 throw new CoolException("浠诲姟鏄庣粏淇濆瓨澶辫触锛侊紒");
             }
             waitPakinItems.forEach(item -> {
-                boolean b = SpringUtils.getBean(WarehouseLocationRetrievalUtil.class).retrieveMatnrIsItAvailable(areaId, item.getMatnrId());
+                boolean b = new WarehouseLocationRetrievalUtil().retrieveMatnrIsItAvailable(areaId, item.getMatnrId());
                 if (!b){
                     throw new CoolException("鍏ュ簱澶辫触锛侊紒鐗╂枡Id:"+item.getMatnrId()+"涓嶆敮鎸佹鐩爣搴撳尯锛�"+areaId);
                 }
diff --git a/asrs-schedule/src/main/java/com/vincent/rsf/schedule/manager/utils/LocManageUtil.java b/asrs-schedule/src/main/java/com/vincent/rsf/schedule/manager/utils/LocManageUtil.java
index 229dd7d..37a6448 100644
--- a/asrs-schedule/src/main/java/com/vincent/rsf/schedule/manager/utils/LocManageUtil.java
+++ b/asrs-schedule/src/main/java/com/vincent/rsf/schedule/manager/utils/LocManageUtil.java
@@ -226,7 +226,7 @@
 //                        orderOutItemDto.setLocItem(locItem);
                         orderOutItemDto.setLoc(loc);
                         orderOutItemDto.getLocItemList().add(locItem);
-                        BasContainer containerType = SpringUtils.getBean(WarehouseLocationRetrievalUtil.class).getContainerByBarcode(loc.getBarcode());
+                        BasContainer containerType = new WarehouseLocationRetrievalUtil().getContainerByBarcode(loc.getBarcode());
                         if (Cools.isEmpty(containerType)){
                             continue;
                         }
@@ -318,7 +318,7 @@
                             if (Objects.isNull(basStation)) {
                                 throw new CoolException("缁戝畾绔欓粸涓嶅瓨鍦紒锛�");
                             }
-                            boolean available = SpringUtils.getBean(WarehouseLocationRetrievalUtil.class).queryPathIsItAvailableOutArea(loc.getAreaId().toString(), stationId, loc.getBarcode(),"out");
+                            boolean available = new WarehouseLocationRetrievalUtil().queryPathIsItAvailableOutArea(loc.getAreaId().toString(), stationId, loc.getBarcode(),"out");
                             if (!available) {
                                 throw new CoolException("鏈壘鍒扮鍚堟潯浠惰矾寰勶紒锛侊紒璇锋鏌ヨ矾寰勯厤缃紒锛侊紒");
                             }
diff --git a/asrs-schedule/src/main/java/com/vincent/rsf/schedule/schedules/AutoRunSchedules.java b/asrs-schedule/src/main/java/com/vincent/rsf/schedule/schedules/AutoRunSchedules.java
index 39051a9..6ddf32d 100644
--- a/asrs-schedule/src/main/java/com/vincent/rsf/schedule/schedules/AutoRunSchedules.java
+++ b/asrs-schedule/src/main/java/com/vincent/rsf/schedule/schedules/AutoRunSchedules.java
@@ -230,7 +230,7 @@
                     throw new CoolException("鏃犲彲鐢ㄧ珯鐐癸紒锛�");
                 }
                 for (String stationName : stationNames) {
-                    boolean isItAvailable = SpringUtils.getBean(WarehouseLocationRetrievalUtil.class).queryPathIsItAvailableOutArea(loc.getAreaId(), stationName, loc.getBarcode(), TaskType.TASK_TYPE_CHECK_OUT.type);
+                    boolean isItAvailable = new WarehouseLocationRetrievalUtil().queryPathIsItAvailableOutArea(loc.getAreaId(), stationName, loc.getBarcode(), TaskType.TASK_TYPE_CHECK_OUT.type);
                     if (!isItAvailable) {
                         continue;
                     }
diff --git a/asrs-schedule/src/main/java/com/vincent/rsf/schedule/schedules/TaskSchedules.java b/asrs-schedule/src/main/java/com/vincent/rsf/schedule/schedules/TaskSchedules.java
index 03cb4bd..9e1ee02 100644
--- a/asrs-schedule/src/main/java/com/vincent/rsf/schedule/schedules/TaskSchedules.java
+++ b/asrs-schedule/src/main/java/com/vincent/rsf/schedule/schedules/TaskSchedules.java
@@ -180,11 +180,11 @@
                     MissionTaskIssueParam missionTaskIssueParam = new MissionTaskIssueParam(flowStepInstance,subsystemFlowTemplate,flowStepTemplate);
 
                     missionTaskIssueParam.setType(RcsTaskType.getTypeDesc(task.getTaskType()));
-                    boolean souSign = SpringUtils.getBean(WarehouseLocationRetrievalUtil.class).retrieveMissionmMergeReservoirAreaIsItAvailable(taskInstance.getSourceCode());
+                    boolean souSign = new WarehouseLocationRetrievalUtil().retrieveMissionmMergeReservoirAreaIsItAvailable(taskInstance.getSourceCode());
                     if (souSign){
                         missionTaskIssueParam.setSourceCode(taskInstance.getSourceCode());
                     } else {
-                        BasStation basStation = SpringUtils.getBean(WarehouseLocationRetrievalUtil.class).retrieveMissionmMergeSizeIsItAvailable(taskInstance.getSourceCode());
+                        BasStation basStation = new WarehouseLocationRetrievalUtil().retrieveMissionmMergeSizeIsItAvailable(taskInstance.getSourceCode());
                         if (Cools.isEmpty(basStation)){
                             flowStepInstance.setRetryTimes(flowStepInstance.getRetryTimes() + 1);
                             if (flowStepInstance.getRetryTimes()>5){
@@ -200,11 +200,11 @@
                             missionTaskIssueParam.setSourceCode(basStation.getStationName());
                         }
                     }
-                    boolean endSign = SpringUtils.getBean(WarehouseLocationRetrievalUtil.class).retrieveMissionmMergeReservoirAreaIsItAvailable(taskInstance.getTargetCode());
+                    boolean endSign = new WarehouseLocationRetrievalUtil().retrieveMissionmMergeReservoirAreaIsItAvailable(taskInstance.getTargetCode());
                     if (endSign){
                         missionTaskIssueParam.setTargetCode(taskInstance.getTargetCode());
                     } else {
-                        BasStation basStation = SpringUtils.getBean(WarehouseLocationRetrievalUtil.class).retrieveMissionmMergeSizeIsItAvailable(taskInstance.getTargetCode());
+                        BasStation basStation = new WarehouseLocationRetrievalUtil().retrieveMissionmMergeSizeIsItAvailable(taskInstance.getTargetCode());
                         if (Cools.isEmpty(basStation)){
                             flowStepInstance.setRetryTimes(flowStepInstance.getRetryTimes() + 1);
                             if (flowStepInstance.getRetryTimes()>5){

--
Gitblit v1.9.1