不同场景下增加库位配置的逻辑

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/ams/BucketLocInvController.java

@@ -1,14 +1,17 @@
 package com.ruoyi.web.controller.warewms.ams;
 
 import cn.hutool.core.collection.CollectionUtil;
+import com.google.common.collect.Lists;
 import com.ruoyi.ams.task.service.IWcsTaskService;
 import com.ruoyi.base.domain.BaseLocationInfo;
 import com.ruoyi.base.domain.BaseLocationZone;
 import com.ruoyi.base.service.IBaseLocationInfoService;
 import com.ruoyi.base.service.IBaseLocationZoneService;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.aspectj.weaver.loadtime.Aj;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -35,27 +38,32 @@ public class BucketLocInvController {
     @Autowired
     private IBaseLocationZoneService iBaseLocationZoneService;
 
-    //TODO 李卫
+    @ApiOperation("获取当前场景出入库的库区")
+    @GetMapping(value = "/getZoneList")
+    public AjaxResult getZoneList() {
+        List<BaseLocationZone> baseLocationZoneList = iBaseLocationZoneService.selectBaseLocationZoneList();
+        List<Long> locationZoneIdList = wcsTaskService.getBucketLocationIdList("locationZoneIdList");
+        List<BaseLocationZone> locationZoneList = baseLocationZoneList.stream()
+                .filter(item -> CollectionUtil.contains(locationZoneIdList, item.getZoneId())).collect(Collectors.toList());
+        return AjaxResult.success(locationZoneList);
+    }
+
+
+
     @ApiOperation("桶装入库：获取当前场景下的库位")
     @GetMapping(value = "/getBaseLocationInfoList")
     public AjaxResult getBaseLocationInfoList(Long zoneId, String locationSceneCode) {
         List<BaseLocationInfo> baseLocationInfoList = iBaseLocationInfoService.getBaseLocationInfoList(zoneId);
+        if(StringUtils.isBlank(locationSceneCode)) return AjaxResult.success(baseLocationInfoList);
+
         List<Long> bucketLocationIdList = wcsTaskService.getBucketLocationIdList(locationSceneCode);
+        if(CollectionUtil.isEmpty(bucketLocationIdList)) return AjaxResult.success(Lists.newArrayList());
         List<BaseLocationInfo> locationInfoList = baseLocationInfoList.stream()
                 .filter(item -> CollectionUtil.contains(bucketLocationIdList, item.getId())).collect(Collectors.toList());
-        //获取库位的配置
         return AjaxResult.success(locationInfoList);
     }
 
 
-    @ApiOperation("获取当前场景出入库的库区")
-    @GetMapping(value = "/getZoneList")
-    public AjaxResult getZoneList() {
-        List<BaseLocationZone> baseLocationZoneList = iBaseLocationZoneService.selectBaseLocationZoneList();
-        List<Long> locationZoneIdList = wcsTaskService.getBucketLocationIdList("locationZoneIdList");
-        List<BaseLocationZone> locationZoneList = baseLocationZoneList.stream()
-                .filter(item -> CollectionUtil.contains(locationZoneIdList, item.getZoneId())).collect(Collectors.toList());
-        return AjaxResult.success(locationZoneList);
-    }
+
 
 }