Changes

mrzhssss

2022-04-11 d2adac4e369165ec523c23e7ffd19fc5775d43b5

 src/main/java/zy/cloud/wms/manager/controller/WaveController.java

@@ -6,8 +6,11 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
import com.core.exception.CoolException;
import zy.cloud.wms.common.model.PickOutDto;
import zy.cloud.wms.manager.entity.Wave;
import zy.cloud.wms.manager.entity.WaveDetl;
import zy.cloud.wms.manager.entity.param.StockOutParam;
import zy.cloud.wms.manager.service.OrderService;
import zy.cloud.wms.manager.service.WaveDetlService;
import zy.cloud.wms.manager.service.WaveService;
@@ -18,8 +21,10 @@
import zy.cloud.wms.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import zy.cloud.wms.manager.service.WorkService;

import java.util.*;


@RestController
public class WaveController extends BaseController {
@@ -30,6 +35,8 @@
    private WaveDetlService waveDetlService;
    @Autowired
    private OrderService orderService;
    @Autowired
    private WorkService workService;

    @RequestMapping(value = "/wave/{id}/auth")
    @ManagerAuth
@@ -47,7 +54,8 @@
        EntityWrapper<Wave> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
//        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        wrapper.orderBy("create_time",false);
        return R.ok(waveService.selectPage(new Page<>(curr, limit), wrapper));
    }

@@ -84,10 +92,22 @@
    @RequestMapping(value = "/wave/delete/auth")
    @ManagerAuth
    public R delete(@RequestParam(value="ids[]") Long[] ids){
        /**
         * 控管与初始化
         */
        HashSet<String> orders = new HashSet<>();
        for (Long id : ids){
             List<WaveDetl> waveDetls = waveDetlService.selectList(new EntityWrapper<WaveDetl>()
            Wave wave = waveService.selectOne(new EntityWrapper<Wave>()
                    .eq("id", id));
            if (Cools.isEmpty(wave)) {
                throw new CoolException("找不到该波次");
            }
            if (wave.getStatus() != 0){
                throw new CoolException("仅支持撤销'待处理'状态的订单");
            }
            List<WaveDetl> waveDetls = waveDetlService.selectList(new EntityWrapper<WaveDetl>()
                     .eq("wave_id", id));

             for (WaveDetl waveDetl : waveDetls) {

                 String orderNos = waveDetl.getOrderNos();
@@ -157,9 +177,14 @@

    @RequestMapping("/wave/createOut")
    @ManagerAuth
    public R createWaveOut(@RequestBody Wave wave){
        waveService.createOut(wave,getUserId(),getHostId());
        return R.ok();
    public R createWaveOut(@RequestBody List<PickOutDto> pickOutDtosk){
        return waveService.createOut(pickOutDtosk,getUserId(),getHostId());
    }

    @RequestMapping("/wave/preview")
    @ManagerAuth
    public R createWavePreview(@RequestBody StockOutParam stockOutParam){
        return workService.wavePreview(stockOutParam, getUserId(), getHostId());
    }

}