fix: remove broken duplicate page return

zhou zhou

3 天以前 f27309d45c7ef46b0aea98107b67d0c5b46d4217

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

@@ -10,7 +10,7 @@
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.entity.AsnOrderItem;
import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.entity.Purchase;
import com.vincent.rsf.server.manager.entity.PurchaseItem;
import com.vincent.rsf.server.manager.enums.POExceStatus;
@@ -18,6 +18,7 @@
import com.vincent.rsf.server.manager.service.PurchaseItemService;
import com.vincent.rsf.server.manager.service.PurchaseService;
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 org.apache.commons.lang3.StringUtils;
@@ -25,7 +26,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

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

@@ -46,7 +47,9 @@
    public R page(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<Purchase, BaseParam> pageParam = new PageParam<>(baseParam, Purchase.class);
        return R.ok().add(purchaseService.page(pageParam, pageParam.buildWrapper(true)));
        PageParam<Purchase, BaseParam> page = purchaseService.page(pageParam, pageParam.buildWrapper(true));
        buildPageRowsUtils.userNameMap(page.getRecords());
        return R.ok().add(page);
    }

    @PreAuthorize("hasAuthority('manager:purchase:list')")
@@ -57,7 +60,9 @@
        QueryWrapper<Purchase> wrapper = pageParam.buildWrapper(true);
        wrapper.apply("anfme > qty");
        wrapper.ne("exce_status", POExceStatus.PO_EXCE_STATUS_ALL_DONE.val);
        return R.ok().add(purchaseService.page(pageParam, wrapper));
        PageParam<Purchase, BaseParam> page = purchaseService.page(pageParam, wrapper);
        buildPageRowsUtils.userNameMap(page.getRecords());
        return R.ok().add(page);
    }


@@ -116,7 +121,7 @@
    public R remove(@PathVariable Long[] ids) {
        List<Purchase> purchases = purchaseService.listByIds(Arrays.asList(ids));
        Set<String> stringSet = purchases.stream().map(Purchase::getCode).collect(Collectors.toSet());
        List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getPoCode, stringSet));
        List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().in(WkOrderItem::getPoCode, stringSet));
        if (!orderItems.isEmpty()) {
            return R.error("单据有已生成的收货单明细，不可执行删除操作！！");
        }