#

luxiaotao1123

2020-06-15 0a90977b05d9c4b8a3b10df92ded6f44a22c41ba

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

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

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

    @RequestMapping("/empty/plate/out/start")
@@ -69,9 +67,9 @@
    public R handControlWrkMast(@RequestParam String workNo,
                                @RequestParam Integer type){
        if (type == 1) {
            workService.completeWrkMast(workNo);
            workService.completeWrkMast(workNo, getUserId());
        } else if (type == 2) {
            workService.cancelWrkMast(workNo);
            workService.cancelWrkMast(workNo, getUserId());
        }
        return R.ok();
    }