Merge remote-tracking branch 'origin/jkasrs' into jkasrs

mrzhssss

2022-05-27 7e45c420dd19a3ffe224e9cd42bf7ea31277d7be

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

@@ -151,4 +151,11 @@
        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);
    }

}