#

18516761980

2022-06-14 d16d3b70e94f798d7e5abd145f8566d81d0c66c9

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

@@ -4,6 +4,7 @@
import com.core.common.R;
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;
@@ -13,6 +14,11 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
 * 工作流接口控制器
@@ -41,7 +47,28 @@
    @RequestMapping("/available/take/site")
    @ManagerAuth(memo = "获取出库站点")
    public R availableTakeSite(){
        return R.ok().add(basDevpService.getAvailableOutSite());
        List<Map<String, Object>> result = new ArrayList<>();
        List<Integer> outSite = basDevpService.getAvailableOutSite(101);
        for (Integer siteId : outSite) {
            Map<String, Object> map = new HashMap<>();
            map.put("siteId", siteId);
            map.put("desc", siteId + "（全板出库口）");
            result.add(map);
        }
        List<Integer> pickOutSite = basDevpService.getAvailableOutSite(103);
        for (Integer siteId : pickOutSite) {
            Map<String, Object> map = new HashMap<>();
            map.put("siteId", siteId);
            map.put("desc", siteId + "（拣料出库口）");
            result.add(map);
        }
        return R.ok().add(result);
    }

    @RequestMapping("/available/take/check/site")
    @ManagerAuth(memo = "获取盘点出库站点")
    public R availableTakeCheckSite(){
        return R.ok().add(basDevpService.getAvailableOutSite(107));
    }

    @RequestMapping("/available/empty/take/site")
@@ -57,7 +84,7 @@
    }

    @RequestMapping("/plate/out/start")
    @ManagerAuth(memo = "全板出库")
    @ManagerAuth(memo = "出库作业")
    public R fullStoreTakeStart(@RequestBody StockOutParam param) {
        workService.startupFullTakeStore(param, getUserId());
        return R.ok("出库启动成功");
@@ -76,6 +103,13 @@
        return R.ok("出库启动成功");
    }

    @RequestMapping("/locCheck/out/start")
    @ManagerAuth(memo = "盘点出库")
    public R locCheckOutStart(@RequestBody StockOutParam param) {
        workService.locCheckOut(param, getUserId());
        return R.ok("出库启动成功");
    }

    @RequestMapping("/loc/move/start")
    @ManagerAuth(memo = "库位移转")
    public R locMoveStart(@RequestParam String sourceLocNo,
@@ -84,14 +118,26 @@
        return R.ok("移库启动成功");
    }

    @RequestMapping("/locDdetl/adjust/start")
    @ManagerAuth(memo = "库存调整")
    public R locDetlAdjustStart(@RequestBody LocDetlAdjustParam param) {
        workService.adjustLocDetl(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());
            return R.ok("工作档已完成");
        } else if (type == 2) {
            workService.cancelWrkMast(workNo, getUserId());
            return R.ok("工作档已取消");
        } else if (type == 3) {
            workService.pickWrkMast(workNo, getUserId());
            return R.ok("工作档已拣料");
        }
        return R.ok();
    }