#

zhou zhou

1 天以前 175cd5761970d1fd06b500c2fa0d5528c3571fb6

#

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java

@@ -158,6 +158,17 @@
        }
    }

    @ApiOperation("获取拖盘可用库区")
    @PostMapping("/asnOrderItem/container/area")
    public R getItemByContainerArea(@RequestBody Map<String, Object> params) {
        if (Objects.isNull(params)) {
            return R.error("参数不能为空！！");
        }

        return mobileService.getItemByContainerArea(params, getLoginUser());

    }

    @ApiOperation("组托")
    @PostMapping("/waitPakin/merge")
    public R pikinOrder(@RequestBody WaitPakinParam waitPakin) {

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java

@@ -68,6 +68,7 @@
    R completeOrder(Long id, Long loginUserId);

    R getItemByContainer(Map<String, Object> params,User user);
    R getItemByContainerArea(Map<String, Object> params,User user);

    R getUnItemByContainer(Map<String, Object> params);


 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java

@@ -1045,6 +1045,46 @@

    /**
     * @param
     * @param user
     * @return
     * @author Ryan
     * @description 通过容器获取组拖物料
     * @time 2025/4/9 16:57
     */
    @Override
    public R getItemByContainerArea(Map<String, Object> params, User user) {
        List<BasContainer> containers = basContainerService.list();
        for (BasContainer container : containers) {
            String codeType = container.getCodeType(); // 获取正则表达式
            if (params.get("barcode").toString().matches(codeType)) { // 判断条码是否符合这个正则
                List<WarehouseRoleMenu> warehouseRoleMenus = warehouseRoleMenuService
                        .list(new LambdaQueryWrapper<WarehouseRoleMenu>()
                                .in(WarehouseRoleMenu::getRoleId, Arrays.asList(user.getUserRoleIds())));
                Set<WarehouseRoleMenu> warehouseRoleMenusSet = new HashSet<>(warehouseRoleMenus);
                // 获取 menuId 集合
                Set<Long> menuIdSet = warehouseRoleMenusSet.stream()
                        .map(WarehouseRoleMenu::getMenuId)
                        .collect(Collectors.toSet());
                // 获取 areaList 并转换为 Long 类型的 Set
                List<Integer> areaList = container.getAreas();
                Set<Long> areaSet = new HashSet<>();
                if (areaList != null) {
                    areaList.forEach(area -> areaSet.add(area.longValue()));
                }
                // 求两个集合的交集
                menuIdSet.retainAll(areaSet);

                List<WarehouseAreas> areas = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>()
                        .in(WarehouseAreas::getId, menuIdSet));
                return R.ok(areas);

            }
        }
        return R.ok(new ArrayList<>());
    }

    /**
     * @param
     * @return
     * @author Ryan
     * @description 通过容器获取组拖物料