zhou zhou
2 天以前 a8df4c4a80781c02815021a840971ce4b15419f5
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java
@@ -17,6 +17,7 @@
import com.vincent.rsf.server.manager.entity.WaitPakin;
import com.vincent.rsf.server.manager.entity.WaitPakinItem;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -26,7 +27,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.stream.Collectors;
@@ -53,7 +54,9 @@
    public R page(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<WaitPakin, BaseParam> pageParam = new PageParam<>(baseParam, WaitPakin.class);
        return R.ok().add(waitPakinService.page(pageParam, pageParam.buildWrapper(true)));
        PageParam<WaitPakin, BaseParam> page = waitPakinService.page(pageParam, pageParam.buildWrapper(true));
        buildPageRowsUtils.userNameMap(page.getRecords());
        return R.ok().add(page);
    }
    @PreAuthorize("hasAuthority('manager:waitPakin:list')")
@@ -117,7 +120,7 @@
            WaitPakin waitPakin = waitPakinService.getById(id);
            BasStation isBarcodeSta = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
                            .eq(BasStation::getBarcode, waitPakin.getBarcode())
                    ,false
                    .last("LIMIT 1")
            );
            if (!Cools.isEmpty(isBarcodeSta)){
                throw new CoolException("该条码已被"+isBarcodeSta.getStationName()+"站绑定");