#

luxiaotao1123

2020-06-15 bc196046ae1ca301fadab2d0655458a5441034ea

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

@@ -1,6 +1,5 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSON;
import com.core.annotations.ManagerAuth;
import com.core.common.R;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
@@ -11,6 +10,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

/**
@@ -26,29 +26,53 @@
    private BasDevpService basDevpService;

    @RequestMapping("/available/put/site")
    @ManagerAuth(memo = "获取有效的入库站点")
    @ManagerAuth(memo = "获取入库站点")
    public R availablePutSite(){
        return R.ok().add(basDevpService.getAvailableInSite());
    }

    @RequestMapping("/available/take/site")
    @ManagerAuth(memo = "获取有效的出库站点")
    public R availableTakeSite(){
        return R.ok().add(basDevpService.getAvailableOutSite());
    @RequestMapping("/available/empty/put/site")
    @ManagerAuth(memo = "获取空板入库站点")
    public R availableEmptyPutSite(){
        return R.ok().add(basDevpService.getAvailableEmptyInSite());
    }

    @RequestMapping("/available/empty/take/site")
    @ManagerAuth(memo = "获取空板出库站点")
    public R availableEmptyTakeSite(){
        return R.ok().add(basDevpService.getAvailableEmptyOutSite());
    }

    @RequestMapping("/full/store/put/start")
    @ManagerAuth(memo = "全板入库")
    public R start(@RequestBody FullStoreParam fullStoreParam) {
    public R fullStorePutStart(@RequestBody FullStoreParam fullStoreParam) {
        workService.startupFullStore(fullStoreParam,getUserId());
        return R.ok();
        return R.ok("入库成功");
    }

    @RequestMapping("/empty/plate/in/start")
    @ManagerAuth(memo = "空板入库")
    public R emptyPlateInStart(@RequestParam Integer sourceStaNo) {
        workService.emptyPlateIn(sourceStaNo, getUserId());
        return R.ok("入库成功");
    }

    @RequestMapping("/empty/plate/out/start")
    @ManagerAuth(memo = "全板入库")
    public R start(EmptyPlateOutParam param) {
        System.out.println(JSON.toJSONString(param));
    @ManagerAuth(memo = "空板出库")
    public R emptyPlateOutStart(EmptyPlateOutParam param) {
        workService.emptyPlateOut(param, getUserId());
        return R.ok("出库成功");
    }

    @RequestMapping("/hand/control/wrkMast")
    @ManagerAuth(memo = "手动处理工作档")
    public R handControlWrkMast(@RequestParam String workNo,
                                @RequestParam Integer type){
        if (type == 1) {
            workService.completeWrkMast(workNo, getUserId());
        } else if (type == 2) {
            workService.cancelWrkMast(workNo, getUserId());
        }
        return R.ok();
    }