fix: remove broken duplicate page return

zhou zhou

2 天以前 f27309d45c7ef46b0aea98107b67d0c5b46d4217

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderController.java

@@ -11,10 +11,8 @@
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
import com.vincent.rsf.server.manager.controller.params.CheckOrderItemParams;
import com.vincent.rsf.server.manager.controller.params.CheckOrderParams;
import com.vincent.rsf.server.manager.controller.params.OrderOutTaskParam;
import com.vincent.rsf.server.common.utils.OptimisticLockUtils;
import com.vincent.rsf.server.manager.controller.params.*;
import com.vincent.rsf.server.manager.entity.WkOrder;
import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.entity.excel.CheckOrderTemplate;
@@ -22,6 +20,7 @@
import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.manager.service.CheckOrderService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
import com.vincent.rsf.server.system.controller.BaseController;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import io.swagger.annotations.Api;
@@ -31,7 +30,7 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.stream.Collectors;

@@ -49,7 +48,9 @@
        PageParam<WkOrder, BaseParam> pageParam = new PageParam<>(baseParam, WkOrder.class);
        QueryWrapper<WkOrder> wrapper = pageParam.buildWrapper(true);
        wrapper.eq("type", OrderType.ORDER_CHECK.type);
        return R.ok().add(checkOrderService.page(pageParam, wrapper));
        PageParam<WkOrder, BaseParam> page = checkOrderService.page(pageParam, wrapper);
        buildPageRowsUtils.userNameMap(page.getRecords());
        return R.ok().add(page);
    }

    @PreAuthorize("hasAuthority('manager:check:list')")
@@ -89,6 +90,7 @@
    @OperationLog("Update 字典数据集")
    @PostMapping("/check/update")
    public R update(@RequestBody WkOrder order) {
        OptimisticLockUtils.requireVersion("盘点单", order.getVersion());
        order.setUpdateTime(null);
        order.setUpdateBy(getLoginUserId());
        if (!checkOrderService.updateById(order)) {
@@ -215,13 +217,13 @@


    @ApiOperation("获取在库物料列表")
    @PostMapping("/check/locs/{matnrs}")
    @PostMapping("/check/locs")
    @PreAuthorize("hasAuthority('manager:check:list')")
    public R getAllLocByMatnr(@PathVariable String[] matnrs) {
        if (Objects.isNull(matnrs)) {
    public R getAllLocByMatnr(@RequestBody CheckLocQueryParams params) {
        if (Objects.isNull(params)) {
            return R.error("参数不能为空！！");
        }
        return checkOrderService.getAllLocByMatnr(Arrays.asList(matnrs));
        return checkOrderService.getAllLocByMatnr(params);
    }