#

zhou zhou

8 天以前 6922624789e23bbcc7f3c7609af642efb3894c88

#

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

@@ -114,7 +114,7 @@
    @ApiOperation("获取收货区")
    @GetMapping("/areas/receipt")
    public R getReceiptAreas() {
        return mobileService.getReceiptAreas();
        return mobileService.getReceiptAreas(getLoginUser());
    }



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

@@ -11,6 +11,7 @@
import com.vincent.rsf.server.manager.entity.WaitPakin;
import com.vincent.rsf.server.system.controller.param.LoginParam;
import com.vincent.rsf.server.system.entity.Fields;
import com.vincent.rsf.server.system.entity.User;

import javax.servlet.http.HttpServletRequest;
import java.util.List;
@@ -35,7 +36,7 @@

    List<WkOrder> getAllAsnOrders();

    R getReceiptAreas();
    R getReceiptAreas(User user);

    List<Fields> getDynamicFields();


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

@@ -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
@@ -505,9 +504,14 @@
     * @time 2025/3/11 10:12
     */
    @Override
    public R getReceiptAreas() {
    public R getReceiptAreas(User user) {
        Long[] userRoleIds = user.getUserRoleIds();
        List<WarehouseRoleMenu> warehouseRoleMenus = warehouseRoleMenuService.listByIds(Arrays.asList(userRoleIds));
        Long[] longs = warehouseRoleMenus.stream().map(WarehouseRoleMenu::getId).toArray(Long[]::new);
        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);
    }