Merge branch 'xuankuang' of http://47.100.220.92:10001/WAREWMS/WAREAMS into xuankuang

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

@@ -3,12 +3,15 @@ package com.ruoyi.web.controller.warewms.ams;
 import cn.hutool.core.collection.CollectionUtil;
 import com.ruoyi.ams.task.service.IWcsTaskService;
 import com.ruoyi.ams.xuankuang.domain.form.EmptyPalletLocForm;
-import com.ruoyi.ams.xuankuang.service.BucketWcsToWmsApiService;
-import com.ruoyi.ams.xuankuang.service.WcsTaskSubService;
 import com.ruoyi.ams.xuankuang.service.WcsToWmsApiService;
+import com.ruoyi.base.constant.Constant;
 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.constant.Constants;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.sun.org.apache.regexp.internal.RE;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,10 +26,10 @@ import java.util.stream.Collectors;
  * @version 1.0
  * @date 2022/11/14 14:52
  */
-@Api("入库场景下的其他逻辑")
+@Api("出入库场景下的其他逻辑")
 @RestController
 @RequestMapping("/inv/asn")
-public class InvAsnController {
+public class BacketLocInvController {
 
 
     @Autowired
@@ -42,6 +45,9 @@ public class InvAsnController {
     @Autowired
     private IWcsTaskService wcsTaskService;
 
+    @Autowired
+    private IBaseLocationZoneService iBaseLocationZoneService;
+
     //TODO 李卫
     @ApiOperation("桶装入库：获取当前场景下的库位")
     @GetMapping(value = "/getBaseLocationInfoList")
@@ -62,4 +68,15 @@ public class InvAsnController {
         return bucketWcsToWmsApiService.emptyPalletLoc(emptyPalletLocForm);
     }
 
+
+    @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);
+    }
+
 }

ruoyi-admin/src/main/resources/application-dev.yml

@@ -64,7 +64,7 @@ spring:
         # 数据库索引
         database: 0
         # 密码
-        password:
+        password: 123499
         # 连接超时时间
         timeout: 10s
         lettuce:

warewms-base/src/main/java/com/ruoyi/base/constant/Constant.java

@@ -1,6 +1,7 @@
 package com.ruoyi.base.constant;
 
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.ruoyi.base.domain.BaseLocationZone;
 import com.ruoyi.common.utils.StringUtils;
 import io.netty.util.internal.ObjectUtil;
 
@@ -68,6 +69,22 @@ public class Constant {
     public static final String WCS_TASK_URL6 = "http://localhost:8082/adaptor/agv/callback/outtask?wcsId=";
 
 
+    public enum ZoneStatus{
+        ENABLE("0"),
+        DISABLE("1");
+
+        private String code;
+
+        ZoneStatus(String code) {
+            this.code = code;
+        }
+
+        public String getCode() {
+            return code;
+        }
+    }
+
+
     /**
      * 产线编号
      */

warewms-base/src/main/java/com/ruoyi/base/mapper/BaseLocationZoneMapper.java

@@ -1,6 +1,8 @@
 package com.ruoyi.base.mapper;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.base.domain.BaseLocationZone;
 
 /**
@@ -9,7 +11,7 @@ import com.ruoyi.base.domain.BaseLocationZone;
  * @author andy
  * @date 2022-02-15
  */
-public interface BaseLocationZoneMapper
+public interface BaseLocationZoneMapper extends BaseMapper<BaseLocationZone>
 {
     /**
      * 查询库区

warewms-base/src/main/java/com/ruoyi/base/service/IBaseLocationZoneService.java

@@ -29,6 +29,12 @@ public interface IBaseLocationZoneService
      */
      List<BaseLocationZone> selectBaseLocationZoneList(BaseLocationZone baseLocationZone);
 
+    /**
+     * 查询当前所有启用的库位
+     * @return
+     */
+    List<BaseLocationZone> selectBaseLocationZoneList();
+
     /**
      * pda查询库区列表
      *

warewms-base/src/main/java/com/ruoyi/base/service/impl/BaseLocationZoneServiceImpl.java

@@ -4,6 +4,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.base.constant.Constant;
 import com.ruoyi.base.domain.BaseLocationInfo;
 import com.ruoyi.base.domain.vo.BasLocationTreeSelectVO;
 import com.ruoyi.base.domain.vo.TreeSelectVO;
@@ -50,6 +52,12 @@ public class BaseLocationZoneServiceImpl implements IBaseLocationZoneService
         return baseLocationZoneMapper.selectBaseLocationZoneList(baseLocationZone);
     }
 
+    @Override
+    public List<BaseLocationZone> selectBaseLocationZoneList() {
+        return baseLocationZoneMapper.selectList(Wrappers.<BaseLocationZone>lambdaQuery()
+                        .eq(BaseLocationZone::getStatus, Constant.ZoneStatus.ENABLE.getCode()));
+    }
+
     /**
      * pda查询库区列表
      *