金银花搭建

warewms-ams/src/main/java/com/warewms/ams/ndc/service/impl/AmsTaskServiceImpl.java

@@ -208,7 +208,7 @@ public class AmsTaskServiceImpl implements IAmsTaskService
     }
 
     private Integer getCacheLocation(String locationFromId, String locationToId) {
-        boolean isExist = redisCache.checkIsExist(redisCache.getCacheObject(Constants.WMS_CORRESPOND_AGV_STATION_KEY.concat(locationFromId)));
+        boolean isExist = redisCache.checkIsExist(Constants.WMS_CORRESPOND_AGV_STATION_KEY.concat(locationFromId));
         String rowNo = isExist ?
                 redisCache.getCacheObject(Constants.LOCATION_ROW_KEY.concat(locationFromId)) : redisCache.getCacheObject(Constants.LOCATION_ROW_KEY.concat(locationToId));
         String locationConfig = sysConfigService.selectConfigByKey(SceneConstants.LOCATION_SCENE);
@@ -216,6 +216,7 @@ public class AmsTaskServiceImpl implements IAmsTaskService
         Map<String, List<Integer>> locationConfigMap = JSONObject.parseObject(locationConfig, Map.class);
         String sceneValueKey = locationConfigMap.entrySet().stream().filter(item -> item.getValue().contains(Integer.valueOf(isExist ? locationToId : locationFromId))).map(Map.Entry::getKey).findFirst().orElseGet(() -> null);
         Integer zoneId = SceneConstants.locationToAreaCacheListMapper.get(sceneValueKey);
+        Assert.isTrue(ObjectUtil.isNotNull(zoneId), "location.scene.config is not exist this locationId");
         List<BaseLocationInfo> baseLocationInfoList = baseLocationInfoService.queryBaseLocationInfoList(zoneId, rowNo);
         Assert.isTrue(CollectionUtil.isNotEmpty(baseLocationInfoList), "this zone cache location is not exist");
         return Integer.parseInt(baseLocationInfoList.stream().findFirst().orElseThrow(() -> new BaseException("this zone cache location is not exist")).getLocationNo());