#

zhou zhou

2 天以前 f8f3c56936e606a97cd8fe2a7624f6e7bb91481c

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

@@ -5,7 +5,7 @@
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.controller.params.*;
import com.vincent.rsf.server.api.controller.erp.params.*;
import com.vincent.rsf.server.api.entity.dto.*;
import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.api.service.MobileService;
@@ -28,10 +28,7 @@
import com.vincent.rsf.server.system.entity.*;
import com.vincent.rsf.server.system.mapper.FieldsMapper;
import com.vincent.rsf.server.system.mapper.TenantMapper;
import com.vincent.rsf.server.system.service.ConfigService;
import com.vincent.rsf.server.system.service.FieldsItemService;
import com.vincent.rsf.server.system.service.UserLoginService;
import com.vincent.rsf.server.system.service.UserService;
import com.vincent.rsf.server.system.service.*;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
@@ -127,6 +124,8 @@
    private CompanysService companysService;
    @Autowired
    private OutStockService outStockService;
    @Autowired
    private WarehouseRoleMenuService warehouseRoleMenuService;

    /**
     * @return
@@ -243,7 +242,7 @@
                throw new CoolException("数据错误！！");
            }
            if (!one.getExceStatus().equals(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val)) {
                throw new CoolException("出库单未完成，无法完成收货！！");
                throw new CoolException("调拔出库单未完成，不可执行收货操作！！");
            }
        }

@@ -505,9 +504,17 @@
     * @time 2025/3/11 10:12
     */
    @Override
    public R getReceiptAreas() {
    public R getReceiptAreas(User user) {
        Long[] userRoleIds = user.getUserRoleIds();
        List<WarehouseRoleMenu> warehouseRoleMenus = warehouseRoleMenuService.list(new LambdaQueryWrapper<WarehouseRoleMenu>()
                .in(WarehouseRoleMenu::getRoleId, Arrays.asList(userRoleIds))
        );
        Set<WarehouseRoleMenu> warehouseRoleMenusSet = new HashSet<>(warehouseRoleMenus);
        List<Long> longs = warehouseRoleMenusSet.stream().map(WarehouseRoleMenu::getMenuId).collect(Collectors.toList());
        List<WarehouseAreas> areas = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>()
                .eq(WarehouseAreas::getType, WarehouseAreaType.WAREHOUSE_AREA_RECEIPT.type));
                .eq(WarehouseAreas::getType, WarehouseAreaType.WAREHOUSE_AREA_RECEIPT.type)
                .in(WarehouseAreas::getId, longs)
        );
        return R.ok(areas);
    }

@@ -564,6 +571,17 @@
    }

    /**
     * @author Munch D. Luffy
     * @date 2026/01/09
     * @description: PDA组拖
     * @version 1.0
     */
    @Override
    public WaitPakin mergeItemsWcs(WaitPakinParam waitPakin, Long userId) {
        return waitPakinService.mergeItemsWcs(waitPakin, userId);
    }

    /**
     * @param param
     * @return
     * @author Ryan