Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs

18516761980

2022-06-28 7a08ca0a2a67e73e3cdaa93ec3e1dabc41828be9

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

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

}