入库单数据显示异常问题修复

skyouc

2 天以前 45a230e870b26b51d3006273a36df78203521253

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

@@ -1,19 +1,23 @@
package com.vincent.rsf.server.manager.controller;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.common.domain.PageResult;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.common.annotation.OperationLog;
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.Wave;
import com.vincent.rsf.server.manager.entity.WaveItem;
import com.vincent.rsf.server.manager.service.WaveService;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -107,15 +111,28 @@
        ExcelUtil.build(ExcelUtil.create(waveService.list(), Wave.class), response);
    }


    @PreAuthorize("hasAuthority('manager:wave:update')")
    @ApiOperation("波次下发任务")
    @PostMapping("/wave/public/task")
    public R publicTask(@RequestBody Map<String, Object> map) {
        if (Cools.isEmpty(map)) {
        if (Cools.isEmpty(map) || Cools.isEmpty(map.get("wave"))) {
            throw new CoolException("参数不能为空！！");
        }
        return waveService.publicTask(map);
        return waveService.publicTask(map, getLoginUserId());
    }

    @PreAuthorize("hasAuthority('manager:wave:list')")
    @ApiOperation("波次出库任务预览")
    @PostMapping("/wave/locs/preview/page")
    public R mergeWavePreview(@RequestBody Map<String, Object> map) {
        if (Cools.isEmpty(map.get("waveId")) || StringUtils.isBlank(map.get("waveId").toString())) {
            throw new CoolException("参数不能为空！！");
        }
        Long waveId = Long.parseLong(map.get("waveId").toString());
        List<WaveItem> waveItems = waveService.mergeWavePreview(waveId);
        PageResult<WaveItem> pageResult = new PageResult<>();
        pageResult.setRecords(waveItems).setTotal(Long.parseLong(waveItems.size() + ""));
        return R.ok().add(pageResult);
    }

}