123

zhang

3 天以前 21d0e7ab9d5c7316225a3e9eecf465cd37c9bd85

 src/main/java/com/zy/asrs/controller/WorkController.java

@@ -1,14 +1,17 @@
package com.zy.asrs.controller;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.R;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.param.FullStoreParam;
import com.zy.asrs.entity.param.LocDetlAdjustParam;
import com.zy.asrs.entity.param.StockOutParam;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WorkService;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.model.StartupDto;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,6 +25,8 @@
import java.util.List;
import java.util.Map;

import static java.lang.Integer.parseInt;

/**
 * 工作流接口控制器
 * Created by vincent on 2020/6/10
@@ -33,6 +38,8 @@
    private WorkService workService;
    @Autowired
    private BasDevpService basDevpService;
    @Autowired
    private WrkMastService wrkMastService;

    @RequestMapping("/available/put/site")
    @ManagerAuth()
@@ -126,6 +133,16 @@
        workService.adjustLocDetl(param, getUserId());
        return R.ok("库存调整成功");
    }
    @RequestMapping("/hand/query/wrkSts")
    @ManagerAuth(memo = "手动查询工作档")
    public R queryWrkSts(@RequestParam String workNo,
                                @RequestParam Integer type){
        EntityWrapper<WrkMast> wrapper = new EntityWrapper<>();
        wrapper.eq("wrk_no",parseInt(workNo));
        WrkMast wrkMast = wrkMastService.selectOne(wrapper);

        return R.ok().add(wrkMast);
    }

    @RequestMapping("/hand/control/wrkMast")
    @ManagerAuth(memo = "手动处理工作档")
@@ -148,7 +165,20 @@
    @ManagerAuth(memo = "生成任务")
    public R createWaitPainWrkMastStart(@RequestBody List<WaitPakin> list) {
        StartupDto startupDto = workService.createWaitPainWrkMastStart(list, getUserId());
        return R.ok("添加任务成功，任务号：" + startupDto.getWorkNo() + ";目标库位：" + startupDto.getLocNo());
        return R.ok("任务号：" + startupDto.getWorkNo() + ";目标库位：" + startupDto.getLocNo());
    }

    @RequestMapping("/deal/preHave/start")
    @ManagerAuth(memo = "先入品处理")
    public R dealPreHave(@RequestParam Integer wrkNo) {
        String locNo = workService.dealPreHaveStart(wrkNo, getUserId());
        return R.ok("任务重新入库，目标库位：" + locNo);
    }

    @RequestMapping("/deal/steNo/empty")
    @ManagerAuth(memo = "清除小车")
    public R dealSteNoEmpty(@RequestParam Integer wrkNo) {
        return wrkMastService.setSteEmpty(wrkNo)?R.ok():R.error();
    }

}